Changeset 4370

Timestamp:

Feb 26, 2013 5:30:00 AM (12 years ago)

Author:

nanang

Message:

Close #1615: Fixed bug in URI scheme check macro PJSIP_URI_SCHEME_IS_SIP()/SIPS/TEL.

Location:

pjproject/trunk

Files:

• pjsip-apps/src/samples/pjsip-perf.c (modified) (3 diffs)
• pjsip-apps/src/samples/proxy.h (modified) (1 diff)
• pjsip/include/pjsip/sip_uri.h (modified) (3 diffs)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (2 diffs)

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

@@ -220 +220 @@
     uri = pjsip_uri_get_uri(rdata->msg_info.msg->line.req.uri);
 
-    /* Only want to receive SIP scheme */
-    if (!PJSIP_URI_SCHEME_IS_SIP(uri))
+    /* Only want to receive SIP/SIPS scheme */
+    if (!PJSIP_URI_SCHEME_IS_SIP(uri) && !PJSIP_URI_SCHEME_IS_SIPS(uri))
         return PJ_FALSE;
 
@@ -281 +281 @@
     uri = pjsip_uri_get_uri(rdata->msg_info.msg->line.req.uri);
 
-    /* Only want to receive SIP scheme */
-    if (!PJSIP_URI_SCHEME_IS_SIP(uri))
+    /* Only want to receive SIP/SIPS scheme */
+    if (!PJSIP_URI_SCHEME_IS_SIP(uri) && !PJSIP_URI_SCHEME_IS_SIPS(uri))
         return PJ_FALSE;
 
@@ -418 +418 @@
     uri = pjsip_uri_get_uri(rdata->msg_info.msg->line.req.uri);
 
-    /* Only want to receive SIP scheme */
-    if (!PJSIP_URI_SCHEME_IS_SIP(uri))
+    /* Only want to receive SIP/SIPS scheme */
+    if (!PJSIP_URI_SCHEME_IS_SIP(uri) && !PJSIP_URI_SCHEME_IS_SIPS(uri))
         return PJ_FALSE;
 

pjproject/trunk/pjsip-apps/src/samples/proxy.h

@@ -365 +365 @@
 
     /* 2. URI scheme.
-     * We only want to support "sip:" URI scheme for this simple proxy.
-     */
-    if (!PJSIP_URI_SCHEME_IS_SIP(rdata->msg_info.msg->line.req.uri)) {
+     * We only want to support "sip:"/"sips:" URI scheme for this simple proxy.
+     */
+    if (!PJSIP_URI_SCHEME_IS_SIP(rdata->msg_info.msg->line.req.uri) &&
+        !PJSIP_URI_SCHEME_IS_SIPS(rdata->msg_info.msg->line.req.uri))
+    {
         pjsip_endpt_respond_stateless(global.endpt, rdata, 
                                       PJSIP_SC_UNSUPPORTED_URI_SCHEME, NULL,

pjproject/trunk/pjsip/include/pjsip/sip_uri.h

@@ -227 +227 @@
 
 /**
- * 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)
 
 /**
@@ -240 +240 @@
  */
 #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)
 
 /**
@@ -248 +248 @@
  */
 #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)
 
 

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

@@ -959 +959 @@
             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))
             {
                 status = PJSIP_EINVALIDSCHEME;
@@ -2841 +2841 @@
 
     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",