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_endpoint_identifier_user.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_endpoint_identifier_user.c')
| -rw-r--r-- | res/res_pjsip_endpoint_identifier_user.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/res/res_pjsip_endpoint_identifier_user.c b/res/res_pjsip_endpoint_identifier_user.c index e018abd61..30da062ed 100644 --- a/res/res_pjsip_endpoint_identifier_user.c +++ b/res/res_pjsip_endpoint_identifier_user.c @@ -33,6 +33,7 @@ static int get_from_header(pjsip_rx_data *rdata, char *username, size_t username { pjsip_uri *from = rdata->msg_info.from->uri; pjsip_sip_uri *sip_from; + if (!PJSIP_URI_SCHEME_IS_SIP(from) && !PJSIP_URI_SCHEME_IS_SIPS(from)) { return -1; } @@ -115,18 +116,25 @@ static struct ast_sip_endpoint *find_endpoint(pjsip_rx_data *rdata, char *endpoi static struct ast_sip_endpoint *username_identify(pjsip_rx_data *rdata) { - char username[64], domain[64]; + char username[64]; + char domain[64]; struct ast_sip_endpoint *endpoint; if (get_from_header(rdata, username, sizeof(username), domain, sizeof(domain))) { return NULL; } + + /* + * We may want to be matched without any user options getting + * in the way. + */ + AST_SIP_USER_OPTIONS_TRUNCATE_CHECK(username); + ast_debug(3, "Attempting identify by From username '%s' domain '%s'\n", username, domain); endpoint = find_endpoint(rdata, username, domain); if (!endpoint) { ast_debug(3, "Endpoint not found for From username '%s' domain '%s'\n", username, domain); - ao2_cleanup(endpoint); return NULL; } if (!(endpoint->ident_method & AST_SIP_ENDPOINT_IDENTIFY_BY_USERNAME)) { |