Stasis: Ensure transfer messages follow validation rules

This makes Stasis() event generation for transfer messages follow
validation rules. Currently, ast_json_null() is being used in place of
omitting a key entirely which falls afoul of these validation rules.

https://reviewboard.asterisk.org/r/3892/
........

Merged revisions 420408 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@420410 65c4cc65-6c06-0410-ace0-fbb531ad65f3

1 files changed, 21 insertions, 12 deletions

diff --git a/main/stasis_bridges.c b/main/stasis_bridges.c
index c94d2ea10..ced5c43ad 100644
--- a/main/stasis_bridges.c
+++ b/main/stasis_bridges.c
@@ -636,7 +636,7 @@ static struct ast_json *blind_transfer_to_json(struct stasis_message *msg,
 	const struct stasis_message_sanitizer *sanitize)
 {
 	struct ast_blind_transfer_message *transfer_msg = stasis_message_data(msg);
-	struct ast_json *json_transferer, *json_transferee, *out;
+	struct ast_json *json_transferer, *json_transferee = NULL, *out;
 	const struct timeval *tv = stasis_message_timestamp(msg);
 
 	json_transferer = ast_channel_snapshot_to_json(transfer_msg->to_transferee.channel_snapshot, sanitize);
@@ -649,15 +649,12 @@ static struct ast_json *blind_transfer_to_json(struct stasis_message *msg,
 		if (!json_transferee) {
 			return NULL;
 		}
-	} else {
-		json_transferee = ast_json_null();
 	}
 
 	out = ast_json_pack("{s: s, s: o, s: o, s: o, s: s, s: s, s: s, s: o}",
 		"type", "BridgeBlindTransfer",
 		"timestamp", ast_json_timeval(*tv, NULL),
 		"transferer", json_transferer,
-		"transferee", json_transferee,
 		"exten", transfer_msg->exten,
 		"context", transfer_msg->context,
 		"result", result_strs[transfer_msg->result],
@@ -667,6 +664,11 @@ static struct ast_json *blind_transfer_to_json(struct stasis_message *msg,
 		return NULL;
 	}
 
+	if (json_transferee && ast_json_object_set(out, "transferee", json_transferee)) {
+		ast_json_unref(out);
+		return NULL;
+	}
+
 	if (transfer_msg->to_transferee.bridge_snapshot) {
 		struct ast_json *json_bridge = ast_bridge_snapshot_to_json(
 				transfer_msg->to_transferee.bridge_snapshot, sanitize);
@@ -779,7 +781,8 @@ static struct ast_json *attended_transfer_to_json(struct stasis_message *msg,
 {
 	struct ast_attended_transfer_message *transfer_msg = stasis_message_data(msg);
 	RAII_VAR(struct ast_json *, out, NULL, ast_json_unref);
-	struct ast_json *json_transferer1, *json_transferer2, *json_bridge, *json_channel, *json_transferee, *json_target;
+	struct ast_json *json_transferer1, *json_transferer2, *json_bridge, *json_channel;
+	struct ast_json *json_transferee = NULL, *json_target = NULL;
 	const struct timeval *tv = stasis_message_timestamp(msg);
 	int res = 0;
 
@@ -796,28 +799,34 @@ static struct ast_json *attended_transfer_to_json(struct stasis_message *msg,
 
 	if (transfer_msg->transferee) {
 		json_transferee = ast_channel_snapshot_to_json(transfer_msg->transferee, sanitize);
-	} else {
-		json_transferee = ast_json_null();
+		if (!json_transferee) {
+			return NULL;
+		}
 	}
 
 	if (transfer_msg->target) {
 		json_target = ast_channel_snapshot_to_json(transfer_msg->target, sanitize);
-	} else {
-		json_target = ast_json_null();
+		if (!json_target) {
+			return NULL;
+		}
 	}
 
-	out = ast_json_pack("{s: s, s: o, s: o, s: o, s: o, s: o, s: s, s: o}",
+	out = ast_json_pack("{s: s, s: o, s: o, s: o, s: s, s: o}",
 		"type", "BridgeAttendedTransfer",
 		"timestamp", ast_json_timeval(*tv, NULL),
 		"transferer_first_leg", json_transferer1,
 		"transferer_second_leg", json_transferer2,
-		"transferee", json_transferee,
-		"transfer_target", json_target,
 		"result", result_strs[transfer_msg->result],
 		"is_external", ast_json_boolean(transfer_msg->is_external));
 	if (!out) {
 		return NULL;
 	}
+	if (json_transferee && ast_json_object_set(out, "transferee", json_transferee)) {
+		return NULL;
+	}
+	if (json_target && ast_json_object_set(out, "transfer_target", json_target)) {
+		return NULL;
+	}
 
 	if (transfer_msg->to_transferee.bridge_snapshot) {
 		json_bridge = ast_bridge_snapshot_to_json(transfer_msg->to_transferee.bridge_snapshot, sanitize);