summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Begg <asterisk@meric.id.au>2017-03-15 08:51:41 +1100
committerRichard Begg <asterisk@meric.id.au>2017-03-14 16:00:47 -0600
commitcd57d5718ce26e34c8f593e04bf055d8d13f1a5f (patch)
tree5ba0c9346ba1a97efac98f2138c76c189a7d1bd6
parente87a763e55e6e2f1d6b25e726efe835f2bb5514b (diff)
chan_iax2: Reload of iax peer results in loss of host address/port
When using a non-dynamic peer address, build_peer() invalidates the peer address structure by setting the address family to unspecified. However, if dnsmgr is enabled, the subsequent call to ast_dnsmgr_lookup() will not amend the peer address if the cache is still valid, resulting in peer connectivity failures. To fix this, we call ast_dnsmgr_refresh() instead. ASTERISK-26865 Change-Id: Id8a89a2f771ebbaf32255a35fe596a6dcb97a082
-rw-r--r--channels/chan_iax2.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 456ba8f1e..469a17275 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -12908,7 +12908,13 @@ static struct iax2_peer *build_peer(const char *name, struct ast_variable *v, st
/* Non-dynamic. Make sure we become that way if we're not */
AST_SCHED_DEL(sched, peer->expire);
ast_clear_flag64(peer, IAX_DYNAMIC);
- peer->addr.ss.ss_family = AST_AF_UNSPEC;
+ if (peer->dnsmgr) {
+ // Make sure we refresh dnsmgr if we're using it
+ ast_dnsmgr_refresh(peer->dnsmgr);
+ } else {
+ // Or just invalidate the address
+ peer->addr.ss.ss_family = AST_AF_UNSPEC;
+ }
if (ast_dnsmgr_lookup(v->value, &peer->addr, &peer->dnsmgr, srvlookup ? "_iax._udp" : NULL)) {
return peer_unref(peer);
}