[asterisk-commits] dlee: trunk r389343 - in /trunk: apps/app_userevent.c main/stasis_channels.c

[SVN commits to the Asterisk project]

Author: dlee
Date: Tue May 21 09:17:24 2013
New Revision: 389343

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=389343
Log:
Fixed some extra field assertion when the event WebSocket is connected

Modified:
    trunk/apps/app_userevent.c
    trunk/main/stasis_channels.c

Modified: trunk/apps/app_userevent.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_userevent.c?view=diff&rev=389343&r1=389342&r2=389343
==============================================================================
--- trunk/apps/app_userevent.c (original)
+++ trunk/apps/app_userevent.c Tue May 21 09:17:24 2013
@@ -87,8 +87,7 @@
 
 	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;

Modified: trunk/main/stasis_channels.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/stasis_channels.c?view=diff&rev=389343&r1=389342&r2=389343
==============================================================================
--- trunk/main/stasis_channels.c (original)
+++ trunk/main/stasis_channels.c Tue May 21 09:17:24 2013
@@ -174,8 +174,7 @@
 	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 @@
 	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) {