From 83c8c1254bc651d8e7b17bc6990aed782bd99354 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Fri, 22 Oct 2010 11:22:07 -0500
Subject: [PATCH] this should have been moved into agressive nat detection not
 commented

---
 src/mod/endpoints/mod_sofia/sofia_reg.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/mod/endpoints/mod_sofia/sofia_reg.c b/src/mod/endpoints/mod_sofia/sofia_reg.c
index c2c85e8885..51ce56faec 100644
--- a/src/mod/endpoints/mod_sofia/sofia_reg.c
+++ b/src/mod/endpoints/mod_sofia/sofia_reg.c
@@ -1470,16 +1470,14 @@ void sofia_reg_handle_sip_i_register(nua_t *nua, sofia_profile_t *profile, nua_h
 			} else if (port && atoi(port) != network_port) {
 				is_nat = "via port";
 			}
+
+			if (!is_nat && sip->sip_via->v_port &&
+				atoi(sip->sip_via->v_port) == 5060 && network_port != 5060 ) {
+				is_nat = "via port";
+			}
 		}
 	}
 
-	/* FS-2773: This causes issues with Cisco phones.
-	 * if (!is_nat && sip && sip->sip_via && sip->sip_via->v_port &&
-	 *	atoi(sip->sip_via->v_port) == 5060 && network_port != 5060 ) {
-	 *	is_nat = "via port";
-	 * }
-	 */
-
 	if (!is_nat && profile->nat_acl_count) {
 		uint32_t x = 0;
 		int ok = 1;