Changeset 2890 for pjproject/trunk/pjsip/src/pjsip-ua/sip_timer.c

Timestamp:

Aug 17, 2009 2:42:33 PM (15 years ago)

Author:

nanang

Message:

Ticket #833: Updated previous fix for Session Timer (timer callback gets pending INVITE is in progress), instead of just quitting the callback, it may be better to reschedule the timer (for five seconds).

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_timer.c (modified) (1 diff)

pjproject/trunk/pjsip/src/pjsip-ua/sip_timer.c

@@ -333 +333 @@
     PJ_UNUSED_ARG(timer_heap);
 
-    /* Must NOT have a pending INVITE transaction */
-    if (inv->invite_tsx != NULL)
+    /* When there is a pending INVITE transaction, delay/reschedule this timer
+     * for five seconds to cover the case that pending INVITE fails and the
+     * previous session is still active. If the pending INVITE is successful, 
+     * timer state will be updated, i.e: restarted or stopped.
+     */
+    if (inv->invite_tsx != NULL) {
+        pj_time_val delay = {5};
+
+        inv->timer->timer.id = 1;
+        pjsip_endpt_schedule_timer(inv->dlg->endpt, &inv->timer->timer, &delay);
         return;
+    }
 
     /* Lock dialog. */