res_stun_monitor: Don't fail to load if DNS resolution fails

res_stun_monitor will fail to load if DNS resolution of the STUN server
fails. Instead, we continue without the STUN server being resolved and
we will re-attempt the resolution on the STUN refresh interval.

ASTERISK-21856 #close
Reported by: Jeremy Kister

Change-Id: I6334c54a1cc798f8a836b4b47948e0bb4ef59254

diff --git a/res/res_stun_monitor.c b/res/res_stun_monitor.c
index 4cdc2fdca79292f4ca2e926649a39bc57b2c4829..d1e1ebc1a9a4f806fa88c3ebf5da8f90ff981300 100644 (file)
--- a/res/res_stun_monitor.c
+++ b/res/res_stun_monitor.c
@@ -271,7 +271,7 @@ static int stun_start_monitor(void)
  * \retval 0 on success.
  * \retval -1 on error.
  */
-static int setup_stunaddr(const char *value)
+static int setup_stunaddr(const char *value, int reload)
 {
        char *val;
        char *host_str;
@@ -307,8 +307,12 @@ static int setup_stunaddr(const char *value)
        stun_addr.ss.ss_family = AF_INET;
        if (ast_get_ip(&stun_addr, host_str)) {
                ast_log(LOG_WARNING, "Unable to lookup STUN server '%s'\n", host_str);
-               ast_free(host_str);
-               return -1;
+
+               /* Only treat this as fatal if we are reloading */
+               if (reload) {
+                       ast_free(host_str);
+                       return -1;
+               }
        }
 
        /* Save STUN server information. */
@@ -350,7 +354,7 @@ static int load_config(int startup)
 
        for (v = ast_variable_browse(cfg, "general"); v; v = v->next) {
                if (!strcasecmp(v->name, "stunaddr")) {
-                       if (setup_stunaddr(v->value)) {
+                       if (setup_stunaddr(v->value, !startup)) {
                                ast_log(LOG_WARNING, "Invalid STUN server address: %s at line %d\n",
                                        v->value, v->lineno);
                        }