[asterisk-commits] branch oej/test-this-branch r11882 - in /team/oej/test-this-branch: ./ channels/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Sun Mar  5 07:13:10 2006
New Revision: 11882

URL: http://svn.digium.com/view/asterisk?rev=11882&view=rev
Log:
Update to trunk, resolve conflict

Modified:
    team/oej/test-this-branch/   (props changed)
    team/oej/test-this-branch/channels/chan_sip.c

Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
    automerge = yes

Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.

Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Mar  5 07:13:10 2006
@@ -1,1 +1,1 @@
-/trunk:1-11836
+/trunk:1-11880

Modified: team/oej/test-this-branch/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/channels/chan_sip.c?rev=11882&r1=11881&r2=11882&view=diff
==============================================================================
--- team/oej/test-this-branch/channels/chan_sip.c (original)
+++ team/oej/test-this-branch/channels/chan_sip.c Sun Mar  5 07:13:10 2006
@@ -12573,6 +12573,7 @@
 	struct sockaddr_in old_bindaddr = bindaddr;
 	int registry_count = 0, peer_count = 0, user_count = 0;
 	int temp_tos = 0;
+	int debugflag;
 
 	cfg = ast_config_load(config);
 
@@ -12583,7 +12584,11 @@
 	}
 	
 	/* 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));