From: Brian West <brian@freeswitch.org>
Date: Thu, 4 Jun 2009 01:05:52 +0000 (+0000)
Subject: forgot to convert these to use sofia_glue_check_nat
X-Git-Tag: v1.0.4~641
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50174a7412346acdc2b254a2feaabceffa666d77;p=thirdparty%2Ffreeswitch.git

forgot to convert these to use sofia_glue_check_nat

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13601 d0543943-73ff-0310-b7d9-9358b9ac24b2
---

diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c
index c26b23268c..013ec4ee6d 100644
--- a/src/mod/endpoints/mod_sofia/sofia_presence.c
+++ b/src/mod/endpoints/mod_sofia/sofia_presence.c
@@ -1417,9 +1417,7 @@ static int sofia_presence_mwi_callback2(void *pArg, int argc, char **argv, char
 	}
 
 	contact = sofia_glue_get_url_from_contact(o_contact, 1);
-
-	if (sofia_test_pflag(profile, PFLAG_AUTO_NAT) && profile->local_network &&
-		!switch_check_network_list_ip(network_ip, profile->local_network)) {
+	if (sofia_glue_check_nat(profile, network_ip)) {
 		char *ptr = NULL;
 		const char *transport_str = NULL;
 
@@ -1557,8 +1555,7 @@ void sofia_presence_handle_sip_i_subscribe(int status,
 
 		sofia_glue_get_addr(nua_current_request(nua), network_ip,  sizeof(network_ip), &network_port);
 
-		if (sofia_test_pflag(profile, PFLAG_AUTO_NAT) && profile->local_network &&
-			!switch_check_network_list_ip(network_ip, profile->local_network)) {
+		if (sofia_glue_check_nat(profile, network_ip)) {
 			is_auto_nat = 1;
 		}