kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 03:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "endpoint identifiers: Some code cleanup."

Browse Source
This commit is contained in:
Jenkins2
2018-02-06 05:40:14 -06:00
committed by Gerrit Code Review
parent 9255048d9e 1017db107c
commit 2de2a1001a
2 changed files with 50 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
res/res_pjsip_endpoint_identifier_anonymous.c
View File

@@ -47,10 +47,11 @@ static int find_transport_state_in_use(void *obj, void *arg, int flags)
struct ast_sip_transport_state *transport_state = obj; struct ast_sip_transport_state *transport_state = obj;
pjsip_rx_data *rdata = arg; pjsip_rx_data *rdata = arg;
if (transport_state && ((transport_state->transport == rdata->tp_info.transport) || if (transport_state->transport == rdata->tp_info.transport
(transport_state->factory && !pj_strcmp(&transport_state->factory->addr_name.host, &rdata->tp_info.transport->local_name.host) && || (transport_state->factory
transport_state->factory->addr_name.port == rdata->tp_info.transport->local_name.port))) { && !pj_strcmp(&transport_state->factory->addr_name.host, &rdata->tp_info.transport->local_name.host)
return CMP_MATCH | CMP_STOP; && transport_state->factory->addr_name.port == rdata->tp_info.transport->local_name.port)) {
return CMP_MATCH;
} }
return 0; return 0;
@@ -62,28 +63,33 @@ static struct ast_sip_endpoint *anonymous_identify(pjsip_rx_data *rdata)
{ {
char domain_name[DOMAIN_NAME_LEN + 1]; char domain_name[DOMAIN_NAME_LEN + 1];
struct ast_sip_endpoint *endpoint; struct ast_sip_endpoint *endpoint;
RAII_VAR(struct ast_sip_domain_alias *, alias, NULL, ao2_cleanup);
RAII_VAR(struct ao2_container *, transport_states, NULL, ao2_cleanup);
RAII_VAR(struct ast_sip_transport_state *, transport_state, NULL, ao2_cleanup);
RAII_VAR(struct ast_sip_transport *, transport, NULL, ao2_cleanup);
if (get_endpoint_details(rdata, domain_name, sizeof(domain_name))) { if (get_endpoint_details(rdata, domain_name, sizeof(domain_name))) {
return NULL; return NULL;
} }
if (!ast_sip_get_disable_multi_domain()) { if (!ast_sip_get_disable_multi_domain()) {
struct ast_sip_domain_alias *alias;
struct ao2_container *transport_states;
struct ast_sip_transport_state *transport_state = NULL;
struct ast_sip_transport *transport = NULL;
char id[sizeof("anonymous@") + DOMAIN_NAME_LEN]; char id[sizeof("anonymous@") + DOMAIN_NAME_LEN];
/* Attempt to find the endpoint given the name and domain provided */ /* Attempt to find the endpoint given the name and domain provided */
snprintf(id, sizeof(id), "anonymous@%s", domain_name); snprintf(id, sizeof(id), "anonymous@%s", domain_name);
if ((endpoint = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "endpoint", id))) { endpoint = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "endpoint", id);
if (endpoint) {
goto done; goto done;
} }
/* See if an alias exists for the domain provided */ /* See if an alias exists for the domain provided */
if ((alias = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "domain_alias", domain_name))) { alias = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "domain_alias",
domain_name);
if (alias) {
snprintf(id, sizeof(id), "anonymous@%s", alias->domain); snprintf(id, sizeof(id), "anonymous@%s", alias->domain);
if ((endpoint = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "endpoint", id))) { ao2_ref(alias, -1);
endpoint = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "endpoint", id);
if (endpoint) {
goto done; goto done;
} }
} }
@@ -94,9 +100,13 @@ static struct ast_sip_endpoint *anonymous_identify(pjsip_rx_data *rdata)
&& (transport = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "transport", transport_state->id)) && (transport = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "transport", transport_state->id))
&& !ast_strlen_zero(transport->domain)) { && !ast_strlen_zero(transport->domain)) {
snprintf(id, sizeof(id), "anonymous@%s", transport->domain); snprintf(id, sizeof(id), "anonymous@%s", transport->domain);
if ((endpoint = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "endpoint", id))) { endpoint = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "endpoint", id);
goto done; }
} ao2_cleanup(transport);
ao2_cleanup(transport_state);
ao2_cleanup(transport_states);
if (endpoint) {
goto done;
} }
} }

41
res/res_pjsip_endpoint_identifier_user.c
View File

@@ -65,10 +65,11 @@ static int find_transport_state_in_use(void *obj, void *arg, int flags)
struct ast_sip_transport_state *transport_state = obj; struct ast_sip_transport_state *transport_state = obj;
pjsip_rx_data *rdata = arg; pjsip_rx_data *rdata = arg;
if (transport_state && ((transport_state->transport == rdata->tp_info.transport) || if (transport_state->transport == rdata->tp_info.transport
(transport_state->factory && !pj_strcmp(&transport_state->factory->addr_name.host, &rdata->tp_info.transport->local_name.host) && || (transport_state->factory
transport_state->factory->addr_name.port == rdata->tp_info.transport->local_name.port))) { && !pj_strcmp(&transport_state->factory->addr_name.host, &rdata->tp_info.transport->local_name.host)
return CMP_MATCH | CMP_STOP; && transport_state->factory->addr_name.port == rdata->tp_info.transport->local_name.port)) {
return CMP_MATCH;
} }
return 0; return 0;
@@ -81,36 +82,46 @@ static struct ast_sip_endpoint *find_endpoint(pjsip_rx_data *rdata, char *endpoi
char *domain_name) char *domain_name)
{ {
struct ast_sip_endpoint *endpoint; struct ast_sip_endpoint *endpoint;
RAII_VAR(struct ast_sip_domain_alias *, alias, NULL, ao2_cleanup);
RAII_VAR(struct ao2_container *, transport_states, NULL, ao2_cleanup);
RAII_VAR(struct ast_sip_transport_state *, transport_state, NULL, ao2_cleanup);
RAII_VAR(struct ast_sip_transport *, transport, NULL, ao2_cleanup);
if (!ast_sip_get_disable_multi_domain()) { if (!ast_sip_get_disable_multi_domain()) {
struct ast_sip_domain_alias *alias;
struct ao2_container *transport_states;
struct ast_sip_transport_state *transport_state = NULL;
struct ast_sip_transport *transport = NULL;
char id[DOMAIN_NAME_LEN + USERNAME_LEN + sizeof("@")]; char id[DOMAIN_NAME_LEN + USERNAME_LEN + sizeof("@")];
/* Attempt to find the endpoint given the name and domain provided */ /* Attempt to find the endpoint given the name and domain provided */
snprintf(id, sizeof(id), "%s@%s", endpoint_name, domain_name); snprintf(id, sizeof(id), "%s@%s", endpoint_name, domain_name);
if ((endpoint = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "endpoint", id))) { endpoint = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "endpoint", id);
if (endpoint) {
return endpoint; return endpoint;
} }
/* See if an alias exists for the domain provided */ /* See if an alias exists for the domain provided */
if ((alias = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "domain_alias", domain_name))) { alias = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "domain_alias",
domain_name);
if (alias) {
snprintf(id, sizeof(id), "%s@%s", endpoint_name, alias->domain); snprintf(id, sizeof(id), "%s@%s", endpoint_name, alias->domain);
if ((endpoint = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "endpoint", id))) { ao2_ref(alias, -1);
endpoint = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "endpoint", id);
if (endpoint) {
return endpoint; return endpoint;
} }
} }
/* See if the transport this came in on has a provided domain */ /* See if the transport this came in on has a provided domain */
if ((transport_states = ast_sip_get_transport_states()) if ((transport_states = ast_sip_get_transport_states())
&& (transport_state = ao2_callback(transport_states, 0, find_transport_state_in_use, rdata)) && (transport_state = ao2_callback(transport_states, 0, find_transport_state_in_use, rdata))
&& (transport = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "transport", transport_state->id)) && (transport = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "transport", transport_state->id))
&& !ast_strlen_zero(transport->domain)) { && !ast_strlen_zero(transport->domain)) {
snprintf(id, sizeof(id), "anonymous@%s", transport->domain); snprintf(id, sizeof(id), "%s@%s", endpoint_name, transport->domain);
if ((endpoint = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "endpoint", id))) { endpoint = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "endpoint", id);
return endpoint; }
} ao2_cleanup(transport);
ao2_cleanup(transport_state);
ao2_cleanup(transport_states);
if (endpoint) {
return endpoint;
} }
} }