Changeset 151

Timestamp:

Feb 8, 2006 9:22:02 AM (18 years ago)

Author:

bennylp

Message:

Fixed bug in invite server transaction

File:

• pjproject/branches/pjproject-0.2/pjsip/src/pjsip/sip_transaction.c (modified) (2 diffs)

pjproject/branches/pjproject-0.2/pjsip/src/pjsip/sip_transaction.c

@@ -1376 +1376 @@
 
     } else if (event->type == PJSIP_EVENT_RX_MSG) {
-        int code;
 
         /* Cancel retransmission timer A. */
@@ -1540 +1539 @@
                 }
 
-                /* Start timer J at 64*T1 for unreliable transport or zero for
-                 * reliable transport.
-                 */
-                if (PJSIP_TRANSPORT_IS_RELIABLE(tsx->transport)==0) {
+                /* Setup timeout timer: */
+                
+                if (tsx->method.id == PJSIP_INVITE_METHOD) {
+                    
+                    /* Start Timer H at 64*T1 for INVITE server transaction,
+                     * regardless of transport.
+                     */
                     timeout = timeout_timer_val;
+                    
+                } else if (PJSIP_TRANSPORT_IS_RELIABLE(tsx->transport)==0) {
+                    
+                    /* For non-INVITE, start timer J at 64*T1 for unreliable
+                     * transport.
+                     */
+                    timeout = timeout_timer_val;
+                    
                 } else {
+                    
+                    /* Transaction terminates immediately for non-INVITE when
+                     * reliable transport is used.
+                     */
                     timeout.sec = timeout.msec = 0;
                 }
+
+                pjsip_endpt_schedule_timer( tsx->endpt, &tsx->timeout_timer, 
+                                            &timeout);
 
                 pjsip_endpt_schedule_timer( tsx->endpt, &tsx->timeout_timer, &timeout);