Changeset 611 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.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_call.c (modified) (5 diffs)

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

@@ -192 +192 @@
     pjsua_call *call;
     unsigned call_id;
+    pj_str_t contact;
     pjsip_tx_data *tdata;
     pj_status_t status;
@@ -233 +234 @@
     call->res_time.sec = 0;
 
+    /* Create suitable Contact header */
+    status = pjsua_acc_create_uac_contact(pjsua_var.pool, &contact,
+                                          acc_id, dest_uri);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to generate Contact header", status);
+        PJSUA_UNLOCK();
+        return status;
+    }
+
     /* Create outgoing dialog: */
     status = pjsip_dlg_create_uac( pjsip_ua_instance(), 
-                                   &acc->cfg.id, &acc->real_contact,
+                                   &acc->cfg.id, &contact,
                                    dest_uri, dest_uri, &dlg);
     if (status != PJ_SUCCESS) {
@@ -346 +356 @@
 pj_bool_t pjsua_call_on_incoming(pjsip_rx_data *rdata)
 {
+    pj_str_t contact;
     pjsip_dialog *dlg = pjsip_rdata_get_dlg(rdata);
     pjsip_transaction *tsx = pjsip_rdata_get_tsx(rdata);
@@ -440 +451 @@
     acc_id = pjsua_acc_find_for_incoming(rdata);
 
+    /* Get 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);
+        pjsip_endpt_respond_stateless(pjsua_var.endpt, rdata, 500, NULL,
+                                      NULL, NULL);
+        return PJ_TRUE;
+    }
+
     /* Create dialog: */
     status = pjsip_dlg_create_uas( pjsip_ua_instance(), rdata,
-                                   &pjsua_var.acc[acc_id].real_contact, 
-                                   &dlg);
+                                   &contact, &dlg);
     if (status != PJ_SUCCESS) {
         pjsip_endpt_respond_stateless(pjsua_var.endpt, rdata, 500, NULL,
@@ -922 +942 @@
 
     /* Create SDP */
+    PJ_TODO(create_active_inactive_sdp_based_on_unhold_arg);
     status = pjmedia_endpt_create_sdp( pjsua_var.med_endpt, call->inv->pool, 
                                        1, &call->skinfo, &sdp);