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

Merge "res/res_pjsip_session: Only check localnet if it is defined"

Browse Source
This commit is contained in:
Joshua Colp
2017-03-20 14:39:20 -05:00
committed by Gerrit Code Review
parent 24ada76408 e6dc28b78f
commit f5603cb1ec
4 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/res_pjsip_session.c
View File

@@ -3126,7 +3126,10 @@ static void session_outgoing_nat_hook(pjsip_tx_data *tdata, struct ast_sip_trans
ast_copy_pj_str(host, &sdp->conn->addr, sizeof(host));
ast_sockaddr_parse(&addr, host, PARSE_PORT_FORBID);
if (ast_apply_ha(transport_state->localnet, &addr) != AST_SENSE_ALLOW) {
if (!transport_state->localnet
|| (transport_state->localnet
&& ast_apply_ha(transport_state->localnet, &addr) == AST_SENSE_ALLOW)) {
ast_debug(5, "Setting external media address to %s\n", transport->external_media_address);
pj_strdup2(tdata->pool, &sdp->conn->addr, transport->external_media_address);
}
}