diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-10-24 15:33:57 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2017-10-25 18:14:03 +0000 |
| commit | 9e1fbab382aec4b8e131cd9276c80f66ac52ba7b (patch) | |
| tree | b31a3e850c40b37174e76e3bad46ca6bab11281f /res/res_pjsip_endpoint_identifier_ip.c | |
| parent | 3333e787ab8661285e0bb69ac248ff5f23f23c43 (diff) | |
res_pjsip: Add 'ip' as a valid option to 'identify_by' on endpoint.
When the identify_by option on an endpoint is set to ip it will
only be identified using the res_pjsip_endpoint_identifier_ip module.
This ensures that it is not mistakenly matched using the username of
the From header. To ensure behavior has not changed the default has
been changed to "username,ip" for the identify_by option.
ASTERISK-27206
Change-Id: I2170b86a7f7e221b4f00bf14aa1ef1ac5b050bbd
Diffstat (limited to 'res/res_pjsip_endpoint_identifier_ip.c')
| -rw-r--r-- | res/res_pjsip_endpoint_identifier_ip.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/res/res_pjsip_endpoint_identifier_ip.c b/res/res_pjsip_endpoint_identifier_ip.c index 30bfc2618..8b92cef27 100644 --- a/res/res_pjsip_endpoint_identifier_ip.c +++ b/res/res_pjsip_endpoint_identifier_ip.c @@ -227,7 +227,14 @@ static struct ast_sip_endpoint *ip_identify(pjsip_rx_data *rdata) } endpoint = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "endpoint", match->endpoint_name); + if (endpoint) { + if (!(endpoint->ident_method & AST_SIP_ENDPOINT_IDENTIFY_BY_IP)) { + ast_debug(3, "Endpoint '%s' found for '%s' but 'ip' method not supported'\n", match->endpoint_name, + ast_sockaddr_stringify(&addr)); + ao2_cleanup(endpoint); + return NULL; + } ast_debug(3, "Retrieved endpoint %s\n", ast_sorcery_object_get_id(endpoint)); } else { ast_log(LOG_WARNING, "Identify section '%s' points to endpoint '%s' but endpoint could not be looked up\n", |