Changeset 2534 for pjproject/branches/1.0

Timestamp:

Mar 23, 2009 1:09:09 PM (15 years ago)

Author:

bennylp

Message:

Ticket #719: backported from ticket #718

Location:

pjproject/branches/1.0

Files:

• . (modified) (1 prop)
• pjsip/src/pjsip/sip_transaction.c (modified) (4 diffs)
• tests/pjsua/scripts-sendto/159_no_rport.py (copied) (copied from pjproject/trunk/tests/pjsua/scripts-sendto/159_no_rport.py)
• tests/pjsua/scripts-sendto/159_no_rport_nit.py (copied) (copied from pjproject/trunk/tests/pjsua/scripts-sendto/159_no_rport_nit.py)

pjproject/branches/1.0/pjsip/src/pjsip/sip_transaction.c

@@ -1377 +1377 @@
         tsx->addr_len = tsx->res_addr.addr_len;
         tsx->is_reliable = PJSIP_TRANSPORT_IS_RELIABLE(tsx->transport);
+    } else {
+        tsx->is_reliable = 
+            (tsx->res_addr.dst_host.flag & PJSIP_TRANSPORT_RELIABLE);
     }
 
@@ -2316 +2319 @@
                     timeout = timeout_timer_val;
                     
-                } else if (PJSIP_TRANSPORT_IS_RELIABLE(tsx->transport)==0) {
+                } else if (!tsx->is_reliable) {
                     
                     /* For non-INVITE, start timer J at 64*T1 for unreliable
@@ -2656 +2659 @@
         /* Start Timer D with TD/T4 timer if unreliable transport is used. */
         /* Note: tsx->transport may be NULL! */
-        if ((tsx->transport && PJSIP_TRANSPORT_IS_RELIABLE(tsx->transport)==0)
-            || ((tsx->transport_flag & PJSIP_TRANSPORT_RELIABLE) == 0)) 
-        {
+        if (!tsx->is_reliable) {
             if (tsx->method.id == PJSIP_INVITE_METHOD) {
                 timeout = td_timer_val;
@@ -2723 +2724 @@
              * zero seconds for reliable transports.
              */
-            if (PJSIP_TRANSPORT_IS_RELIABLE(tsx->transport)==0) {
+            if (!tsx->is_reliable) {
                 timeout.sec = 0; 
                 timeout.msec = 0;