Changeset 3841 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_pres.c

Timestamp:

Oct 24, 2011 9:28:13 AM (13 years ago)

Author:

ming

Message:

Re #1395: Backport of PJSIP 1.x branch into PJSIP 2.0 trunk

• Backport of r3557:r3832

TODO: ticket #1268 (Option for automatic/manual sending of RTCP SDES/BYE for the stream) for video stream.

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjsip/src/pjsua-lib/pjsua_pres.c (modified) (9 diffs)

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

@@ -1321 +1321 @@
 
 /* Unpublish presence publication */
-void pjsua_pres_unpublish(pjsua_acc *acc)
+void pjsua_pres_unpublish(pjsua_acc *acc, unsigned flags)
 {
     if (acc->publish_sess) {
@@ -1327 +1327 @@
 
         acc->online_status = PJ_FALSE;
-        send_publish(acc->index, PJ_FALSE);
+
+        if ((flags & PJSUA_DESTROY_NO_TX_MSG) == 0) {
+            send_publish(acc->index, PJ_FALSE);
+        }
+
         /* By ticket #364, don't destroy the session yet (let the callback
            destroy it)
@@ -1340 +1344 @@
 
 /* Terminate server subscription for the account */
-void pjsua_pres_delete_acc(int acc_id)
+void pjsua_pres_delete_acc(int acc_id, unsigned flags)
 {
     pjsua_acc *acc = &pjsua_var.acc[acc_id];
@@ -1362 +1366 @@
         pjsip_pres_set_status(uapres->sub, &pres_status);
 
-        if (pjsip_pres_notify(uapres->sub, 
-                              PJSIP_EVSUB_STATE_TERMINATED, NULL,
-                              &reason, &tdata)==PJ_SUCCESS)
-        {
-            pjsip_pres_send_request(uapres->sub, tdata);
+        if ((flags & PJSUA_DESTROY_NO_TX_MSG) == 0) {
+            if (pjsip_pres_notify(uapres->sub,
+                                  PJSIP_EVSUB_STATE_TERMINATED, NULL,
+                                  &reason, &tdata)==PJ_SUCCESS)
+            {
+                pjsip_pres_send_request(uapres->sub, tdata);
+            }
+        } else {
+            pjsip_pres_terminate(uapres->sub, PJ_FALSE);
         }
 
@@ -1377 +1385 @@
 
     /* Terminate presence publication, if any */
-    pjsua_pres_unpublish(acc);
+    pjsua_pres_unpublish(acc, flags);
 }
 
@@ -2252 +2260 @@
         pjsua_acc *acc = &pjsua_var.acc[i];
 
+        /* Acc may not be ready yet, otherwise assertion will happen */
+        if (!pjsua_acc_is_valid(i))
+            continue;
+
         /* Retry PUBLISH */
         if (acc->cfg.publish_enabled && acc->publish_sess==NULL)
@@ -2325 +2337 @@
  * Shutdown presence.
  */
-void pjsua_pres_shutdown(void)
+void pjsua_pres_shutdown(unsigned flags)
 {
     unsigned i;
@@ -2340 +2352 @@
         if (!pjsua_var.acc[i].valid)
             continue;
-        pjsua_pres_delete_acc(i);
+        pjsua_pres_delete_acc(i, flags);
     }
 
@@ -2347 +2359 @@
     }
 
-    refresh_client_subscriptions();
-
-    for (i=0; i<PJ_ARRAY_SIZE(pjsua_var.acc); ++i) {
-        if (pjsua_var.acc[i].valid)
-            pjsua_pres_update_acc(i, PJ_FALSE);
+    if ((flags & PJSUA_DESTROY_NO_TX_MSG) == 0) {
+        refresh_client_subscriptions();
+
+        for (i=0; i<PJ_ARRAY_SIZE(pjsua_var.acc); ++i) {
+            if (pjsua_var.acc[i].valid)
+                pjsua_pres_update_acc(i, PJ_FALSE);
+        }
     }