From 0667c052610c90dc86d63388e040c3cd6d9f8c57 Mon Sep 17 00:00:00 2001 From: Jason Parker Date: Mon, 4 Mar 2013 21:12:45 +0000 Subject: [PATCH] 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) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@382390 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/event.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/main/event.c b/main/event.c index 34ba01942a..508ebac9ba 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)