From: Jason Parker Date: Mon, 4 Mar 2013 21:15:52 +0000 (+0000) Subject: Fix comparison of presence state in event subsystem. X-Git-Tag: certified/11.2-cert1-rc1~2^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d698dc644e7b416c6f358932d06b25f2663b651a;p=thirdparty%2Fasterisk.git 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/certified/branches/11.2@382393 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/main/event.c b/main/event.c index c0295a7f25..fdb699f2bc 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)