Changeset 4404


Ignore:
Timestamp:
Feb 27, 2013 2:47:37 PM (7 years ago)
Author:
riza
Message:

Re #1615: backported to 1.x

Location:
pjproject/branches/1.x
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/1.x

  • pjproject/branches/1.x/pjsip-apps/src/samples/pjsip-perf.c

    r3816 r4404  
    220220    uri = pjsip_uri_get_uri(rdata->msg_info.msg->line.req.uri); 
    221221 
    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)) 
    224224        return PJ_FALSE; 
    225225 
     
    281281    uri = pjsip_uri_get_uri(rdata->msg_info.msg->line.req.uri); 
    282282 
    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)) 
    285285        return PJ_FALSE; 
    286286 
     
    418418    uri = pjsip_uri_get_uri(rdata->msg_info.msg->line.req.uri); 
    419419 
    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)) 
    422422        return PJ_FALSE; 
    423423 
  • pjproject/branches/1.x/pjsip-apps/src/samples/proxy.h

    r3553 r4404  
    365365 
    366366    /* 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    { 
    370372        pjsip_endpt_respond_stateless(global.endpt, rdata,  
    371373                                      PJSIP_SC_UNSUPPORTED_URI_SCHEME, NULL, 
  • pjproject/branches/1.x/pjsip/include/pjsip/sip_uri.h

    r3553 r4404  
    227227 
    228228/** 
    229  * This macro checks that the URL is a "sip:" or "sips:" URL. 
     229 * This macro checks that the URL is a "sip:" URL. 
    230230 * @param url The URL (pointer to) 
    231231 * @return non-zero if TRUE. 
    232232 */ 
    233233#define PJSIP_URI_SCHEME_IS_SIP(url)    \ 
    234     (pj_strnicmp2(pjsip_uri_get_scheme(url), "sip", 3)==0) 
     234    (pj_stricmp2(pjsip_uri_get_scheme(url), "sip")==0) 
    235235 
    236236/** 
     
    240240 */ 
    241241#define PJSIP_URI_SCHEME_IS_SIPS(url)   \ 
    242     (pj_strnicmp2(pjsip_uri_get_scheme(url), "sips", 4)==0) 
     242    (pj_stricmp2(pjsip_uri_get_scheme(url), "sips")==0) 
    243243 
    244244/** 
     
    248248 */ 
    249249#define PJSIP_URI_SCHEME_IS_TEL(url)    \ 
    250     (pj_strnicmp2(pjsip_uri_get_scheme(url), "tel", 3)==0) 
     250    (pj_stricmp2(pjsip_uri_get_scheme(url), "tel")==0) 
    251251 
    252252 
  • pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_core.c

    r4389 r4404  
    829829            pjsip_sip_uri *sip_url; 
    830830            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)) 
    832832            { 
    833833                return PJSIP_EINVALIDSCHEME; 
     
    25792579 
    25802580    if (!PJSIP_URI_SCHEME_IS_SIP(uri_obj) &&  
    2581         !PJSIP_URI_SCHEME_IS_SIP(uri_obj)) 
     2581        !PJSIP_URI_SCHEME_IS_SIPS(uri_obj)) 
    25822582    { 
    25832583        PJ_LOG(1,(THIS_FILE, "Route URI must be SIP URI: %.*s",  
Note: See TracChangeset for help on using the changeset viewer.