Fixed some extra field assertion when the event WebSocket is connected

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

apps/app_userevent.c

@@ -87,8 +87,7 @@ static int userevent_exec(struct ast_channel *chan, const char *data)
 
 	AST_STANDARD_APP_ARGS(args, parse);
 
-	blob = ast_json_pack("{s: s, s: s}",
+	blob = ast_json_pack("{s: s}",
-			     "type", "userevent",
 			     "eventname", args.eventname);
 	if (!blob) {
 		return -1;

main/stasis_channels.c

@@ -174,8 +174,7 @@ void ast_channel_publish_dial(struct ast_channel *caller, struct ast_channel *pe
 	struct ast_channel_snapshot *peer_snapshot;
 
 	ast_assert(peer != NULL);
-	blob = ast_json_pack("{s: s, s: s, s: s}",
+	blob = ast_json_pack("{s: s, s: s}",
-			     "type", "dial",
 			     "dialstatus", S_OR(dialstatus, ""),
 			     "dialstring", S_OR(dialstring, ""));
 	if (!blob) {
@@ -398,8 +397,7 @@ void ast_channel_publish_varset(struct ast_channel *chan, const char *name, cons
 	ast_assert(name != NULL);
 	ast_assert(value != NULL);
 
-	blob = ast_json_pack("{s: s, s: s, s: s}",
+	blob = ast_json_pack("{s: s, s: s}",
-			     "type", "varset",
 			     "variable", name,
 			     "value", value);
 	if (!blob) {