Changeset 4718 for pjproject/trunk/pjsip/src/pjsip-simple/evsub.c

Timestamp:

Jan 29, 2014 6:58:21 AM (11 years ago)

Author:

nanang

Message:

Fix #1727:

• Start timer TIMER_TYPE_UAS_TIMEOUT when incoming subscription request is accepted (via pjsip_evsub_accept()).
• Kill any timer when subscription state is shifting into TERMINATED.

File:

• pjproject/trunk/pjsip/src/pjsip-simple/evsub.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsip-simple/evsub.c

@@ -594 +594 @@
         prev_state != PJSIP_EVSUB_STATE_TERMINATED) 
     {
+        /* Kill any timer. */
+        set_timer(sub, TIMER_TYPE_NONE, 0);
+
         if (sub->pending_tsx == 0) {
             evsub_destroy(sub);
@@ -1148 +1151 @@
         goto on_return;
 
+    /* Set UAS timeout timer, when status code is 2xx and state is not
+     * terminated.
+     */
+    if (st_code/100 == 2 && sub->state != PJSIP_EVSUB_STATE_TERMINATED) {
+        PJ_LOG(5,(sub->obj_name, "UAS timeout in %d seconds",
+                  sub->expires->ivalue));
+        set_timer(sub, TIMER_TYPE_UAS_TIMEOUT, sub->expires->ivalue);
+    }
 
 on_return:
@@ -1803 +1814 @@
             }
 
-            /* Kill any timer. */
-            set_timer(sub, TIMER_TYPE_NONE, 0);
-
             /* Set state to TERMINATED */
             set_state(sub, PJSIP_EVSUB_STATE_TERMINATED,