Changeset 4185

Timestamp:

Jun 28, 2012 2:16:05 PM (12 years ago)

Author:

ming

Message:

Re #1537: Modify NAT detection to no longer update the transport address.

File:

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

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

@@ -1342 +1342 @@
     tp = param->rdata->tp_info.transport;
 
-    /* If allow_via_rewrite is enabled, we save the Via "sent-by" address
+    /* Get the received and rport info */
+    via = param->rdata->msg_info.via;
+    if (via->rport_param < 1) {
+        /* Remote doesn't support rport */
+        rport = via->sent_by.port;
+        if (rport==0) {
+            pjsip_transport_type_e tp_type;
+            tp_type = (pjsip_transport_type_e) tp->key.type;
+            rport = pjsip_transport_get_default_port_for_type(tp_type);
+        }
+    } else
+        rport = via->rport_param;
+
+    if (via->recvd_param.slen != 0)
+        via_addr = &via->recvd_param;
+    else
+        via_addr = &via->sent_by.host;
+
+    /* If allow_via_rewrite is enabled, we save the Via "received" address
      * from the response.
      */
@@ -1348 +1366 @@
         (acc->via_addr.host.slen == 0 || acc->via_tp != tp))
     {
-        via = param->rdata->msg_info.via;
-        if (pj_strcmp(&acc->via_addr.host, &via->sent_by.host))
-            pj_strdup(acc->pool, &acc->via_addr.host, &via->sent_by.host);
-        acc->via_addr.port = via->sent_by.port;
+        if (pj_strcmp(&acc->via_addr.host, via_addr))
+            pj_strdup(acc->pool, &acc->via_addr.host, via_addr);
+        acc->via_addr.port = rport;
         acc->via_tp = tp;
         pjsip_regc_set_via_sent_by(acc->regc, &acc->via_addr, acc->via_tp);
@@ -1389 +1406 @@
     }
 #endif
-
-    /* Get the received and rport info */
-    via = param->rdata->msg_info.via;
-    if (via->rport_param < 1) {
-        /* Remote doesn't support rport */
-        rport = via->sent_by.port;
-        if (rport==0) {
-            pjsip_transport_type_e tp_type;
-            tp_type = (pjsip_transport_type_e) tp->key.type;
-            rport = pjsip_transport_get_default_port_for_type(tp_type);
-        }
-    } else
-        rport = via->rport_param;
-
-    if (via->recvd_param.slen != 0)
-        via_addr = &via->recvd_param;
-    else
-        via_addr = &via->sent_by.host;
 
     /* Compare received and rport with the URI in our registration */
@@ -1554 +1553 @@
 
         /* Always update, by http://trac.pjsip.org/repos/ticket/864. */
+        /* Since the Via address will now be overwritten to the correct
+         * address by https://trac.pjsip.org/repos/ticket/1537, we do
+         * not need to update the transport address.
+         */
+        /*
         pj_strdup_with_null(tp->pool, &tp->local_name.host, via_addr);
         tp->local_name.port = rport;
+         */
 
     }