diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2016-09-27 13:34:16 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-09-27 13:34:16 -0500 |
| commit | 1497e29c4fc0e36921f71ac4b731f2c40b835647 (patch) | |
| tree | e73560238f5607dfc2ecd03cc383639706cfee49 | |
| parent | 0ab443007b4ca9207011cf16e31ceefd7ce98bcb (diff) | |
| parent | 0502675e5c7ab77b7359776b77166d28760978af (diff) | |
Merge "chan_sip: Resolve externhost not to IPv6; instead go for IPv4." into 13
| -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 31b70281d..92b5bdc95 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -3839,7 +3839,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; @@ -32476,7 +32476,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); |