summaryrefslogtreecommitdiff
path: root/channels
diff options
context:
space:
mode:
authorRussell Bryant <russell@russellbryant.com>2013-12-11 19:22:05 +0000
committerRussell Bryant <russell@russellbryant.com>2013-12-11 19:22:05 +0000
commit90108b15a0bfb0a7fe88a12b4afbcf1086f18df9 (patch)
treeed164005bec2063afe399e743cef1a351dcf1e95 /channels
parent8183bba99a38bac11008b5ef1caf265464564e64 (diff)
Reset peer outboundproxy on sip.conf reload
If you set a peer's outboundproxy and then removed it from the config, this would not get picked up in a config reload. This patch fixes that by resetting it in set_peer_defaults(). Closes ASTERISK-19454 Review: https://reviewboard.asterisk.org/r/3065/ ........ Merged revisions 403634 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 403635 from http://svn.asterisk.org/svn/asterisk/branches/11 ........ Merged revisions 403639 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403652 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_sip.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index c56f7c4c9..5d729cd02 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -30413,6 +30413,10 @@ static void set_peer_defaults(struct sip_peer *peer)
peer->disallowed_methods = sip_cfg.disallowed_methods;
peer->transports = default_transports;
peer->default_outbound_transport = default_primary_transport;
+ if (peer->outboundproxy) {
+ ao2_ref(peer->outboundproxy, -1);
+ peer->outboundproxy = NULL;
+ }
}
/*! \brief Create temporary peer (used in autocreatepeer mode) */