[asterisk-commits] rizzo: branch rizzo/astobj2 r47950 - /team/rizzo/astobj2/channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: rizzo
Date: Wed Nov 22 17:36:36 2006
New Revision: 47950

URL: http://svn.digium.com/view/asterisk?view=rev&rev=47950
Log:
minor text cleanup


Modified:
    team/rizzo/astobj2/channels/chan_sip.c

Modified: team/rizzo/astobj2/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/astobj2/channels/chan_sip.c?view=diff&rev=47950&r1=47949&r2=47950
==============================================================================
--- team/rizzo/astobj2/channels/chan_sip.c (original)
+++ team/rizzo/astobj2/channels/chan_sip.c Wed Nov 22 17:36:36 2006
@@ -17508,11 +17508,9 @@
 	if (option_debug > 3)
 		ast_log(LOG_DEBUG, "--------------- Done destroying pruned peers\n");
 
-	/* Send qualify (OPTIONS) to all peers */
-	sip_poke_all_peers();
-
-	/* Register with all services */
-	sip_send_all_registers();
+	sip_poke_all_peers();		/* Send qualify (OPTIONS) to all peers */
+
+	sip_send_all_registers();	/* Register with all services */
 
 	if (option_debug > 3)
 		ast_log(LOG_DEBUG, "--------------- SIP reload done\n");
@@ -17528,10 +17526,7 @@
 		ast_verbose("Previous SIP reload not yet done\n");
 	else {
 		sip_reloading = TRUE;
-		if (fd)
-			sip_reloadreason = CHANNEL_CLI_RELOAD;
-		else
-			sip_reloadreason = CHANNEL_MODULE_RELOAD;
+		sip_reloadreason = fd ? CHANNEL_CLI_RELOAD : CHANNEL_MODULE_RELOAD;
 	}
 	ast_mutex_unlock(&sip_reload_lock);
 	restart_monitor();