Changeset 4398

Timestamp:

Feb 27, 2013 2:18:20 PM (12 years ago)

Author:

riza

Message:

Re #1607: backported to 1.x

Location:

pjproject/branches/1.x

Files:

• . (modified) (1 prop)
• pjsip/src/pjsua-lib/pjsua_acc.c (modified) (1 diff)

pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_acc.c

@@ -1668 +1668 @@
         acc->ka_transport = param->rdata->tp_info.transport;
         pjsip_transport_add_ref(acc->ka_transport);
-        pj_memcpy(&acc->ka_target, &param->rdata->pkt_info.src_addr,
-                  param->rdata->pkt_info.src_addr_len);
-        acc->ka_target_len = param->rdata->pkt_info.src_addr_len;
+
+        /* https://trac.pjsip.org/repos/ticket/1607:
+         * Calculate the destination address from the original request. Some
+         * (broken) servers send the response using different source address
+         * than the one that receives the request, which is forbidden by RFC
+         * 3581.
+         */
+        {
+            pjsip_transaction *tsx;
+            pjsip_tx_data *req;
+
+            tsx = pjsip_rdata_get_tsx(param->rdata);
+            PJ_ASSERT_ON_FAIL(tsx, return);
+
+            req = tsx->last_tx;
+
+            pj_memcpy(&acc->ka_target, &req->tp_info.dst_addr,
+                      req->tp_info.dst_addr_len);
+            acc->ka_target_len = req->tp_info.dst_addr_len;
+        }
 
         /* Setup and start the timer */