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

Timestamp:

Apr 24, 2012 1:09:14 PM (12 years ago)

Author:

bennylp

Message:

Re #1474: merged r4054-r4079

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjsip/src/pjsip-simple/evsub.c (modified) (2 diffs)

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

@@ -1819 +1819 @@
         pjsip_tx_data *tdata;
         pj_status_t status;
-        int next_refresh;
 
         /* Only want to handle initial NOTIFY receive event. */
@@ -1899 +1898 @@
              pj_stricmp(&sub_state->sub_state, &STR_PENDING)==0))
         {
-            next_refresh = sub_state->expires_param;
-
-        } else {
-            next_refresh = sub->expires->ivalue;
-        }
-
-        /* Update time */
-        update_expires(sub, next_refresh);
-
-        /* Start UAC refresh timer, only when we're not unsubscribing */
-        if (sub->expires->ivalue != 0) {
-            unsigned timeout = (next_refresh > TIME_UAC_REFRESH) ?
-                next_refresh - TIME_UAC_REFRESH : next_refresh;
+            int next_refresh = sub_state->expires_param;
+            unsigned timeout;
+
+            update_expires(sub, next_refresh);
+
+            /* Start UAC refresh timer, only when we're not unsubscribing */
+            timeout = (next_refresh > TIME_UAC_REFRESH) ?
+                        next_refresh - TIME_UAC_REFRESH : next_refresh;
 
             PJ_LOG(5,(sub->obj_name, "Will refresh in %d seconds", timeout));