Changeset 4206 for pjproject/trunk

Timestamp:

Jul 16, 2012 2:45:09 AM (12 years ago)

Author:

ming

Message:

Fixed #1555 : Bug with via_rewrite feature when the account gets deleted

Location:

pjproject/trunk/pjsip/src

Files:

• pjsip-simple/publishc.c (modified) (1 diff)
• pjsip-ua/sip_reg.c (modified) (1 diff)
• pjsip/sip_dialog.c (modified) (1 diff)

pjproject/trunk/pjsip/src/pjsip-simple/publishc.c

@@ -356 +356 @@
     if (!via_addr)
         pj_bzero(&pubc->via_addr, sizeof(pubc->via_addr));
-    else
-        pubc->via_addr = *via_addr;
+    else {
+        if (pj_strcmp(&pubc->via_addr.host, &via_addr->host))
+            pj_strdup(pubc->pool, &pubc->via_addr.host, &via_addr->host);
+        pubc->via_addr.port = via_addr->port;
+    }
     pubc->via_tp = via_tp;
 

pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.c

@@ -819 +819 @@
     if (!via_addr)
         pj_bzero(&regc->via_addr, sizeof(regc->via_addr));
-    else
-        regc->via_addr = *via_addr;
+    else {
+        if (pj_strcmp(&regc->via_addr.host, &via_addr->host))
+            pj_strdup(regc->pool, &regc->via_addr.host, &via_addr->host);
+        regc->via_addr.port = via_addr->port;
+    }
     regc->via_tp = via_tp;
 

pjproject/trunk/pjsip/src/pjsip/sip_dialog.c

@@ -597 +597 @@
     if (!via_addr)
         pj_bzero(&dlg->via_addr, sizeof(dlg->via_addr));
-    else
-        dlg->via_addr = *via_addr;
+    else {
+        if (pj_strcmp(&dlg->via_addr.host, &via_addr->host))
+            pj_strdup(dlg->pool, &dlg->via_addr.host, &via_addr->host);
+        dlg->via_addr.port = via_addr->port;
+    }
     dlg->via_tp = via_tp;