Changeset 4944 for pjproject/trunk

Timestamp:

Oct 10, 2014 10:33:23 AM (10 years ago)

Author:

nanang

Message:

Fixed #1796: Avoid infinite registration loop caused by contact rewrite.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua_internal.h (modified) (1 diff)
• src/pjsua-lib/pjsua_acc.c (modified) (4 diffs)

pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h

@@ -220 +220 @@
                                          It may be different than acc
                                          contact if outbound is used    */
+    pj_bool_t        contact_rewritten;
+                                    /**< Contact rewrite has been done? */
     pjsip_host_port  via_addr;      /**< Address for Via header         */
     pjsip_transport *via_tp;        /**< Transport associated with

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

@@ -2093 +2093 @@
     pj_log_push_indent();
 
-    if ((acc->cfg.contact_rewrite_method &
+    /* Check if we should do NAT bound address check for contact rewrite.
+     * Note that '!contact_rewritten' check here is to avoid overriding
+     * the current contact generated from last 2xx.
+     */
+    if (!acc->contact_rewritten &&
+        (acc->cfg.contact_rewrite_method &
          PJSUA_CONTACT_REWRITE_ALWAYS_UPDATE) ==
         PJSUA_CONTACT_REWRITE_ALWAYS_UPDATE &&
@@ -2104 +2109 @@
             param->contact_cnt = 1;
             param->contact[0] = acc->reg_contact;
+
+            /* Don't set 'contact_rewritten' to PJ_TRUE here to allow
+             * further check of NAT bound address in 2xx response.
+             */
         }
     }
@@ -2178 +2187 @@
             update_rfc5626_status(acc, param->rdata);
 
-            /* Check NAT bound address */
-            if (acc_check_nat_addr(acc, (acc->cfg.contact_rewrite_method & 3),
+            /* Check NAT bound address if it hasn't been done before */
+            if (!acc->contact_rewritten &&
+                acc_check_nat_addr(acc, (acc->cfg.contact_rewrite_method & 3),
                                    param))
             {
                 PJSUA_UNLOCK();
                 pj_log_pop_indent();
+
+                /* Avoid another check of NAT bound address */
+                acc->contact_rewritten = PJ_TRUE;
                 return;
             }
@@ -2216 +2229 @@
     acc->reg_last_err = param->status;
     acc->reg_last_code = param->code;
+
+    /* Reaching this point means no contact rewrite, so reset the flag */
+    acc->contact_rewritten = PJ_FALSE;
 
     /* Check if we need to auto retry registration. Basically, registration