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

Timestamp:

Jul 18, 2006 12:33:02 AM (18 years ago)

Author:

bennylp

Message:

More intelligent PJSUA-LIB in selecting the appropriate address for Contact header

File:

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

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

@@ -441 +441 @@
     int acc_id;
     pjsua_acc *acc;
+    pj_str_t contact;
     pjsip_method *req_method = &rdata->msg_info.msg->line.req.method;
     pjsua_srv_pres *uapres;
@@ -464 +465 @@
               acc_id));
     
+    /* Create suitable Contact header */
+    status = pjsua_acc_create_uas_contact(rdata->tp_info.pool, &contact,
+                                          acc_id, rdata);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to generate Contact header", status);
+        PJSUA_UNLOCK();
+        return PJ_TRUE;
+    }
+
     /* Create UAS dialog: */
     status = pjsip_dlg_create_uas(pjsip_ua_instance(), rdata, 
-                                  &acc->real_contact,
-                                  &dlg);
+                                  &contact, &dlg);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, 
@@ -762 +771 @@
     int acc_id;
     pjsua_acc *acc;
+    pj_str_t contact;
     pjsip_dialog *dlg;
     pjsip_tx_data *tdata;
@@ -774 +784 @@
                          acc_id, index));
 
+    /* Generate suitable Contact header */
+    status = pjsua_acc_create_uac_contact(pjsua_var.pool, &contact,
+                                          acc_id, &buddy->uri);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to generate Contact header", status);
+        return;
+    }
+
     /* Create UAC dialog */
     status = pjsip_dlg_create_uac( pjsip_ua_instance(), 
                                    &acc->cfg.id,
-                                   &acc->real_contact,
+                                   &contact,
                                    &buddy->uri,
                                    NULL, &dlg);