Author: brian Date: Wed Jun 3 14:44:25 2009 New Revision: 13590 Log: merge trunk Modified: freeswitch/branches/brian/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Modified: freeswitch/branches/brian/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/branches/brian/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/branches/brian/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Wed Jun 3 14:44:25 2009 @@ -2244,6 +2244,10 @@ prefs.nat_map = 0; } + if (prefs.nat_map && !switch_check_network_list_ip(prefs.ip, "loopback.auto")) { + prefs.nat_map = 0; + } + if (!prefs.port) { prefs.port = 8021; }