[asterisk-commits] mmichelson: branch group/CCSS r236843 - in /team/group/CCSS: channels/ main/

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Dec 29 18:01:23 2009
New Revision: 236843

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=236843
Log:
* Add log message if an agent with "never" policy places a call. Strictly informational.
* Move the check for libmxl2 in chan_sip to before loading peers so that we can have peers with native CC policies.

Modified:
    team/group/CCSS/channels/chan_sip.c
    team/group/CCSS/main/ccss.c

Modified: team/group/CCSS/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/group/CCSS/channels/chan_sip.c?view=diff&rev=236843&r1=236842&r2=236843
==============================================================================
--- team/group/CCSS/channels/chan_sip.c (original)
+++ team/group/CCSS/channels/chan_sip.c Tue Dec 29 18:01:23 2009
@@ -28834,6 +28834,7 @@
 
 	sip_reloadreason = CHANNEL_MODULE_LOAD;
 
+	can_parse_xml = sip_is_xml_parsable();
 	if(reload_config(sip_reloadreason))	/* Load the configuration from sip.conf */
 		return AST_MODULE_LOAD_DECLINE;
 
@@ -28882,7 +28883,6 @@
 	sip_send_all_registers();
 	sip_send_all_mwi_subscriptions();
 	initialize_escs();
-	can_parse_xml = sip_is_xml_parsable();
 	if (sip_epa_register(&cc_epa_static_data)) {
 		return AST_MODULE_LOAD_DECLINE;
 	}

Modified: team/group/CCSS/main/ccss.c
URL: http://svnview.digium.com/svn/asterisk/team/group/CCSS/main/ccss.c?view=diff&rev=236843&r1=236842&r2=236843
==============================================================================
--- team/group/CCSS/main/ccss.c (original)
+++ team/group/CCSS/main/ccss.c Tue Dec 29 18:01:23 2009
@@ -1736,6 +1736,7 @@
 		 */
 		*ignore_cc = 1;
 		ast_channel_unlock(chan);
+		ast_log_dynamic_level(cc_logger_level, "Channel %s not configured to allow CC. CC will not be possible on this call\n", chan->name);
 		return 0;
 	}