]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Fix comparison of presence state in event subsystem.
authorJason Parker <jparker@digium.com>
Mon, 4 Mar 2013 20:54:12 +0000 (20:54 +0000)
committerJason Parker <jparker@digium.com>
Mon, 4 Mar 2013 20:54:12 +0000 (20:54 +0000)
Several new IEs were not given types (or names), causing the comparison
function to improperly succeed.  This adds those.

(closes issue AST-1128)

git-svn-id: https://origsvn.digium.com/svn/asterisk/certified/branches/1.8.15@382389 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/event.c

index 39bf4cb44696dc5ffb6a6b552d57a07a7745dbe3..365b49ed94b6008da2ee06e7d0f833fb2081b8c1 100644 (file)
@@ -214,6 +214,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",
 };
 
 /*!
@@ -274,7 +275,11 @@ static const struct ie_map {
        [AST_EVENT_IE_CHALLENGE]           = { AST_EVENT_IE_PLTYPE_STR,  "Challenge" },
        [AST_EVENT_IE_RESPONSE]            = { AST_EVENT_IE_PLTYPE_STR,  "Response" },
        [AST_EVENT_IE_EXPECTED_RESPONSE]   = { AST_EVENT_IE_PLTYPE_STR,  "ExpectedResponse" },
-       [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)