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

Timestamp:

Aug 25, 2007 1:36:15 PM (17 years ago)

Author:

bennylp

Message:

Implement ticket #336: custom presence status in NOTIFY/PUBLISH, supporting subset of RPID elements

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_pres.c (modified) (6 diffs)

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

@@ -114 +114 @@
     } else if (pjsua_var.buddy[buddy_id].status.info[0].basic_open) {
         info->status = PJSUA_BUDDY_STATUS_ONLINE;
-        info->status_text = pj_str("Online");
+
+        /* copy RPID information */
+        info->rpid = buddy->status.info[0].rpid;
+
+        if (info->rpid.note.slen)
+            info->status_text = info->rpid.note;
+        else
+            info->status_text = pj_str("Online");
+
     } else {
         info->status = PJSUA_BUDDY_STATUS_OFFLINE;
@@ -653 +661 @@
         pres_status.info[0].basic_open = acc->online_status;
         pres_status.info[0].id = acc->cfg.pidf_tuple_id;
+        /* .. including RPID information */
+        pj_memcpy(&pres_status.info[0].rpid, &acc->rpid, 
+                  sizeof(pjrpid_element));
 
         /* Be careful not to send PIDF with presence entity ID containing
@@ -822 +833 @@
 
 
-/* Refresh subscription (e.g. when our online status has changed) */
-static void refresh_server_subscription(int acc_id)
+/* Update server subscription (e.g. when our online status has changed) */
+void pjsua_pres_update_acc(int acc_id, pj_bool_t force)
 {
     pjsua_acc *acc = &pjsua_var.acc[acc_id];
@@ -837 +848 @@
 
         pjsip_pres_get_status(uapres->sub, &pres_status);
-        if (pres_status.info[0].basic_open != acc->online_status) {
+        if (force || pres_status.info[0].basic_open != acc->online_status) {
+
             pres_status.info[0].basic_open = acc->online_status;
+            pj_memcpy(&pres_status.info[0].rpid, &acc->rpid, 
+                      sizeof(pjrpid_element));
+
             pjsip_pres_set_status(uapres->sub, &pres_status);
 
@@ -856 +871 @@
      */
     if (acc_cfg->publish_enabled && acc->publish_sess) {
-        if (acc->publish_state != acc->online_status) {
+        if (force || acc->publish_state != acc->online_status) {
             send_publish(acc_id, PJ_TRUE);
         }
@@ -1252 +1267 @@
     for (i=0; i<PJ_ARRAY_SIZE(pjsua_var.acc); ++i) {
         if (pjsua_var.acc[i].valid)
-            refresh_server_subscription(i);
+            pjsua_pres_update_acc(i, PJ_FALSE);
     }
 }