this will make it behave as if you didn't set the ext-sip-ip and ext-rtp-ip if they...

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

diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index f36660a3e02da0d703edee3aa4e037c2c62732ee..718c0444d2ca5dd31162d1e25b1fb785042c3c42 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -1135,7 +1135,7 @@ switch_status_t reconfig_sofia(sofia_profile_t *profile)
                                                        switch_set_flag(profile, TFLAG_VAD_IN);
                                                        switch_set_flag(profile, TFLAG_VAD_OUT);
                                                } else {
-                                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invald option %s for VAD\n", val);
+                                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid option %s for VAD\n", val);
                                                }
                                        } else if (!strcasecmp(var, "unregister-on-options-fail")) {
                                                if (switch_true(val)) {
@@ -1488,22 +1488,31 @@ switch_status_t config_sofia(int reload, char *profile_name)
                                                        switch_set_flag(profile, TFLAG_VAD_IN);
                                                        switch_set_flag(profile, TFLAG_VAD_OUT);
                                                } else {
-                                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invald option %s for VAD\n", val);
+                                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid option %s for VAD\n", val);
                                                }
                                        } else if (!strcasecmp(var, "ext-rtp-ip")) {
-                                               char *ip = mod_sofia_globals.guess_ip;
-
-                                               if (!strcmp(val, "0.0.0.0")) {
-                                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invald IP 0.0.0.0 replaced with %s\n", mod_sofia_globals.guess_ip);
+                                               if (!switch_strlen_zero(val)) {
+                                                       char *ip = mod_sofia_globals.guess_ip;
+                                                       
+                                                       if (!strcmp(val, "0.0.0.0")) {
+                                                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid IP 0.0.0.0 replaced with %s\n", mod_sofia_globals.guess_ip);
+                                                       } else {
+                                                               if (!switch_strlen_zero(val)) {
+                                                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid ext-rtp-ip replaced with %s\n", mod_sofia_globals.guess_ip);
+                                                                       ip = "auto";
+                                                               } else {
+                                                                       ip = strcasecmp(val, "auto") ? val : mod_sofia_globals.guess_ip;
+                                                               }
+                                                       }
+                                                       profile->extrtpip = switch_core_strdup(profile->pool, ip);
                                                } else {
-                                                       ip = strcasecmp(val, "auto") ? val : mod_sofia_globals.guess_ip;
+                                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid ext-rtp-ip\n");
                                                }
-                                               profile->extrtpip = switch_core_strdup(profile->pool, ip);
                                        } else if (!strcasecmp(var, "rtp-ip")) {
                                                char *ip = mod_sofia_globals.guess_ip;
 
                                                if (!strcmp(val, "0.0.0.0")) {
-                                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invald IP 0.0.0.0 replaced with %s\n", mod_sofia_globals.guess_ip);
+                                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid IP 0.0.0.0 replaced with %s\n", mod_sofia_globals.guess_ip);
                                                } else {
                                                        ip = strcasecmp(val, "auto") ? val : mod_sofia_globals.guess_ip;
                                                }
@@ -1512,31 +1521,33 @@ switch_status_t config_sofia(int reload, char *profile_name)
                                                char *ip = mod_sofia_globals.guess_ip;
 
                                                if (!strcmp(val, "0.0.0.0")) {
-                                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invald IP 0.0.0.0 replaced with %s\n", mod_sofia_globals.guess_ip);
+                                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid IP 0.0.0.0 replaced with %s\n", mod_sofia_globals.guess_ip);
                                                } else {
                                                        ip = strcasecmp(val, "auto") ? val : mod_sofia_globals.guess_ip;
                                                }
                                                profile->sipip = switch_core_strdup(profile->pool, ip);
                                        } else if (!strcasecmp(var, "ext-sip-ip")) {
-                                               char *ip = mod_sofia_globals.guess_ip;
-                                               char stun_ip[50] = "";
-                                               char *myip = stun_ip;
-
-                                               switch_copy_string(stun_ip, ip, sizeof(stun_ip));
-
                                                if (!switch_strlen_zero(val)) {
-                                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid IP replaced with %s\n", mod_sofia_globals.guess_ip);
-                                               } else if (!strcasecmp(val, "0.0.0.0")) {
-                                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invald IP 0.0.0.0 replaced with %s\n", mod_sofia_globals.guess_ip);
-                                               } else if (strcasecmp(val, "auto")) {
-                                                       switch_port_t port = 0;
-                                                       if (sofia_glue_ext_address_lookup(profile, NULL, &myip, &port, val, profile->pool) == SWITCH_STATUS_SUCCESS) {
-                                                               ip = myip;
-                                                       } else {
-                                                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to get external ip.\n");
+                                                       char *ip = mod_sofia_globals.guess_ip;
+                                                       char stun_ip[50] = "";
+                                                       char *myip = stun_ip;
+                                                       
+                                                       switch_copy_string(stun_ip, ip, sizeof(stun_ip));
+                                                       
+                                                       if (!strcasecmp(val, "0.0.0.0")) {
+                                                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid IP 0.0.0.0 replaced with %s\n", mod_sofia_globals.guess_ip);
+                                                       } else if (strcasecmp(val, "auto")) {
+                                                               switch_port_t port = 0;
+                                                               if (sofia_glue_ext_address_lookup(profile, NULL, &myip, &port, val, profile->pool) == SWITCH_STATUS_SUCCESS) {
+                                                                       ip = myip;
+                                                               } else {
+                                                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to get external ip.\n");
+                                                               }
                                                        }
+                                                       profile->extsipip = switch_core_strdup(profile->pool, ip);
+                                               } else {
+                                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid ext-sip-ip\n");
                                                }
-                                               profile->extsipip = switch_core_strdup(profile->pool, ip);
                                        } else if (!strcasecmp(var, "force-register-domain")) {
                                                profile->reg_domain = switch_core_strdup(profile->pool, val);
                                        } else if (!strcasecmp(var, "bind-params")) {