Merged revisions 216842 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
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.1@216844 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 4ddcce902b57a1c47542a27b603ce4d01e1edf40..25bbf6655045cf5067bed42fec3fabbf83546806 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -813,11 +813,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()
@@ -22743,6 +22743,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;