Changeset 3323 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

Timestamp:

Sep 28, 2010 7:43:18 AM (14 years ago)

Author:

bennylp

Message:

Closed #1139 (Support for tel: URI in PJSUA-LIB):

• added new PJSUA API: pjsua_verify_url() which can be used for tel: URI
• modified and tested according to spec
• added new PJSIP error code, PJSIP_ENOROUTESET, to indicate that route set is needed to send to tel: URI
• added couple of unit tests (we can't cover the whole tel: URI scenario yet)

File:

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

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

@@ -120 +120 @@
     pjsua_acc *acc = &pjsua_var.acc[acc_id];
     pjsip_name_addr *name_addr;
-    pjsip_sip_uri *sip_uri, *sip_reg_uri;
+    pjsip_sip_uri *sip_reg_uri;
     pj_status_t status;
     unsigned i;
@@ -137 +137 @@
 
     /* Local URI MUST be a SIP or SIPS: */
-
     if (!PJSIP_URI_SCHEME_IS_SIP(name_addr) && 
         !PJSIP_URI_SCHEME_IS_SIPS(name_addr)) 
     {
-        pjsua_perror(THIS_FILE, "Invalid local URI", 
-                     PJSIP_EINVALIDSCHEME);
-        return PJSIP_EINVALIDSCHEME;
-    }
-
-
-    /* Get the SIP URI object: */
-    sip_uri = (pjsip_sip_uri*) pjsip_uri_get_uri(name_addr);
+        acc->display = name_addr->display;
+        acc->user_part = name_addr->display;
+        acc->srv_domain = pj_str("");
+        acc->srv_port = 0;
+    } else {
+        pjsip_sip_uri *sip_uri;
+
+        /* Get the SIP URI object: */
+        sip_uri = (pjsip_sip_uri*) pjsip_uri_get_uri(name_addr);
+
+        /* Save the user and domain part. These will be used when finding an
+         * account for incoming requests.
+         */
+        acc->display = name_addr->display;
+        acc->user_part = sip_uri->user;
+        acc->srv_domain = sip_uri->host;
+        acc->srv_port = 0;
+    }
 
 
@@ -177 +186 @@
         sip_reg_uri = NULL;
     }
-
-    /* Save the user and domain part. These will be used when finding an 
-     * account for incoming requests.
-     */
-    acc->display = name_addr->display;
-    acc->user_part = sip_uri->user;
-    acc->srv_domain = sip_uri->host;
-    acc->srv_port = 0;
 
     if (sip_reg_uri) {
@@ -2161 +2162 @@
         /* For non-SIP scheme, route set should be configured */
         if (!PJSIP_URI_SCHEME_IS_SIP(uri) && !PJSIP_URI_SCHEME_IS_SIPS(uri))
-            return PJSIP_EINVALIDREQURI;
+            return PJSIP_ENOROUTESET;
 
         sip_uri = (pjsip_sip_uri*)pjsip_uri_get_uri(uri);