[svn-commits] mmichelson: branch group/CCSS r214776 - /team/group/CCSS/main/ccss.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Fri Aug 28 17:17:30 2009
New Revision: 214776

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=214776
Log:
Fix two bugs:

ast_regiser_application_xml can only be called from within a module. Thanks
to Russell for helping out with that one.

The type field of the generic agent callbacks needs to be non-NULL if I
don't want a crash to happen.


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

Modified: team/group/CCSS/main/ccss.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/CCSS/main/ccss.c?view=diff&rev=214776&r1=214775&r2=214776
==============================================================================
--- team/group/CCSS/main/ccss.c (original)
+++ team/group/CCSS/main/ccss.c Fri Aug 28 17:17:30 2009
@@ -80,6 +80,7 @@
 static void cc_generic_agent_destructor(struct ast_cc_agent *agent);
 
 static struct ast_cc_agent_callbacks generic_agent_callbacks = {
+	.type = "generic",
 	.init = cc_generic_agent_init,
 	.start_offer_timer = cc_generic_agent_start_offer_timer,
 	.ack = cc_generic_agent_ack,
@@ -935,5 +936,5 @@
 		return -1;
 	}
 	ast_log(LOG_NOTICE, "Successfully created CC sched_thread context\n");
-	return ast_register_application_xml(ccreq_app, ccreq_exec);
-}
+	return ast_register_application2(ccreq_app, ccreq_exec, NULL, NULL, NULL);
+}