From 0ff4f64221e94838aeff64620de81e84da5157dc Mon Sep 17 00:00:00 2001 From: Olle Johansson Date: Mon, 7 Sep 2009 16:43:51 +0000 Subject: [PATCH] Merged revisions 216842 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ........ r216842 | oej | 2009-09-07 18:35:12 +0200 (MÃ¥n, 07 Sep 2009) | 2 lines Make sure we reset global_exclude_static at channel reload ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@216845 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 70e026c803..55c2113305 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -1122,11 +1122,11 @@ static enum st_refresher global_st_refresher; /*!< Session-Timer refresher static int global_min_se; /*!< Lowest threshold for session refresh interval */ static int global_max_se; /*!< Highest threshold for session refresh interval */ -/*@}*/ +static int global_dynamic_exclude_static = 0; /*!< Exclude static peers from contact registrations */ +/*@}*/ /*! \brief Global list of addresses dynamic peers are not allowed to use */ static struct ast_ha *global_contact_ha = NULL; -static int global_dynamic_exclude_static = 0; /*! \name Object counters @{ * \bug These counters are not handled in a thread-safe way ast_atomic_fetchadd_int() @@ -23750,6 +23750,7 @@ static int reload_config(enum channelreloadreason reason) ast_set_flag(&global_flags[1], SIP_PAGE2_ALLOWSUBSCRIBE); /* Default for all devices: TRUE */ ast_set_flag(&global_flags[1], SIP_PAGE2_ALLOWOVERLAP); /* Default for all devices: TRUE */ sip_cfg.peer_rtupdate = TRUE; + global_dynamic_exclude_static = 0; /* Exclude static peers */ /* Session-Timers */ global_st_mode = SESSION_TIMER_MODE_ACCEPT;