diff options
| author | David M. Lee <dlee@digium.com> | 2013-05-08 18:34:50 +0000 |
|---|---|---|
| committer | David M. Lee <dlee@digium.com> | 2013-05-08 18:34:50 +0000 |
| commit | 0eb4cf8c194d05214677459feb389f63f60c68af (patch) | |
| tree | 86f355afb7bda15fe320192ce9daecffa71bfba2 /apps/app_userevent.c | |
| parent | 297feffd4ed67a5b72eb28de0f6c7edcd0edb40d (diff) | |
Remove required type field from channel blobs
When we first introduced the channel blob types, the JSON blobs were
self identifying by a required "type" field in the JSON object
itself. This, as it turns out, was a bad idea.
When we introduced the message router, it was useless for routing based
on the JSON type. And messages had two type fields to check: the
stasis_message_type() of the message itself, plus the type field in the
JSON blob (but only if it was a blob message).
This patch corrects that mistake by removing the required type field
from JSON blobs, and introducing first class stasis_message_type objects
for the actual message type.
Since we now will have a proliferation of message types, I introduced a
few macros to help reduce the amount of boilerplate necessary to set
them up.
Review: https://reviewboard.asterisk.org/r/2509
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@388005 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_userevent.c')
| -rw-r--r-- | apps/app_userevent.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_userevent.c b/apps/app_userevent.c index 0c44cf25e..ded039e3f 100644 --- a/apps/app_userevent.c +++ b/apps/app_userevent.c @@ -93,7 +93,6 @@ static int userevent_exec(struct ast_channel *chan, const char *data) } blob = ast_json_pack("{s: s, s: s, s: s}", - "type", "userevent", "eventname", args.eventname, "body", ast_str_buffer(body)); if (!blob) { @@ -101,7 +100,8 @@ static int userevent_exec(struct ast_channel *chan, const char *data) return -1; } - msg = ast_channel_blob_create(chan, blob); + msg = ast_channel_blob_create( + chan, ast_channel_user_event_type(), blob); if (!msg) { return -1; } |