Changeset 3096 for pjproject/trunk

Timestamp:

Feb 10, 2010 2:24:48 PM (15 years ago)

Author:

bennylp

Message:

Ticket #995: Send un-PUBLISH when pjsua_acc_set_registration(FALSE) is called (thanks Johan Lantz for the suggestion)

• in this implementation, when pjsua_acc_set_registration(FALSE) is called, the un-REGISTER request will be sent immediately after un-PUBLISH, unlike the process during shutdown where the un-REGISTER request will be sent only after un-PUBLISH transaction is complete

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua_internal.h (modified) (1 diff)
• src/pjsua-lib/pjsua_acc.c (modified) (1 diff)
• src/pjsua-lib/pjsua_pres.c (modified) (2 diffs)

pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h

@@ -445 +445 @@
 
 /**
+ *  Send un-PUBLISH
+ */
+void pjsua_pres_unpublish(pjsua_acc *acc);
+
+/**
  * Terminate server subscription for the account 
  */

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

@@ -1265 +1265 @@
             goto on_return;
         }
+
+        pjsua_pres_unpublish(&pjsua_var.acc[acc_id]);
+
         status = pjsip_regc_unregister(pjsua_var.acc[acc_id].regc, &tdata);
     }

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

@@ -1276 +1276 @@
 
 
+/* Unpublish presence publication */
+void pjsua_pres_unpublish(pjsua_acc *acc)
+{
+    if (acc->publish_sess) {
+        pjsua_acc_config *acc_cfg = &acc->cfg;
+
+        acc->online_status = PJ_FALSE;
+        send_publish(acc->index, PJ_FALSE);
+        /* By ticket #364, don't destroy the session yet (let the callback
+           destroy it)
+        if (acc->publish_sess) {
+            pjsip_publishc_destroy(acc->publish_sess);
+            acc->publish_sess = NULL;
+        }
+        */
+        acc_cfg->publish_enabled = PJ_FALSE;
+    }
+}
+
 /* Terminate server subscription for the account */
 void pjsua_pres_delete_acc(int acc_id)
 {
     pjsua_acc *acc = &pjsua_var.acc[acc_id];
-    pjsua_acc_config *acc_cfg = &pjsua_var.acc[acc_id].cfg;
     pjsua_srv_pres *uapres;
 
@@ -1315 +1333 @@
 
     /* Terminate presence publication, if any */
-    if (acc->publish_sess) {
-        acc->online_status = PJ_FALSE;
-        send_publish(acc_id, PJ_FALSE);
-        /* By ticket #364, don't destroy the session yet (let the callback
-           destroy it)
-        if (acc->publish_sess) {
-            pjsip_publishc_destroy(acc->publish_sess);
-            acc->publish_sess = NULL;
-        }
-        */
-        acc_cfg->publish_enabled = PJ_FALSE;
-    }
+    pjsua_pres_unpublish(acc);
 }