diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2016-09-27 14:30:48 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-09-27 14:30:48 -0500 |
| commit | 0b62db30ce1f33a4ba6e04f3dcbe4d68df2456e7 (patch) | |
| tree | ec68165d010abbad898c115bff2e10c6ae41e1f4 /channels/chan_sip.c | |
| parent | af399b0cb212269a366f06e76c6a6c0207ba789c (diff) | |
| parent | 175975e994a07d9827a1376faf6a044596f29fbb (diff) | |
Merge "chan_sip: Resolve externhost not to IPv6; instead go for IPv4." into 14
Diffstat (limited to 'channels/chan_sip.c')
| -rw-r--r-- | channels/chan_sip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 93e48fba8..1301c26e3 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -3844,7 +3844,7 @@ static void ast_sip_ouraddrfor(const struct ast_sockaddr *them, struct ast_socka (!sip_cfg.matchexternaddrlocally || !ast_apply_ha(localaddr, us)) ) { /* if we used externhost, see if it is time to refresh the info */ if (externexpire && time(NULL) >= externexpire) { - if (ast_sockaddr_resolve_first(&externaddr, externhost, 0)) { + if (ast_sockaddr_resolve_first_af(&externaddr, externhost, 0, AST_AF_INET)) { ast_log(LOG_NOTICE, "Warning: Re-lookup of '%s' failed!\n", externhost); } externexpire = time(NULL) + externrefresh; @@ -32586,7 +32586,7 @@ static int reload_config(enum channelreloadreason reason) externexpire = 0; } else if (!strcasecmp(v->name, "externhost")) { ast_copy_string(externhost, v->value, sizeof(externhost)); - if (ast_sockaddr_resolve_first(&externaddr, externhost, 0)) { + if (ast_sockaddr_resolve_first_af(&externaddr, externhost, 0, AST_AF_INET)) { ast_log(LOG_WARNING, "Invalid address for externhost keyword: %s\n", externhost); } externexpire = time(NULL); |