Changeset 4064

Timestamp:

Apr 20, 2012 9:59:51 AM (12 years ago)

Author:

bennylp

Message:

Fixed #1491: Failed to refresh (presence) subscription if Subscription-State header contains no "expires" parameter

File:

• pjproject/branches/1.x/pjsip/src/pjsip-simple/evsub.c (modified) (2 diffs)

pjproject/branches/1.x/pjsip/src/pjsip-simple/evsub.c

@@ -1805 +1805 @@
         pjsip_tx_data *tdata;
         pj_status_t status;
-        int next_refresh;
 
         /* Only want to handle initial NOTIFY receive event. */
@@ -1885 +1884 @@
              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));