diff options
author | Nanang Izzuddin <nanang@teluu.com> | 2013-02-26 05:30:00 +0000 |
---|---|---|
committer | Nanang Izzuddin <nanang@teluu.com> | 2013-02-26 05:30:00 +0000 |
commit | 170283b7888444253607a202bc2dfd6bc8dd1528 (patch) | |
tree | 06f8bd99ef570f1b77b667174e80c04d281303b1 /pjsip-apps | |
parent | 8d2def95ddeb363ef69bf16961871ce4b2a34949 (diff) |
Close #1615: Fixed bug in URI scheme check macro PJSIP_URI_SCHEME_IS_SIP()/SIPS/TEL.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4370 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps')
-rw-r--r-- | pjsip-apps/src/samples/pjsip-perf.c | 12 | ||||
-rw-r--r-- | pjsip-apps/src/samples/proxy.h | 6 |
2 files changed, 10 insertions, 8 deletions
diff --git a/pjsip-apps/src/samples/pjsip-perf.c b/pjsip-apps/src/samples/pjsip-perf.c index c462cf84..ae4ce041 100644 --- a/pjsip-apps/src/samples/pjsip-perf.c +++ b/pjsip-apps/src/samples/pjsip-perf.c @@ -219,8 +219,8 @@ static pj_bool_t mod_stateless_on_rx_request(pjsip_rx_data *rdata) 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; sip_uri = (pjsip_sip_uri*) uri; @@ -280,8 +280,8 @@ static pj_bool_t mod_stateful_on_rx_request(pjsip_rx_data *rdata) 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; sip_uri = (pjsip_sip_uri*) uri; @@ -417,8 +417,8 @@ static pj_bool_t mod_call_on_rx_request(pjsip_rx_data *rdata) 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; sip_uri = (pjsip_sip_uri*) uri; diff --git a/pjsip-apps/src/samples/proxy.h b/pjsip-apps/src/samples/proxy.h index 7fec1b6c..93be0a8e 100644 --- a/pjsip-apps/src/samples/proxy.h +++ b/pjsip-apps/src/samples/proxy.h @@ -364,9 +364,11 @@ static pj_status_t proxy_verify_request(pjsip_rx_data *rdata) */ /* 2. URI scheme. - * We only want to support "sip:" URI scheme for this simple proxy. + * 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)) { + 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, NULL, NULL); |