Merge "chan_sip: Resolve externhost not to IPv6; instead go for IPv4."
This commit is contained in:
commit
3f62485ba7
|
@ -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)) ) {
|
(!sip_cfg.matchexternaddrlocally || !ast_apply_ha(localaddr, us)) ) {
|
||||||
/* if we used externhost, see if it is time to refresh the info */
|
/* if we used externhost, see if it is time to refresh the info */
|
||||||
if (externexpire && time(NULL) >= externexpire) {
|
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);
|
ast_log(LOG_NOTICE, "Warning: Re-lookup of '%s' failed!\n", externhost);
|
||||||
}
|
}
|
||||||
externexpire = time(NULL) + externrefresh;
|
externexpire = time(NULL) + externrefresh;
|
||||||
|
@ -32594,7 +32594,7 @@ static int reload_config(enum channelreloadreason reason)
|
||||||
externexpire = 0;
|
externexpire = 0;
|
||||||
} else if (!strcasecmp(v->name, "externhost")) {
|
} else if (!strcasecmp(v->name, "externhost")) {
|
||||||
ast_copy_string(externhost, v->value, sizeof(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);
|
ast_log(LOG_WARNING, "Invalid address for externhost keyword: %s\n", externhost);
|
||||||
}
|
}
|
||||||
externexpire = time(NULL);
|
externexpire = time(NULL);
|
||||||
|
|
Loading…
Reference in New Issue