Changeset 2149 for pjproject/trunk/pjsip/src/pjsip-simple/presence.c

Timestamp:

Jul 17, 2008 1:53:41 PM (16 years ago)

Author:

bennylp

Message:

Ticket #574: Add new API to know why the outgoing subscription request is terminated and added support for delaying subscription acceptance

File:

• pjproject/trunk/pjsip/src/pjsip-simple/presence.c (modified) (4 diffs)

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

@@ -462 +462 @@
     PJ_ASSERT_RETURN(pres != NULL, PJSIP_SIMPLE_ENOPRESENCE);
 
-    /* Must have at least one presence info. */
-    PJ_ASSERT_RETURN(pres->status.info_cnt > 0, PJSIP_SIMPLE_ENOPRESENCEINFO);
+    /* Must have at least one presence info, unless state is 
+     * PJSIP_EVSUB_STATE_TERMINATED. This could happen if subscription
+     * has not been active (e.g. we're waiting for user authorization)
+     * and remote cancels the subscription.
+     */
+    PJ_ASSERT_RETURN(state==PJSIP_EVSUB_STATE_TERMINATED ||
+                     pres->status.info_cnt > 0, PJSIP_SIMPLE_ENOPRESENCEINFO);
 
 
@@ -475 +480 @@
 
 
-    /* Create message body to reflect the presence status. */
-    status = pres_create_msg_body( pres, tdata );
-    if (status != PJ_SUCCESS)
-        goto on_return;
-
+    /* Create message body to reflect the presence status. 
+     * Only do this if we have presence status info to send (see above).
+     */
+    if (pres->status.info_cnt > 0) {
+        status = pres_create_msg_body( pres, tdata );
+        if (status != PJ_SUCCESS)
+            goto on_return;
+    }
 
     /* Done. */
@@ -508 +516 @@
     PJ_ASSERT_RETURN(pres != NULL, PJSIP_SIMPLE_ENOPRESENCE);
 
-    /* Must have at least one presence info. */
-    PJ_ASSERT_RETURN(pres->status.info_cnt > 0, PJSIP_SIMPLE_ENOPRESENCEINFO);
+    /* We may not have a presence info yet, e.g. when we receive SUBSCRIBE
+     * to refresh subscription while we're waiting for user authorization.
+     */
+    //PJ_ASSERT_RETURN(pres->status.info_cnt > 0, 
+    //                 PJSIP_SIMPLE_ENOPRESENCEINFO);
 
 
@@ -522 +533 @@
 
     /* Create message body to reflect the presence status. */
-    status = pres_create_msg_body( pres, tdata );
-    if (status != PJ_SUCCESS)
-        goto on_return;
-
+    if (pres->status.info_cnt > 0) {
+        status = pres_create_msg_body( pres, tdata );
+        if (status != PJ_SUCCESS)
+            goto on_return;
+    }
 
     /* Done. */