sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
George Joseph 2017-04-20 07:19:46 -05:00 committed by Gerrit Code Review
parent b18bfb7672 f6600f2c2e
commit dd239e9f91
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
res/res_stun_monitor.c
View File

@ -269,7 +269,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;
@ -305,8 +305,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. */
@ -348,7 +352,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);
}