Changeset 4543 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

Timestamp:

Jun 24, 2013 9:53:16 AM (11 years ago)

Author:

bennylp

Message:

Closed #1668: Option to use the IP address found in REGISTER response in the SDP

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c (modified) (8 diffs)

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

@@ -651 +651 @@
     acc->valid = PJ_FALSE;
     acc->contact.slen = 0;
+    acc->reg_mapped_addr.slen = 0;
     pj_bzero(&acc->via_addr, sizeof(acc->via_addr));
     acc->via_tp = NULL;
@@ -1256 +1257 @@
             acc->regc = NULL;
             acc->contact.slen = 0;
+            acc->reg_mapped_addr.slen = 0;
         }
     }
@@ -1464 +1466 @@
                                                &acc->via_addr, acc->via_tp);
         }
+    }
+
+    /* Save mapped address if needed */
+    if (acc->cfg.allow_sdp_nat_rewrite &&
+        pj_strcmp(&acc->reg_mapped_addr, via_addr))
+    {
+        pj_strdup(acc->pool, &acc->reg_mapped_addr, via_addr);
     }
 
@@ -1990 +1999 @@
         acc->regc = NULL;
         acc->contact.slen = 0;
+        acc->reg_mapped_addr.slen = 0;
         
         /* Stop keep-alive timer if any. */
@@ -2001 +2011 @@
         acc->regc = NULL;
         acc->contact.slen = 0;
+        acc->reg_mapped_addr.slen = 0;
 
         /* Stop keep-alive timer if any. */
@@ -2015 +2026 @@
             acc->regc = NULL;
             acc->contact.slen = 0;
+            acc->reg_mapped_addr.slen = 0;
 
             /* Stop keep-alive timer if any. */
@@ -2120 +2132 @@
         acc->regc = NULL;
         acc->contact.slen = 0;
+        acc->reg_mapped_addr.slen = 0;
     }
 
@@ -2168 +2181 @@
         acc->regc = NULL;
         acc->contact.slen = 0;
+        acc->reg_mapped_addr.slen = 0;
         return status;
     }