Changeset 847 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

Timestamp:

Dec 7, 2006 10:09:16 AM (18 years ago)

Author:

bennylp

Message:

Fixed ticket #38: misleading error message when destination URI is not valid when making outgoing call

File:

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

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

@@ -219 +219 @@
     PJ_ASSERT_RETURN(options == 0, PJ_EINVAL);
 
+    /* Check arguments */
+    PJ_ASSERT_RETURN(dest_uri, PJ_EINVAL);
+
     PJSUA_LOCK();
 
@@ -242 +245 @@
 
     call = &pjsua_var.calls[call_id];
+
+    /* Verify that destination URI is valid before calling 
+     * pjsua_acc_create_uac_contact, or otherwise there  
+     * a misleading "Invalid Contact URI" error will be printed
+     * when pjsua_acc_create_uac_contact() fails.
+     */
+    if (1) {
+        pj_pool_t *pool;
+        pjsip_uri *uri;
+        pj_str_t dup;
+
+        pool = pjsua_pool_create("tmp-uri", 4000, 4000);
+        if (!pool) {
+            pjsua_perror(THIS_FILE, "Unable to create pool", PJ_ENOMEM);
+            PJSUA_UNLOCK();
+            return PJ_ENOMEM;
+        }
+        
+        pj_strdup_with_null(pool, &dup, dest_uri);
+        uri = pjsip_parse_uri(pool, dup.ptr, dup.slen, 0);
+        pj_pool_release(pool);
+
+        if (uri == NULL) {
+            pjsua_perror(THIS_FILE, "Unable to make call", 
+                         PJSIP_EINVALIDREQURI);
+            PJSUA_UNLOCK();
+            return PJSIP_EINVALIDREQURI;
+        }
+    }
 
     PJ_LOG(4,(THIS_FILE, "Making call with acc #%d to %.*s", acc_id,