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

Timestamp:

Jun 28, 2006 4:46:49 PM (18 years ago)

Author:

bennylp

Message:

Major improvements in PJSIP to support TCP. The changes fall into these categories: (1) the TCP transport implementation itself (*.[hc]), (2) bug-fix in SIP transaction when using reliable transports, (3) support for TCP transport in PJSUA-LIB/PJSUA, and (4) changes in PJSIP-TEST to support TCP testing.

File:

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

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

@@ -1300 +1300 @@
         pj_memcpy(&tsx->addr, &tsx->res_addr.addr, tsx->res_addr.addr_len);
         tsx->addr_len = tsx->res_addr.addr_len;
+        tsx->is_reliable = PJSIP_TRANSPORT_IS_RELIABLE(tsx->transport);
     }
 
@@ -2131 +2132 @@
             }
 
-            /* Start timer H for transaction termination */
-            pjsip_endpt_schedule_timer(tsx->endpt,&tsx->timeout_timer,
-                                       &timeout_timer_val);
+            /* For INVITE, start timer H for transaction termination 
+             * regardless whether transport is reliable or not.
+             * For non-INVITE, start timer J with the value of 64*T1 for
+             * non-reliable transports, and zero for reliable transports.
+             */
+            if (tsx->method.id == PJSIP_INVITE_METHOD) {
+                /* Start timer H for INVITE */
+                pjsip_endpt_schedule_timer(tsx->endpt,&tsx->timeout_timer,
+                                           &timeout_timer_val);
+            } else if (!tsx->is_reliable) {
+                /* Start timer J on 64*T1 seconds for non-INVITE */
+                pjsip_endpt_schedule_timer(tsx->endpt,&tsx->timeout_timer,
+                                           &timeout_timer_val);
+            } else {
+                /* Start timer J on zero seconds for non-INVITE */
+                pj_time_val zero_time = { 0, 0 };
+                pjsip_endpt_schedule_timer(tsx->endpt,&tsx->timeout_timer,
+                                           &zero_time);
+            }
 
             /* For INVITE, if unreliable transport is used, retransmission