summaryrefslogtreecommitdiff
path: root/pjsip
diff options
context:
space:
mode:
authorRiza Sulistyo <riza@teluu.com>2013-02-27 14:47:37 +0000
committerRiza Sulistyo <riza@teluu.com>2013-02-27 14:47:37 +0000
commitaaba645d78fe19516d84857947eeb24f429f6c6b (patch)
tree3fc21c1f45b3e31a48bdb15b7863f4de0135b2c8 /pjsip
parent78d22f7f7eb6f1fd0e22947828e41618611826b3 (diff)
Re #1615: backported to 1.x
git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/1.x@4404 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip')
-rw-r--r--pjsip/include/pjsip/sip_uri.h8
-rw-r--r--pjsip/src/pjsua-lib/pjsua_core.c4
2 files changed, 6 insertions, 6 deletions
diff --git a/pjsip/include/pjsip/sip_uri.h b/pjsip/include/pjsip/sip_uri.h
index 50b39913..44124a9d 100644
--- a/pjsip/include/pjsip/sip_uri.h
+++ b/pjsip/include/pjsip/sip_uri.h
@@ -226,12 +226,12 @@ struct pjsip_uri
};
/**
- * This macro checks that the URL is a "sip:" or "sips:" URL.
+ * This macro checks that the URL is a "sip:" URL.
* @param url The URL (pointer to)
* @return non-zero if TRUE.
*/
#define PJSIP_URI_SCHEME_IS_SIP(url) \
- (pj_strnicmp2(pjsip_uri_get_scheme(url), "sip", 3)==0)
+ (pj_stricmp2(pjsip_uri_get_scheme(url), "sip")==0)
/**
* This macro checks that the URL is a "sips:" URL (not SIP).
@@ -239,7 +239,7 @@ struct pjsip_uri
* @return non-zero if TRUE.
*/
#define PJSIP_URI_SCHEME_IS_SIPS(url) \
- (pj_strnicmp2(pjsip_uri_get_scheme(url), "sips", 4)==0)
+ (pj_stricmp2(pjsip_uri_get_scheme(url), "sips")==0)
/**
* This macro checks that the URL is a "tel:" URL.
@@ -247,7 +247,7 @@ struct pjsip_uri
* @return non-zero if TRUE.
*/
#define PJSIP_URI_SCHEME_IS_TEL(url) \
- (pj_strnicmp2(pjsip_uri_get_scheme(url), "tel", 3)==0)
+ (pj_stricmp2(pjsip_uri_get_scheme(url), "tel")==0)
/**
diff --git a/pjsip/src/pjsua-lib/pjsua_core.c b/pjsip/src/pjsua-lib/pjsua_core.c
index 7d8906ec..5d64ed9a 100644
--- a/pjsip/src/pjsua-lib/pjsua_core.c
+++ b/pjsip/src/pjsua-lib/pjsua_core.c
@@ -828,7 +828,7 @@ PJ_DEF(pj_status_t) pjsua_init( const pjsua_config *ua_cfg,
if (pjsua_var.ua_cfg.force_lr) {
pjsip_sip_uri *sip_url;
if (!PJSIP_URI_SCHEME_IS_SIP(r->name_addr.uri) &&
- !PJSIP_URI_SCHEME_IS_SIP(r->name_addr.uri))
+ !PJSIP_URI_SCHEME_IS_SIPS(r->name_addr.uri))
{
return PJSIP_EINVALIDSCHEME;
}
@@ -2578,7 +2578,7 @@ pj_status_t normalize_route_uri(pj_pool_t *pool, pj_str_t *uri)
}
if (!PJSIP_URI_SCHEME_IS_SIP(uri_obj) &&
- !PJSIP_URI_SCHEME_IS_SIP(uri_obj))
+ !PJSIP_URI_SCHEME_IS_SIPS(uri_obj))
{
PJ_LOG(1,(THIS_FILE, "Route URI must be SIP URI: %.*s",
(int)uri->slen, uri->ptr));