Changeset 236 for pjproject/trunk/pjsip/src/pjsua/pjsua_pres.c

Timestamp:

Feb 26, 2006 9:23:45 PM (18 years ago)

Author:

bennylp

Message:

Major redesign in pjsua: call is indexed by number, multiple accounts, configurable max-calls, more auto-xxx features, fixed bugs in save_settings(), etc.

File:

• pjproject/trunk/pjsip/src/pjsua/pjsua_pres.c (modified) (12 diffs)

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

@@ -80 +80 @@
 static pj_bool_t pres_on_rx_request(pjsip_rx_data *rdata)
 {
+    int acc_index;
     pjsip_method *req_method = &rdata->msg_info.msg->line.req.method;
     pjsua_srv_pres *uapres;
@@ -94 +95 @@
     /* Incoming SUBSCRIBE: */
 
+    /* Find which account for the incoming request. */
+    acc_index = pjsua_find_account_for_incoming(rdata);
+
     /* Create UAS dialog: */
     status = pjsip_dlg_create_uas( pjsip_ua_instance(), rdata, 
-                                   &pjsua.contact_uri, &dlg);
+                                   &pjsua.acc[acc_index].contact_uri, 
+                                   &dlg);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, 
@@ -131 +136 @@
 
     /* Add server subscription to the list: */
-    pj_list_push_back(&pjsua.pres_srv_list, uapres);
+    pj_list_push_back(&pjsua.acc[acc_index].pres_srv_list, uapres);
 
 
@@ -147 +152 @@
     pj_memset(&pres_status, 0, sizeof(pres_status));
     pres_status.info_cnt = 1;
-    pres_status.info[0].basic_open = pjsua.online_status;
+    pres_status.info[0].basic_open = pjsua.acc[acc_index].online_status;
     //Both pjsua.local_uri and pjsua.contact_uri are enclosed in "<" and ">"
     //causing XML parsing to fail.
@@ -175 +180 @@
 
 /* Refresh subscription (e.g. when our online status has changed) */
-static void refresh_server_subscription()
+static void refresh_server_subscription(int acc_index)
 {
     pjsua_srv_pres *uapres;
 
-    uapres = pjsua.pres_srv_list.next;
-
-    while (uapres != &pjsua.pres_srv_list) {
+    uapres = pjsua.acc[acc_index].pres_srv_list.next;
+
+    while (uapres != &pjsua.acc[acc_index].pres_srv_list) {
         
         pjsip_pres_status pres_status;
@@ -187 +192 @@
 
         pjsip_pres_get_status(uapres->sub, &pres_status);
-        if (pres_status.info[0].basic_open != pjsua.online_status) {
-            pres_status.info[0].basic_open = pjsua.online_status;
+        if (pres_status.info[0].basic_open != pjsua.acc[acc_index].online_status) {
+            pres_status.info[0].basic_open = pjsua.acc[acc_index].online_status;
             pjsip_pres_set_status(uapres->sub, &pres_status);
 
@@ -299 +304 @@
 static void subscribe_buddy_presence(unsigned index)
 {
+    int acc_index;
     pjsip_dialog *dlg;
     pjsip_tx_data *tdata;
     pj_status_t status;
 
+    acc_index = pjsua.buddies[index].acc_index;
+
     status = pjsip_dlg_create_uac( pjsip_ua_instance(), 
-                                   &pjsua.local_uri,
-                                   &pjsua.contact_uri,
+                                   &pjsua.acc[acc_index].local_uri,
+                                   &pjsua.acc[acc_index].contact_uri,
                                    &pjsua.buddies[index].uri,
                                    NULL, &dlg);
@@ -326 +334 @@
                              &pjsua.buddies[index]);
 
-    status = pjsip_pres_initiate(pjsua.buddies[index].sub, 60, &tdata);
+    status = pjsip_pres_initiate(pjsua.buddies[index].sub, -1, &tdata);
     if (status != PJ_SUCCESS) {
         pjsua.buddies[index].sub = NULL;
@@ -382 +390 @@
 static void refresh_client_subscription(void)
 {
-    unsigned i;
+    int i;
 
     for (i=0; i<pjsua.buddy_cnt; ++i) {
@@ -416 +424 @@
  * Refresh presence
  */
-void pjsua_pres_refresh(void)
+void pjsua_pres_refresh(int acc_index)
 {
     refresh_client_subscription();
-    refresh_server_subscription();
+    refresh_server_subscription(acc_index);
 }
 
@@ -428 +436 @@
 void pjsua_pres_shutdown(void)
 {
-    unsigned i;
-
-    pjsua.online_status = 0;
+    int acc_index;
+    int i;
+
+    for (acc_index=0; acc_index<pjsua.acc_cnt; ++acc_index) {
+        pjsua.acc[acc_index].online_status = 0;
+    }
+
     for (i=0; i<pjsua.buddy_cnt; ++i) {
         pjsua.buddies[i].monitor = 0;
     }
-    pjsua_pres_refresh();
+
+    for (acc_index=0; acc_index<pjsua.acc_cnt; ++acc_index) {
+        pjsua_pres_refresh(acc_index);
+    }
 }
 
@@ -442 +457 @@
 void pjsua_pres_dump(void)
 {
-    unsigned i;
+    int acc_index;
+    int i;
 
     PJ_LOG(3,(THIS_FILE, "Dumping pjsua server subscriptions:"));
-    if (pj_list_empty(&pjsua.pres_srv_list)) {
-        PJ_LOG(3,(THIS_FILE, "  - none - "));
-    } else {
-        struct pjsua_srv_pres *uapres;
-
-        uapres = pjsua.pres_srv_list.next;
-        while (uapres != &pjsua.pres_srv_list) {
-        
-            PJ_LOG(3,(THIS_FILE, "  %10s %s",
-                      pjsip_evsub_get_state_name(uapres->sub),
-                      uapres->remote));
-
-            uapres = uapres->next;
+    for (acc_index=0; acc_index < pjsua.acc_cnt; ++acc_index) {
+
+        PJ_LOG(3,(THIS_FILE, "  %.*s",
+                  (int)pjsua.acc[acc_index].local_uri.slen,
+                  pjsua.acc[acc_index].local_uri.ptr));
+
+        if (pj_list_empty(&pjsua.acc[acc_index].pres_srv_list)) {
+            PJ_LOG(3,(THIS_FILE, "  - none - "));
+        } else {
+            struct pjsua_srv_pres *uapres;
+
+            uapres = pjsua.acc[acc_index].pres_srv_list.next;
+            while (uapres != &pjsua.acc[acc_index].pres_srv_list) {
+            
+                PJ_LOG(3,(THIS_FILE, "    %10s %s",
+                          pjsip_evsub_get_state_name(uapres->sub),
+                          uapres->remote));
+
+                uapres = uapres->next;
+            }
         }
     }