diff options
| author | Jason Parker <jparker@digium.com> | 2013-03-04 21:14:30 +0000 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2013-03-04 21:14:30 +0000 |
| commit | 22d58fbea8dfcac70eca517dcb29e4ae995e311a (patch) | |
| tree | 986dc6ca04d7fc7cae65f3ad7ac8c45cdfed523f /main | |
| parent | 933800754faf7bb5c08f2504e1358cb20fd7ad4d (diff) | |
Fix comparison of presence state in event subsystem.
Several new IEs were not given types (or names), causing the comparison
function to improperly succeed. This adds those.
(closes issue AST-1128)
........
Merged revisions 382390 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@382391 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/event.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/main/event.c b/main/event.c index 34ba01942..508ebac9b 100644 --- a/main/event.c +++ b/main/event.c @@ -215,6 +215,7 @@ static const char * const event_names[AST_EVENT_TOTAL] = { [AST_EVENT_CEL] = "CEL", [AST_EVENT_SECURITY] = "Security", [AST_EVENT_NETWORK_CHANGE] = "NetworkChange", + [AST_EVENT_PRESENCE_STATE] = "PresenceState", }; /*! @@ -279,7 +280,11 @@ static const struct ie_map { [AST_EVENT_IE_RECEIVED_HASH] = { AST_EVENT_IE_PLTYPE_STR, "ReceivedHash" }, [AST_EVENT_IE_USING_PASSWORD] = { AST_EVENT_IE_PLTYPE_UINT, "UsingPassword" }, [AST_EVENT_IE_ATTEMPTED_TRANSPORT] = { AST_EVENT_IE_PLTYPE_STR, "AttemptedTransport" }, - [AST_EVENT_IE_CACHABLE] = { AST_EVENT_IE_PLTYPE_UINT, "Cachable" }, + [AST_EVENT_IE_CACHABLE] = { AST_EVENT_IE_PLTYPE_UINT, "Cachable" }, + [AST_EVENT_IE_PRESENCE_PROVIDER] = { AST_EVENT_IE_PLTYPE_STR, "PresenceProvider" }, + [AST_EVENT_IE_PRESENCE_STATE] = { AST_EVENT_IE_PLTYPE_UINT, "PresenceState" }, + [AST_EVENT_IE_PRESENCE_SUBTYPE] = { AST_EVENT_IE_PLTYPE_STR, "PresenceSubtype" }, + [AST_EVENT_IE_PRESENCE_MESSAGE] = { AST_EVENT_IE_PLTYPE_STR, "PresenceMessage" }, }; const char *ast_event_get_type_name(const struct ast_event *event) |