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

Timestamp:

May 26, 2006 12:17:46 PM (18 years ago)

Author:

bennylp

Message:

First stage in pjsua library re-arrangements towards creating an easy to use high level API

File:

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

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

@@ -18 +18 @@
  */
 #include <pjsua-lib/pjsua.h>
+#include "pjsua_imp.h"
 
 /*
@@ -81 +82 @@
 {
     int acc_index;
+    pjsua_acc_config *acc_config;
     pjsip_method *req_method = &rdata->msg_info.msg->line.req.method;
     pjsua_srv_pres *uapres;
@@ -97 +99 @@
     /* Find which account for the incoming request. */
     acc_index = pjsua_find_account_for_incoming(rdata);
+    acc_config = &pjsua.config.acc_config[acc_index];
 
     /* Create UAS dialog: */
-    status = pjsip_dlg_create_uas( pjsip_ua_instance(), rdata, 
-                                   &pjsua.acc[acc_index].contact_uri, 
-                                   &dlg);
+    status = pjsip_dlg_create_uas(pjsip_ua_instance(), rdata, 
+                                  &acc_config->contact,
+                                  &dlg);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, 
@@ -307 +310 @@
 {
     int acc_index;
+    pjsua_acc_config *acc_config;
     pjsip_dialog *dlg;
     pjsip_tx_data *tdata;
@@ -312 +316 @@
 
     acc_index = pjsua.buddies[index].acc_index;
+    acc_config = &pjsua.config.acc_config[acc_index];
 
     status = pjsip_dlg_create_uac( pjsip_ua_instance(), 
-                                   &pjsua.acc[acc_index].local_uri,
-                                   &pjsua.acc[acc_index].contact_uri,
+                                   &acc_config->id,
+                                   &acc_config->contact,
                                    &pjsua.buddies[index].uri,
                                    NULL, &dlg);
@@ -324 +329 @@
     }
 
-    pjsip_auth_clt_set_credentials( &dlg->auth_sess, pjsua.cred_count,
-                                    pjsua.cred_info);
+    if (acc_config->cred_count) {
+        pjsip_auth_clt_set_credentials( &dlg->auth_sess, 
+                                        acc_config->cred_count,
+                                        acc_config->cred_info);
+    }
 
     status = pjsip_pres_create_uac( dlg, &pres_callback, 
@@ -427 +435 @@
  * Refresh presence
  */
-void pjsua_pres_refresh(int acc_index)
+PJ_DEF(void) pjsua_pres_refresh(int acc_index)
 {
     refresh_client_subscription();
@@ -442 +450 @@
     int i;
 
-    for (acc_index=0; acc_index<pjsua.acc_cnt; ++acc_index) {
+    for (acc_index=0; acc_index<(int)pjsua.config.acc_cnt; ++acc_index) {
         pjsua.acc[acc_index].online_status = 0;
     }
@@ -450 +458 @@
     }
 
-    for (acc_index=0; acc_index<pjsua.acc_cnt; ++acc_index) {
+    for (acc_index=0; acc_index<(int)pjsua.config.acc_cnt; ++acc_index) {
         pjsua_pres_refresh(acc_index);
     }
@@ -472 +480 @@
         int count = 0;
 
-        for (acc_index=0; acc_index < pjsua.acc_cnt; ++acc_index) {
+        for (acc_index=0; acc_index < (int)pjsua.config.acc_cnt; ++acc_index) {
 
             if (!pj_list_empty(&pjsua.acc[acc_index].pres_srv_list)) {
@@ -507 +515 @@
     PJ_LOG(3,(THIS_FILE, "Dumping pjsua server subscriptions:"));
 
-    for (acc_index=0; acc_index < pjsua.acc_cnt; ++acc_index) {
+    for (acc_index=0; acc_index < (int)pjsua.config.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));
+                  (int)pjsua.config.acc_config[acc_index].id.slen,
+                  pjsua.config.acc_config[acc_index].id.ptr));
 
         if (pj_list_empty(&pjsua.acc[acc_index].pres_srv_list)) {