1 files changed, 102 insertions, 13 deletions

diff --git a/apps/app_cdr.c b/apps/app_cdr.c
index 34fd45675..2793846f9 100644
--- a/apps/app_cdr.c
+++ b/apps/app_cdr.c
@@ -36,6 +36,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/channel.h"
 #include "asterisk/module.h"
 #include "asterisk/app.h"
+#include "asterisk/stasis.h"
 
 /*** DOCUMENTATION
 	<application name="NoCDR" language="en_US">
@@ -112,43 +113,130 @@ AST_APP_OPTIONS(resetcdr_opts, {
 	AST_APP_OPTION('e', AST_CDR_FLAG_DISABLE_ALL),
 });
 
+STASIS_MESSAGE_TYPE_DEFN_LOCAL(appcdr_message_type);
+
+/*! \internal \brief Payload for the Stasis message sent to manipulate a CDR */
+struct app_cdr_message_payload {
+	/*! The name of the channel to be manipulated */
+	const char *channel_name;
+	/*! Disable the CDR for this channel */
+	int disable:1;
+	/*! Re-enable the CDR for this channel */
+	int reenable:1;
+	/*! Reset the CDR */
+	int reset:1;
+	/*! If reseting the CDR, keep the variables */
+	int keep_variables:1;
+};
+
+static void appcdr_callback(void *data, struct stasis_subscription *sub, struct stasis_message *message)
+{
+	struct app_cdr_message_payload *payload;
+
+	if (stasis_message_type(message) != appcdr_message_type()) {
+		return;
+	}
+
+	payload = stasis_message_data(message);
+	if (!payload) {
+		return;
+	}
+
+	if (payload->disable) {
+		if (ast_cdr_set_property(payload->channel_name, AST_CDR_FLAG_DISABLE_ALL)) {
+			ast_log(AST_LOG_WARNING, "Failed to disable CDRs on channel %s\n",
+				payload->channel_name);
+		}
+	}
+
+	if (payload->reenable) {
+		if (ast_cdr_clear_property(payload->channel_name, AST_CDR_FLAG_DISABLE_ALL)) {
+			ast_log(AST_LOG_WARNING, "Failed to enable CDRs on channel %s\n",
+				payload->channel_name);
+		}
+	}
+
+	if (payload->reset) {
+		if (ast_cdr_reset(payload->channel_name, payload->keep_variables)) {
+			ast_log(AST_LOG_WARNING, "Failed to reset CDRs on channel %s\n",
+				payload->channel_name);
+		}
+	}
+}
+
+static int publish_app_cdr_message(struct ast_channel *chan, struct app_cdr_message_payload *payload)
+{
+	RAII_VAR(struct stasis_message *, message, NULL, ao2_cleanup);
+	RAII_VAR(struct stasis_subscription *, subscription, NULL, ao2_cleanup);
+
+	message = stasis_message_create(appcdr_message_type(), payload);
+	if (!message) {
+		ast_log(AST_LOG_WARNING, "Failed to manipulate CDR for channel %s: unable to create message\n",
+			payload->channel_name);
+		return -1;
+	}
+
+	subscription = stasis_subscribe(ast_channel_topic(chan), appcdr_callback, NULL);
+	if (!subscription) {
+		ast_log(AST_LOG_WARNING, "Failed to manipulate CDR for channel %s: unable to create subscription\n",
+			payload->channel_name);
+		return -1;
+	}
+
+	stasis_publish(ast_channel_topic(chan), message);
+
+	subscription = stasis_unsubscribe_and_join(subscription);
+	return 0;
+}
+
 static int resetcdr_exec(struct ast_channel *chan, const char *data)
 {
+	RAII_VAR(struct app_cdr_message_payload *, payload,
+		ao2_alloc(sizeof(*payload), NULL), ao2_cleanup);
 	char *args;
 	struct ast_flags flags = { 0 };
-	int res = 0;
+
+	if (!payload) {
+		return -1;
+	}
 
 	if (!ast_strlen_zero(data)) {
 		args = ast_strdupa(data);
 		ast_app_parse_options(resetcdr_opts, &flags, NULL, args);
 	}
 
+	payload->channel_name = ast_channel_name(chan);
+	payload->reset = 1;
+
 	if (ast_test_flag(&flags, AST_CDR_FLAG_DISABLE_ALL)) {
-		if (ast_cdr_clear_property(ast_channel_name(chan), AST_CDR_FLAG_DISABLE_ALL)) {
-			res = 1;
-		}
-	}
-	if (ast_cdr_reset(ast_channel_name(chan), &flags)) {
-		res = 1;
+		payload->reenable = 1;
 	}
 
-	if (res) {
-		ast_log(AST_LOG_WARNING, "Failed to reset CDR for channel %s\n", ast_channel_name(chan));
+	if (ast_test_flag(&flags, AST_CDR_FLAG_KEEP_VARS)) {
+		payload->keep_variables = 1;
 	}
-	return res;
+
+	return publish_app_cdr_message(chan, payload);
 }
 
 static int nocdr_exec(struct ast_channel *chan, const char *data)
 {
-	if (ast_cdr_set_property(ast_channel_name(chan), AST_CDR_FLAG_DISABLE_ALL)) {
-		ast_log(AST_LOG_WARNING, "Failed to disable CDR for channel %s\n", ast_channel_name(chan));
+	RAII_VAR(struct app_cdr_message_payload *, payload,
+		ao2_alloc(sizeof(*payload), NULL), ao2_cleanup);
+
+	if (!payload) {
+		return -1;
 	}
 
-	return 0;
+	payload->channel_name = ast_channel_name(chan);
+	payload->disable = 1;
+
+	return publish_app_cdr_message(chan, payload);
 }
 
 static int unload_module(void)
 {
+	STASIS_MESSAGE_TYPE_CLEANUP(appcdr_message_type);
 	ast_unregister_application(nocdr_app);
 	ast_unregister_application(resetcdr_app);
 	return 0;
@@ -158,6 +246,7 @@ static int load_module(void)
 {
 	int res = 0;
 
+	res |= STASIS_MESSAGE_TYPE_INIT(appcdr_message_type);
 	res |= ast_register_application_xml(nocdr_app, nocdr_exec);
 	res |= ast_register_application_xml(resetcdr_app, resetcdr_exec);