Changeset 1396

Timestamp:

Jun 27, 2007 1:01:59 PM (17 years ago)

Author:

bennylp

Message:

Ticket #347: Assertion failure when handling incoming presence subscription with Expires=0

Location:

pjproject/trunk/pjsip/src

Files:

• pjsip-simple/presence.c (modified) (2 diffs)
• pjsua-lib/pjsua_pres.c (modified) (2 diffs)

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

@@ -225 +225 @@
     pjsip_accept_hdr *accept;
     pjsip_event_hdr *event;
-    pjsip_expires_hdr *expires_hdr;
-    unsigned expires;
     content_type_e content_type = CONTENT_TYPE_NONE;
     pjsip_evsub *sub;
@@ -282 +280 @@
     }
 
-    /* Check that expires is not too short. */
-    expires_hdr=(pjsip_expires_hdr*)
-                pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_EXPIRES, NULL);
-    if (expires_hdr) {
-        if (expires_hdr->ivalue < 5) {
-            return PJSIP_ERRNO_FROM_SIP_STATUS(PJSIP_SC_INTERVAL_TOO_BRIEF);
-        }
-
-        expires = expires_hdr->ivalue;
-        if (expires > PRES_DEFAULT_EXPIRES)
-            expires = PRES_DEFAULT_EXPIRES;
-
-    } else {
-        expires = PRES_DEFAULT_EXPIRES;
-    }
-    
     /* Lock dialog */
     pjsip_dlg_inc_lock(dlg);

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_pres.c

@@ -457 +457 @@
     pjsip_pres_status pres_status;
     pjsip_dialog *dlg;
+    pjsip_expires_hdr *expires_hdr;
+    pjsip_evsub_state ev_state;
     pj_status_t status;
 
@@ -559 +561 @@
     pjsip_pres_set_status(sub, &pres_status);
 
+    /* Check expires value. If it's zero, send our presense state but
+     * set subscription state to TERMINATED.
+     */
+    expires_hdr=(pjsip_expires_hdr*)
+                pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_EXPIRES, NULL);
+
+    if (expires_hdr && expires_hdr->ivalue == 0)
+        ev_state = PJSIP_EVSUB_STATE_TERMINATED;
+    else
+        ev_state = PJSIP_EVSUB_STATE_ACTIVE;
+
     /* Create and send the first NOTIFY to active subscription: */
-    status = pjsip_pres_notify( sub, PJSIP_EVSUB_STATE_ACTIVE, NULL,
-                                NULL, &tdata);
+    status = pjsip_pres_notify( sub, ev_state, NULL, NULL, &tdata);
     if (status == PJ_SUCCESS) {
         pjsua_process_msg_data(tdata, NULL);