From: David M. Lee <dlee@digium.com>
Date: Tue, 21 May 2013 14:17:24 +0000 (+0000)
Subject: Fixed some extra field assertion when the event WebSocket is connected
X-Git-Tag: 13.0.0-beta1~1785
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1e1cc2deefb92f8b43825f1f34e619354737842;p=thirdparty%2Fasterisk.git

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
---

diff --git a/apps/app_userevent.c b/apps/app_userevent.c
index b2dbb133ff..fe037e2f98 100644
--- a/apps/app_userevent.c
+++ b/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}",
-			     "type", "userevent",
+	blob = ast_json_pack("{s: s}",
 			     "eventname", args.eventname);
 	if (!blob) {
 		return -1;
diff --git a/main/stasis_channels.c b/main/stasis_channels.c
index 95f5f9d0e9..0b2ccbc1fd 100644
--- a/main/stasis_channels.c
+++ b/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}",
-			     "type", "dial",
+	blob = ast_json_pack("{s: s, s: s}",
 			     "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}",
-			     "type", "varset",
+	blob = ast_json_pack("{s: s, s: s}",
 			     "variable", name,
 			     "value", value);
 	if (!blob) {