Changeset 3323 for pjproject/trunk

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)

Location:

pjproject/trunk

Files:

• pjsip-apps/src/pjsua/pjsua_app.c (modified) (5 diffs)
• pjsip-apps/src/samples/simple_pjsua.c (modified) (1 diff)
• pjsip-apps/src/symbian_ua/ua.cpp (modified) (1 diff)
• pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp (modified) (1 diff)
• pjsip/include/pjsip/sip_errno.h (modified) (1 diff)
• pjsip/include/pjsua-lib/pjsua.h (modified) (1 diff)
• pjsip/src/pjsip/sip_errno.c (modified) (1 diff)
• pjsip/src/pjsip/sip_util.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_acc.c (modified) (4 diffs)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (3 diffs)
• tests/pjsua/scripts-call/400_tel_uri.py (added)
• tests/pjsua/scripts-recvfrom/235_reg_good_tel_uri_enocredential.py (added)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -920 +920 @@
 
         case OPT_ID:   /* id */
-            if (pjsua_verify_sip_url(pj_optarg) != 0) {
+            if (pjsua_verify_url(pj_optarg) != 0) {
                 PJ_LOG(1,(THIS_FILE, 
                           "Error: invalid SIP URL '%s' "
@@ -1038 +1038 @@
 
         case OPT_ADD_BUDDY: /* Add to buddy list. */
-            if (pjsua_verify_sip_url(pj_optarg) != 0) {
+            if (pjsua_verify_url(pj_optarg) != 0) {
                 PJ_LOG(1,(THIS_FILE, 
                           "Error: invalid URL '%s' in "
@@ -1422 +1422 @@
         pj_str_t uri_arg;
 
-        if (pjsua_verify_sip_url(argv[pj_optind]) != PJ_SUCCESS) {
+        if (pjsua_verify_url(argv[pj_optind]) != PJ_SUCCESS) {
             PJ_LOG(1,(THIS_FILE, "Invalid SIP URI %s", argv[pj_optind]));
             return -1;
@@ -3277 +3277 @@
         pj_status_t status;
 
-        if ((status=pjsua_verify_sip_url(buf)) != PJ_SUCCESS) {
+        if ((status=pjsua_verify_url(buf)) != PJ_SUCCESS) {
             pjsua_perror(THIS_FILE, "Invalid URL", status);
             return;
@@ -3812 +3812 @@
                     break;
 
-                if (pjsua_verify_sip_url(buf) != PJ_SUCCESS) {
-                    printf("Invalid SIP URI '%s'\n", buf);
+                if (pjsua_verify_url(buf) != PJ_SUCCESS) {
+                    printf("Invalid URI '%s'\n", buf);
                     break;
                 }

pjproject/trunk/pjsip-apps/src/samples/simple_pjsua.c

@@ -118 +118 @@
     /* If argument is specified, it's got to be a valid SIP URL */
     if (argc > 1) {
-        status = pjsua_verify_sip_url(argv[1]);
+        status = pjsua_verify_url(argv[1]);
         if (status != PJ_SUCCESS) error_exit("Invalid URL in argv", status);
     }

pjproject/trunk/pjsip-apps/src/symbian_ua/ua.cpp

@@ -734 +734 @@
         }
 
-        if (pjsua_verify_sip_url(SIP_DST_URI) == PJ_SUCCESS) {
+        if (pjsua_verify_url(SIP_DST_URI) == PJ_SUCCESS) {
                 pj_str_t dst = pj_str(SIP_DST_URI);
                 pjsua_call_make_call(g_acc_id, &dst, 0, NULL,

pjproject/trunk/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp

@@ -483 +483 @@
 int symbian_ua_makecall(const char* dest_url)
 {
-    if (pjsua_verify_sip_url(dest_url) == PJ_SUCCESS) {
+    if (pjsua_verify_url(dest_url) == PJ_SUCCESS) {
             pj_str_t dst = pj_str((char*)dest_url);
             pjsua_call_make_call(g_acc_id, &dst, 0, NULL,

pjproject/trunk/pjsip/include/pjsip/sip_errno.h

@@ -97 +97 @@
  */
 #define PJSIP_ENOTINITIALIZED   (PJSIP_ERRNO_START_PJSIP + 4)   /* 171004 */
+/**
+ * @hideinitializer
+ * Missing route set (for tel: URI)
+ */
+#define PJSIP_ENOROUTESET       (PJSIP_ERRNO_START_PJSIP + 5)   /* 171005 */
 
 

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -1541 +1541 @@
 /**
  * This is a utility function to verify that valid SIP url is given. If the
- * URL is valid, PJ_SUCCESS will be returned.
+ * URL is a valid SIP/SIPS scheme, PJ_SUCCESS will be returned.
  *
  * @param url           The URL, as NULL terminated string.
  *
  * @return              PJ_SUCCESS on success, or the appropriate error code.
+ *
+ * @see pjsua_verify_url()
  */
 PJ_DECL(pj_status_t) pjsua_verify_sip_url(const char *url);
+
+
+/**
+ * This is a utility function to verify that valid URI is given. Unlike
+ * pjsua_verify_sip_url(), this function will return PJ_SUCCESS if tel: URI
+ * is given.
+ *
+ * @param url           The URL, as NULL terminated string.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ *
+ * @see pjsua_verify_sip_url()
+ */
+PJ_DECL(pj_status_t) pjsua_verify_url(const char *url);
 
 

pjproject/trunk/pjsip/src/pjsip/sip_errno.c

@@ -40 +40 @@
     PJ_BUILD_ERR( PJSIP_ESHUTDOWN,      "SIP stack shutting down" ),
     PJ_BUILD_ERR( PJSIP_ENOTINITIALIZED,"SIP object is not initialized." ),
+    PJ_BUILD_ERR( PJSIP_ENOROUTESET,    "Missing route set (for tel: URI)" ),
 
     /* Messaging errors */

pjproject/trunk/pjsip/src/pjsip/sip_util.c

@@ -836 +836 @@
             pjsip_transport_get_flag_from_type(dest_info->type);
     } else {
+        /* Should have never reached here; app should have configured route
+         * set when sending to tel: URI
         pj_assert(!"Unsupported URI scheme!");
+         */
         PJ_TODO(SUPPORT_REQUEST_ADDR_RESOLUTION_FOR_TEL_URI);
-        return PJSIP_EINVALIDSCHEME;
+        return PJSIP_ENOROUTESET;
     }
 

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);

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

@@ -2405 +2405 @@
 }
 
-
-/*
- * Verify that valid SIP url is given.
- */
-PJ_DEF(pj_status_t) pjsua_verify_sip_url(const char *c_url)
+/*
+ * Verify that valid url is given.
+ */
+PJ_DEF(pj_status_t) pjsua_verify_url(const char *c_url)
 {
     pjsip_uri *p;
@@ -2416 +2415 @@
     int len = (c_url ? pj_ansi_strlen(c_url) : 0);
 
-    if (!len) return -1;
+    if (!len) return PJSIP_EINVALIDURI;
 
     pool = pj_pool_create(&pjsua_var.cp.factory, "check%p", 1024, 0, NULL);
-    if (!pool) return -1;
+    if (!pool) return PJ_ENOMEM;
+
+    url = (char*) pj_pool_alloc(pool, len+1);
+    pj_ansi_strcpy(url, c_url);
+
+    p = pjsip_parse_uri(pool, url, len, 0);
+
+    pj_pool_release(pool);
+    return p ? 0 : PJSIP_EINVALIDURI;
+}
+
+/*
+ * Verify that valid SIP url is given.
+ */
+PJ_DEF(pj_status_t) pjsua_verify_sip_url(const char *c_url)
+{
+    pjsip_uri *p;
+    pj_pool_t *pool;
+    char *url;
+    int len = (c_url ? pj_ansi_strlen(c_url) : 0);
+
+    if (!len) return PJSIP_EINVALIDURI;
+
+    pool = pj_pool_create(&pjsua_var.cp.factory, "check%p", 1024, 0, NULL);
+    if (!pool) return PJ_ENOMEM;
 
     url = (char*) pj_pool_alloc(pool, len+1);
@@ -2432 +2455 @@
 
     pj_pool_release(pool);
-    return p ? 0 : -1;
+    return p ? 0 : PJSIP_EINVALIDURI;
 }