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)


git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3323 74dad513-b988-da41-8d7b-12977e46ad98

4 files changed, 9 insertions, 9 deletions

diff --git a/pjsip-apps/src/pjsua/pjsua_app.c b/pjsip-apps/src/pjsua/pjsua_app.c
index 1fbea781..ead85940 100644
--- a/pjsip-apps/src/pjsua/pjsua_app.c
+++ b/pjsip-apps/src/pjsua/pjsua_app.c
@@ -919,7 +919,7 @@ static pj_status_t parse_args(int argc, char *argv[],
 	    break;
 
 	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' "
 			  "in local id argument", pj_optarg));
@@ -1037,7 +1037,7 @@ static pj_status_t parse_args(int argc, char *argv[],
 	    break;
 
 	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 "
 			  "--add-buddy option", pj_optarg));
@@ -1421,7 +1421,7 @@ static pj_status_t parse_args(int argc, char *argv[],
     if (pj_optind != argc) {
 	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;
 	}
@@ -3276,7 +3276,7 @@ static void ui_input_url(const char *title, char *buf, int len,
     } else {
 	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;
 	}
@@ -3811,8 +3811,8 @@ void console_app_main(const pj_str_t *uri_to_call)
 		if (!simple_input("Enter buddy's URI:", buf, sizeof(buf)))
 		    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;
 		}
 
diff --git a/pjsip-apps/src/samples/simple_pjsua.c b/pjsip-apps/src/samples/simple_pjsua.c
index ab2d0174..b9580476 100644
--- a/pjsip-apps/src/samples/simple_pjsua.c
+++ b/pjsip-apps/src/samples/simple_pjsua.c
@@ -117,7 +117,7 @@ int main(int argc, char *argv[])
 
     /* 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);
     }
 
diff --git a/pjsip-apps/src/symbian_ua/ua.cpp b/pjsip-apps/src/symbian_ua/ua.cpp
index f38d2e64..a59b95a9 100644
--- a/pjsip-apps/src/symbian_ua/ua.cpp
+++ b/pjsip-apps/src/symbian_ua/ua.cpp
@@ -733,7 +733,7 @@ static void HandleMainMenu(TKeyCode kc) {
 		break;
 	}
 
-	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,
 				     NULL, &g_call_id);
diff --git a/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp b/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp
index bf3f7a36..b384c20e 100644
--- a/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp
+++ b/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp
@@ -482,7 +482,7 @@ int symbian_ua_set_account(const char *domain, const char *username,
 

 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,

 				 NULL, &g_call_id);