diff options
author | George Joseph <george.joseph@fairview5.com> | 2016-01-29 16:56:42 -0700 |
---|---|---|
committer | George Joseph <george.joseph@fairview5.com> | 2016-02-08 19:11:18 -0600 |
commit | bbf3ace68292c136ae0455332a1893de4c4b4c13 (patch) | |
tree | 02ccd7a6a471d095cfbeba6bfc53c1f6e8688b4d /res/res_pjsip_nat.c | |
parent | 7e4378770d6c459702e07ecf01c9fc6e1400c207 (diff) |
res_pjsip: Fix infinite recursion when loading transports from realtime
Attempting to load a transport from realtime was forcing asterisk into an
infinite recursion loop. The first thing transport_apply did was to do a
sorcery retrieve by id for an existing transport of the same name. For files,
this just returns the previous object from res_sorcery_config's internal
container, if any. For realtime, the res_sourcery_realtime driver looks in the
database and finds the existing row but now it has to rehydrate it into a
sorcery object which means calling... transport_apply. And so it goes.
The main issue with loading from realtime (apart from the loop) was that
transport stores structures and pointers directly in the ast_sip_transport
structure instead of the separate ast_transport_state structure. This patch
separates those items into the ast_sip_transport_state structure. The pattern
is roughly the same as res_pjsip_outbound_registration.
Although all current usages of ast_sip_transport and ast_sip_transport_state
were modified to use the new ast_sip_get_transport_state API, the original
items are left in ast_sip_transport and kept updated to maintain ABI
compatability for third-party modules. They are marked as deprecated and
noted that they're now in ast_sip_transport_state.
ASTERISK-25606 #close
Reported-by: Martin Moučka
Change-Id: Ic7a836ea8e786e8def51fe3f8cce855ea54f5f19
Diffstat (limited to 'res/res_pjsip_nat.c')
-rw-r--r-- | res/res_pjsip_nat.c | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/res/res_pjsip_nat.c b/res/res_pjsip_nat.c index 683ae6110..a32d12bfd 100644 --- a/res/res_pjsip_nat.c +++ b/res/res_pjsip_nat.c @@ -150,19 +150,19 @@ struct request_transport_details { }; /*! \brief Callback function for finding the transport the request is going out on */ -static int find_transport_in_use(void *obj, void *arg, int flags) +static int find_transport_state_in_use(void *obj, void *arg, int flags) { - struct ast_sip_transport *transport = obj; + struct ast_sip_transport_state *transport_state = obj; struct request_transport_details *details = arg; /* If an explicit transport or factory matches then this is what is in use, if we are unavailable * to compare based on that we make sure that the type is the same and the source IP address/port are the same */ - if ((details->transport && details->transport == transport->state->transport) || - (details->factory && details->factory == transport->state->factory) || - ((details->type == transport->type) && (transport->state->factory) && - !pj_strcmp(&transport->state->factory->addr_name.host, &details->local_address) && - transport->state->factory->addr_name.port == details->local_port)) { + if (transport_state && ((details->transport && details->transport == transport_state->transport) || + (details->factory && details->factory == transport_state->factory) || + ((details->type == transport_state->type) && (transport_state->factory) && + !pj_strcmp(&transport_state->factory->addr_name.host, &details->local_address) && + transport_state->factory->addr_name.port == details->local_port))) { return CMP_MATCH | CMP_STOP; } @@ -204,8 +204,9 @@ static int nat_invoke_hook(void *obj, void *arg, int flags) static pj_status_t nat_on_tx_message(pjsip_tx_data *tdata) { - RAII_VAR(struct ao2_container *, transports, NULL, ao2_cleanup); + RAII_VAR(struct ao2_container *, transport_states, NULL, ao2_cleanup); RAII_VAR(struct ast_sip_transport *, transport, NULL, ao2_cleanup); + RAII_VAR(struct ast_sip_transport_state *, transport_state, NULL, ao2_cleanup); struct request_transport_details details = { 0, }; pjsip_via_hdr *via = NULL; struct ast_sockaddr addr = { { 0, } }; @@ -247,9 +248,19 @@ static pj_status_t nat_on_tx_message(pjsip_tx_data *tdata) } } - if (!(transports = ast_sorcery_retrieve_by_fields(ast_sip_get_sorcery(), "transport", AST_RETRIEVE_FLAG_MULTIPLE | AST_RETRIEVE_FLAG_ALL, NULL)) || - !(transport = ao2_callback(transports, 0, find_transport_in_use, &details)) || !transport->localnet || - ast_sockaddr_isnull(&transport->external_address)) { + if (!(transport_states = ast_sip_get_transport_states())) { + return PJ_SUCCESS; + } + + if (!(transport_state = ao2_callback(transport_states, 0, find_transport_state_in_use, &details))) { + return PJ_SUCCESS; + } + + if (!(transport = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "transport", transport_state->id))) { + return PJ_SUCCESS; + } + + if ( !transport_state->localnet || ast_sockaddr_isnull(&transport_state->external_address)) { return PJ_SUCCESS; } @@ -257,13 +268,13 @@ static pj_status_t nat_on_tx_message(pjsip_tx_data *tdata) ast_sockaddr_set_port(&addr, tdata->tp_info.dst_port); /* See if where we are sending this request is local or not, and if not that we can get a Contact URI to modify */ - if (ast_apply_ha(transport->localnet, &addr) != AST_SENSE_ALLOW) { + if (ast_apply_ha(transport_state->localnet, &addr) != AST_SENSE_ALLOW) { return PJ_SUCCESS; } /* Update the contact header with the external address */ if (uri || (uri = nat_get_contact_sip_uri(tdata))) { - pj_strdup2(tdata->pool, &uri->host, ast_sockaddr_stringify_host(&transport->external_address)); + pj_strdup2(tdata->pool, &uri->host, ast_sockaddr_stringify_host(&transport_state->external_address)); if (transport->external_signaling_port) { uri->port = transport->external_signaling_port; ast_debug(4, "Re-wrote Contact URI port to %d\n", uri->port); @@ -272,7 +283,7 @@ static pj_status_t nat_on_tx_message(pjsip_tx_data *tdata) /* Update the via header if relevant */ if ((tdata->msg->type == PJSIP_REQUEST_MSG) && (via || (via = pjsip_msg_find_hdr(tdata->msg, PJSIP_H_VIA, NULL)))) { - pj_strdup2(tdata->pool, &via->sent_by.host, ast_sockaddr_stringify_host(&transport->external_address)); + pj_strdup2(tdata->pool, &via->sent_by.host, ast_sockaddr_stringify_host(&transport_state->external_address)); if (transport->external_signaling_port) { via->sent_by.port = transport->external_signaling_port; } |