Changeset 512

Timestamp:

Jun 15, 2006 12:25:46 PM (18 years ago)

Author:

bennylp

Message:

Fixed couple of bugs in pjsua API: (1) server presence subscription not setting credentials, and (2) incorrect account status is reported when registration failed

Location:

pjproject/trunk/pjsip/src/pjsua-lib

Files:

• pjsua_acc.c (modified) (1 diff)
• pjsua_pres.c (modified) (3 diffs)

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

@@ -569 +569 @@
         info->status_text = pj_str(info->buf_);
     } else if (acc->reg_last_code) {
-        if (acc->regc) {
+        if (info->has_registration) {
             info->status = acc->reg_last_code;
             info->status_text = *pjsip_get_status_text(acc->reg_last_code);

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

@@ -440 +440 @@
 {
     int acc_id;
-    pjsua_acc_config *acc_config;
+    pjsua_acc *acc;
     pjsip_method *req_method = &rdata->msg_info.msg->line.req.method;
     pjsua_srv_pres *uapres;
@@ -459 +459 @@
     /* Find which account for the incoming request. */
     acc_id = pjsua_acc_find_for_incoming(rdata);
-    acc_config = &pjsua_var.acc[acc_id].cfg;
-
+    acc = &pjsua_var.acc[acc_id];
+
+    PJ_LOG(4,(THIS_FILE, "Creating server subscription, using account %d",
+              acc_id));
+    
     /* Create UAS dialog: */
     status = pjsip_dlg_create_uas(pjsip_ua_instance(), rdata, 
-                                  &acc_config->contact,
+                                  &acc->cfg.contact,
                                   &dlg);
     if (status != PJ_SUCCESS) {
@@ -472 +475 @@
         return PJ_TRUE;
     }
+
+    /* Set credentials. */
+    pjsip_auth_clt_set_credentials(&dlg->auth_sess, acc->cred_cnt, acc->cred);
 
     /* Init callback: */