kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some extra field assertion when the event WebSocket is connected

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@389343 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David M. Lee
2013-05-21 14:17:24 +00:00
parent d8aec72494
commit e1e1cc2dee
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/app_userevent.c
View File

@@ -87,8 +87,7 @@ static int userevent_exec(struct ast_channel *chan, const char *data)
AST_STANDARD_APP_ARGS(args, parse); 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); "eventname", args.eventname);
if (!blob) { if (!blob) {
return -1; return -1;

6
main/stasis_channels.c
View File

@@ -174,8 +174,7 @@ void ast_channel_publish_dial(struct ast_channel *caller, struct ast_channel *pe
struct ast_channel_snapshot *peer_snapshot; struct ast_channel_snapshot *peer_snapshot;
ast_assert(peer != NULL); 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, ""), "dialstatus", S_OR(dialstatus, ""),
"dialstring", S_OR(dialstring, "")); "dialstring", S_OR(dialstring, ""));
if (!blob) { 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(name != NULL);
ast_assert(value != 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, "variable", name,
"value", value); "value", value);
if (!blob) { if (!blob) {