this should have been moved into agressive nat detection not commented

diff --git a/src/mod/endpoints/mod_sofia/sofia_reg.c b/src/mod/endpoints/mod_sofia/sofia_reg.c
index c2c85e88853a0e50adf04f5993732c0f5e99789e..51ce56faec7406f4a9fbdbc554c316c07fb6ad07 100644 (file)
--- 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;