Changeset 4404
- Timestamp:
- Feb 27, 2013 2:47:37 PM (12 years ago)
- Location:
- pjproject/branches/1.x
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/branches/1.x
- Property svn:mergeinfo changed
/pjproject/trunk merged: 4370
- Property svn:mergeinfo changed
-
pjproject/branches/1.x/pjsip-apps/src/samples/pjsip-perf.c
r3816 r4404 220 220 uri = pjsip_uri_get_uri(rdata->msg_info.msg->line.req.uri); 221 221 222 /* Only want to receive SIP scheme */223 if (!PJSIP_URI_SCHEME_IS_SIP(uri) )222 /* Only want to receive SIP/SIPS scheme */ 223 if (!PJSIP_URI_SCHEME_IS_SIP(uri) && !PJSIP_URI_SCHEME_IS_SIPS(uri)) 224 224 return PJ_FALSE; 225 225 … … 281 281 uri = pjsip_uri_get_uri(rdata->msg_info.msg->line.req.uri); 282 282 283 /* Only want to receive SIP scheme */284 if (!PJSIP_URI_SCHEME_IS_SIP(uri) )283 /* Only want to receive SIP/SIPS scheme */ 284 if (!PJSIP_URI_SCHEME_IS_SIP(uri) && !PJSIP_URI_SCHEME_IS_SIPS(uri)) 285 285 return PJ_FALSE; 286 286 … … 418 418 uri = pjsip_uri_get_uri(rdata->msg_info.msg->line.req.uri); 419 419 420 /* Only want to receive SIP scheme */421 if (!PJSIP_URI_SCHEME_IS_SIP(uri) )420 /* Only want to receive SIP/SIPS scheme */ 421 if (!PJSIP_URI_SCHEME_IS_SIP(uri) && !PJSIP_URI_SCHEME_IS_SIPS(uri)) 422 422 return PJ_FALSE; 423 423 -
pjproject/branches/1.x/pjsip-apps/src/samples/proxy.h
r3553 r4404 365 365 366 366 /* 2. URI scheme. 367 * We only want to support "sip:" URI scheme for this simple proxy. 368 */ 369 if (!PJSIP_URI_SCHEME_IS_SIP(rdata->msg_info.msg->line.req.uri)) { 367 * We only want to support "sip:"/"sips:" URI scheme for this simple proxy. 368 */ 369 if (!PJSIP_URI_SCHEME_IS_SIP(rdata->msg_info.msg->line.req.uri) && 370 !PJSIP_URI_SCHEME_IS_SIPS(rdata->msg_info.msg->line.req.uri)) 371 { 370 372 pjsip_endpt_respond_stateless(global.endpt, rdata, 371 373 PJSIP_SC_UNSUPPORTED_URI_SCHEME, NULL, -
pjproject/branches/1.x/pjsip/include/pjsip/sip_uri.h
r3553 r4404 227 227 228 228 /** 229 * This macro checks that the URL is a "sip:" or "sips:"URL.229 * This macro checks that the URL is a "sip:" URL. 230 230 * @param url The URL (pointer to) 231 231 * @return non-zero if TRUE. 232 232 */ 233 233 #define PJSIP_URI_SCHEME_IS_SIP(url) \ 234 (pj_str nicmp2(pjsip_uri_get_scheme(url), "sip", 3)==0)234 (pj_stricmp2(pjsip_uri_get_scheme(url), "sip")==0) 235 235 236 236 /** … … 240 240 */ 241 241 #define PJSIP_URI_SCHEME_IS_SIPS(url) \ 242 (pj_str nicmp2(pjsip_uri_get_scheme(url), "sips", 4)==0)242 (pj_stricmp2(pjsip_uri_get_scheme(url), "sips")==0) 243 243 244 244 /** … … 248 248 */ 249 249 #define PJSIP_URI_SCHEME_IS_TEL(url) \ 250 (pj_str nicmp2(pjsip_uri_get_scheme(url), "tel", 3)==0)250 (pj_stricmp2(pjsip_uri_get_scheme(url), "tel")==0) 251 251 252 252 -
pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_core.c
r4389 r4404 829 829 pjsip_sip_uri *sip_url; 830 830 if (!PJSIP_URI_SCHEME_IS_SIP(r->name_addr.uri) && 831 !PJSIP_URI_SCHEME_IS_SIP (r->name_addr.uri))831 !PJSIP_URI_SCHEME_IS_SIPS(r->name_addr.uri)) 832 832 { 833 833 return PJSIP_EINVALIDSCHEME; … … 2579 2579 2580 2580 if (!PJSIP_URI_SCHEME_IS_SIP(uri_obj) && 2581 !PJSIP_URI_SCHEME_IS_SIP (uri_obj))2581 !PJSIP_URI_SCHEME_IS_SIPS(uri_obj)) 2582 2582 { 2583 2583 PJ_LOG(1,(THIS_FILE, "Route URI must be SIP URI: %.*s",
Note: See TracChangeset
for help on using the changeset viewer.