diff options
Diffstat (limited to 'pjsip-apps/src/samples')
| -rw-r--r-- | pjsip-apps/src/samples/icedemo.c | 3 | ||||
| -rw-r--r-- | pjsip-apps/src/samples/pjsip-perf.c | 14 | ||||
| -rw-r--r-- | pjsip-apps/src/samples/proxy.h | 8 |
3 files changed, 14 insertions, 11 deletions
diff --git a/pjsip-apps/src/samples/icedemo.c b/pjsip-apps/src/samples/icedemo.c index 08292ee..598ab1b 100644 --- a/pjsip-apps/src/samples/icedemo.c +++ b/pjsip-apps/src/samples/icedemo.c @@ -1,4 +1,4 @@ -/* $Id: icedemo.c 3841 2011-10-24 09:28:13Z ming $ */ +/* $Id: icedemo.c 4217 2012-07-27 17:24:12Z nanang $ */ /* * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com) * @@ -614,6 +614,7 @@ static int encode_session(char buffer[], unsigned maxlen) } /* Enumerate all candidates for this component */ + cand_cnt = PJ_ARRAY_SIZE(cand); status = pj_ice_strans_enum_cands(icedemo.icest, comp+1, &cand_cnt, cand); if (status != PJ_SUCCESS) diff --git a/pjsip-apps/src/samples/pjsip-perf.c b/pjsip-apps/src/samples/pjsip-perf.c index f1b7cb9..8918dd9 100644 --- a/pjsip-apps/src/samples/pjsip-perf.c +++ b/pjsip-apps/src/samples/pjsip-perf.c @@ -1,4 +1,4 @@ -/* $Id: pjsip-perf.c 3664 2011-07-19 03:42:28Z nanang $ */ +/* $Id: pjsip-perf.c 4370 2013-02-26 05:30:00Z nanang $ */ /* * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -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 2e1b383..257fd1f 100644 --- a/pjsip-apps/src/samples/proxy.h +++ b/pjsip-apps/src/samples/proxy.h @@ -1,4 +1,4 @@ -/* $Id: proxy.h 3553 2011-05-05 06:14:19Z nanang $ */ +/* $Id: proxy.h 4370 2013-02-26 05:30:00Z nanang $ */ /* * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -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); |