From: George Joseph <gjoseph@digium.com>
Date: Wed, 14 Jun 2017 13:29:00 +0000 (-0600)
Subject: res_pjsip_session:  Correct inverted test in session_outgoing_nat_hook
X-Git-Tag: 13.17.0-rc1~37^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2dee95cc7a280d0ab84c778bf44a76aa62ac758b;p=thirdparty%2Fasterisk.git

res_pjsip_session:  Correct inverted test in session_outgoing_nat_hook

There was a typo introduced in commit 776ffd77 which was preventing
the transport's external media address from being used.

ASTERISK-27024 #close
Reported-by: Christopher van de Sande
patches:
	patch.diff submitted by Florian Floimair (license 6892)

Change-Id: I7ec617171eaa2d86d2680b00cf37d5088adafc27
---

diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c
index 1fec089f8e..59a8915e1b 100644
--- a/res/res_pjsip_session.c
+++ b/res/res_pjsip_session.c
@@ -3123,8 +3123,7 @@ static void session_outgoing_nat_hook(pjsip_tx_data *tdata, struct ast_sip_trans
 		ast_sockaddr_parse(&addr, host, PARSE_PORT_FORBID);
 
 		if (!transport_state->localnet
-			|| (transport_state->localnet
-				&& ast_apply_ha(transport_state->localnet, &addr) == AST_SENSE_ALLOW)) {
+			|| 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);
 		}