diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2016-08-29 18:08:22 -0500 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2016-09-09 17:09:54 -0500 |
| commit | 30af92e78d36523f8012da5eb9aee16687d8fe61 (patch) | |
| tree | 1f84280f76613282c8a81dc9b7aaf2b738201dfa /res/res_pjsip_session.c | |
| parent | 7580a736bb30577d7557aac9165894dc9f9583e6 (diff) | |
res_pjsip: Add ignore_uri_user_options option.
This implements the chan_sip legacy_useroption_parsing option but with a
better name.
* Made the caller-id number and redirecting number strings obtained from
incoming SIP URI user fields always truncated at the first semicolon.
People don't care about anything after the semicolon showing up on their
displays even though the RFC allows the semicolon.
ASTERISK-26316 #close
Reported by: Kevin Harwell
Change-Id: Ib42b0e940dd34d84c7b14bc2e90d1ba392624f62
Diffstat (limited to 'res/res_pjsip_session.c')
| -rw-r--r-- | res/res_pjsip_session.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c index 050970998..8b8e9d114 100644 --- a/res/res_pjsip_session.c +++ b/res/res_pjsip_session.c @@ -1980,6 +1980,12 @@ static enum sip_get_destination_result get_destination(struct ast_sip_session *s sip_ruri = pjsip_uri_get_uri(ruri); ast_copy_pj_str(session->exten, &sip_ruri->user, sizeof(session->exten)); + /* + * We may want to match in the dialplan without any user + * options getting in the way. + */ + AST_SIP_USER_OPTIONS_TRUNCATE_CHECK(session->exten); + pickup_cfg = ast_get_chan_features_pickup_config(session->channel); if (!pickup_cfg) { ast_log(LOG_ERROR, "Unable to retrieve pickup configuration options. Unable to detect call pickup extension\n"); @@ -3059,6 +3065,13 @@ static pjsip_redirect_op session_inv_on_redirected(pjsip_inv_session *inv, const char exten[AST_MAX_EXTENSION]; ast_copy_pj_str(exten, &uri->user, sizeof(exten)); + + /* + * We may want to match in the dialplan without any user + * options getting in the way. + */ + AST_SIP_USER_OPTIONS_TRUNCATE_CHECK(exten); + ast_channel_call_forward_set(session->channel, exten); } else if (session->endpoint->redirect_method == AST_SIP_REDIRECT_URI_CORE) { char target_uri[PJSIP_MAX_URL_SIZE]; |