Changeset 1930

Timestamp:

Apr 15, 2008 10:35:32 AM (16 years ago)

Author:

bennylp

Message:

Use the smart Contact header for TCP/TLS

Location:

pjproject/branches/projects/ice-turn07/pjsip/src/pjsua-lib

Files:

• pjsua_acc.c (modified) (6 diffs)
• pjsua_call.c (modified) (2 diffs)
• pjsua_pres.c (modified) (2 diffs)

pjproject/branches/projects/ice-turn07/pjsip/src/pjsua-lib/pjsua_acc.c

@@ -566 +566 @@
         pjsip_regc_destroy(acc->regc);
         acc->regc = NULL;
+        acc->contact.slen = 0;
     }
 
@@ -854 +855 @@
         pjsip_regc_destroy(acc->regc);
         acc->regc = NULL;
+        acc->contact.slen = 0;
         
         /* Stop keep-alive timer if any. */
@@ -864 +866 @@
         pjsip_regc_destroy(acc->regc);
         acc->regc = NULL;
+        acc->contact.slen = 0;
 
         /* Stop keep-alive timer if any. */
@@ -873 +876 @@
             pjsip_regc_destroy(acc->regc);
             acc->regc = NULL;
+            acc->contact.slen = 0;
 
             /* Stop keep-alive timer if any. */
@@ -941 +945 @@
         pjsip_regc_destroy(acc->regc);
         acc->regc = NULL;
+        acc->contact.slen = 0;
     }
 
@@ -987 +992 @@
         pj_pool_release(pool);
         acc->regc = NULL;
+        acc->contact.slen = 0;
         return status;
     }

pjproject/branches/projects/ice-turn07/pjsip/src/pjsua-lib/pjsua_call.c

@@ -406 +406 @@
     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 suitable Contact header unless a Contact header has been
+     * set in the account.
+     */
+    if (acc->contact.slen) {
+        contact = acc->contact;
+    } else {
+        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;
+        }
     }
 
@@ -788 +795 @@
 
     /* 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);
-        pjsua_media_channel_deinit(call->index);
-        PJSUA_UNLOCK();
-        return PJ_TRUE;
+    if (pjsua_var.acc[acc_id].contact.slen) {
+        contact = pjsua_var.acc[acc_id].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);
+            pjsip_endpt_respond_stateless(pjsua_var.endpt, rdata, 500, NULL,
+                                          NULL, NULL);
+            pjsua_media_channel_deinit(call->index);
+            PJSUA_UNLOCK();
+            return PJ_TRUE;
+        }
     }
 

pjproject/branches/projects/ice-turn07/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;
+        }
     }