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

Timestamp:

Apr 15, 2008 10:37:19 AM (17 years ago)

Author:

bennylp

Message:

Use the smart Contact header for TCP/TLS

File:

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

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

@@ -553 +553 @@
     
     /* 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;
+    if (acc->contact.slen) {
+        contact = acc->contact;
+    } else {
+        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;
+        }
     }
 
@@ -1124 +1129 @@
                          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;
+    /* Generate suitable Contact header unless one is already set in
+     * the account
+     */
+    if (acc->contact.slen) {
+        contact = acc->contact;
+    } else {
+        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;
+        }
     }