Clear almost all of page2 flags at reload (different fix from 1.2 branch)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@11850 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 848422f..c8954f1 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -12339,6 +12339,7 @@ static int reload_config(enum channelreloadreason reason)
        int auto_sip_domains = FALSE;
        struct sockaddr_in old_bindaddr = bindaddr;
        int registry_count = 0, peer_count = 0, user_count = 0;
+       int debugflag;
 
        cfg = ast_config_load(config);
 
@@ -12349,7 +12350,11 @@ static int reload_config(enum channelreloadreason reason)
        }
        
        /* Clear all flags before setting default values */
+       /* Preserve debugging settings for console */
+       ast_copy_flags((&debugflag), (&global_flags_page2), SIP_PAGE2_DEBUG_CONSOLE);
        ast_clear_flag(&global_flags, AST_FLAGS_ALL);
+       ast_clear_flag(&global_flags_page2, AST_FLAGS_ALL);
+       ast_copy_flags((&global_flags_page2), (&debugflag), SIP_PAGE2_DEBUG_CONSOLE);
 
        /* Reset IP addresses  */
        memset(&bindaddr, 0, sizeof(bindaddr));