[Asterisk-code-review] res/res pjsip session: Only check localnet if it is defined (asterisk[13])

[Matt Jordan]

Matt Jordan has uploaded a new change for review. ( https://gerrit.asterisk.org/5229 )

Change subject: res/res_pjsip_session: Only check localnet if it is defined
......................................................................

res/res_pjsip_session: Only check localnet if it is defined

If local_net is not defined on a transport, transport_state->localnet
will be NULL. ast_apply_ha will, be default, return AST_SENSE_ALLOW in
this case, causing the external_media_address, if set, to be skipped.

This patch causes us to only check if we are sending within a network if
local_net is defined.

Change-Id: Ib661c31a954cabc9c99f1f25c9c9a5c5b82cbbfb
---
M res/res_pjsip_session.c
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/29/5229/1

diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c
index 3c4f102..d4cf56f 100644
--- a/res/res_pjsip_session.c
+++ b/res/res_pjsip_session.c
@@ -3112,7 +3112,7 @@
 		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)) {
 			pj_strdup2(tdata->pool, &sdp->conn->addr, transport->external_media_address);
 		}
 	}

-- 
To view, visit https://gerrit.asterisk.org/5229
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib661c31a954cabc9c99f1f25c9c9a5c5b82cbbfb
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Owner: Matt Jordan <mjordan at digium.com>