Changeset 2932 for pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

Timestamp:

Oct 9, 2009 12:11:07 PM (15 years ago)

Author:

bennylp

Message:

Fixed ticket #917, #936, and #967:

• #917: CANCEL may be sent to different servers than the INVITE when DNS SRV is used (thanks Alexei Kuznetsov for the report)
• #936: CANCEL must be sent with TCP if the INVITE was sent with TCP because of 1300 bytes message size/MTU limit (thanks Johan Lantz for the report)
• #967: Wrong Route header generation in CANCEL request with strict route

Save the server address(es) found by resolution process to tx_data, which is copied to CANCEL request. CANCEL request then uses this address rather than starting a fresh server resolution.

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transaction.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

@@ -1627 +1627 @@
 {
     pjsip_transaction *tsx = (pjsip_transaction*) send_state->token;
+    pjsip_tx_data *tdata = send_state->tdata;
     struct tsx_lock_data lck;
 
@@ -1645 +1646 @@
 
             /* Update remote address. */
-            tsx->addr_len = send_state->addr.entry[send_state->cur_addr].addr_len;
+            tsx->addr_len = tdata->dest_info.addr.entry[tdata->dest_info.cur_addr].addr_len;
             pj_memcpy(&tsx->addr, 
-                      &send_state->addr.entry[send_state->cur_addr].addr,
+                      &tdata->dest_info.addr.entry[tdata->dest_info.cur_addr].addr,
                       tsx->addr_len);