I screwed this up sorry

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

diff --git a/src/mod/applications/mod_commands/mod_commands.c b/src/mod/applications/mod_commands/mod_commands.c
index b2bf417adbb0502f903ad9225f53c7ae71fd39ec..d2b3ee5403f51e73968a3b8239e53d70f055ee05 100644 (file)
--- a/src/mod/applications/mod_commands/mod_commands.c
+++ b/src/mod/applications/mod_commands/mod_commands.c
@@ -99,7 +99,7 @@ SWITCH_STANDARD_API(nat_map_function)
 
        if (argv[0] && switch_stristr("add", argv[0])) {
                if (switch_nat_add_mapping((switch_port_t)atoi(argv[1]), proto, &external_port, sticky) == SWITCH_STATUS_SUCCESS) {
-                       stream->write_function(stream, "%d", (int)external_port);
+                       stream->write_function(stream, "true"); /* still return true */
                        goto ok;
                }
        } else if (argv[0] && switch_stristr("del", argv[0])) {

diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c
index 55cce60e24f57acb7e5a70b5f28d39af29dbe6a2..306f54e7ea00d5f1b77f89c83d21f541259c24e3 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia_glue.c
+++ b/src/mod/endpoints/mod_sofia/sofia_glue.c
@@ -661,7 +661,7 @@ switch_status_t sofia_glue_tech_choose_port(private_object_t *tech_pvt, int forc
        }
        sdp_port = tech_pvt->local_sdp_audio_port;
 
-       if (!(use_ip = switch_channel_get_variable(tech_pvt->channel, "rtp_adv_audio_ip"))) {
+       if (!(use_ip = switch_channel_get_variable(tech_pvt->channel, "rtp_adv_audio_ip")) && !sofia_test_pflag(tech_pvt->profile, PFLAG_AUTO_NAT)) {
                if (tech_pvt->profile->extrtpip) {
                        use_ip = tech_pvt->profile->extrtpip;
                }