[svn-commits] russell: branch group/security_events r199085 - in /team/group/security_event...

[SVN commits to the Digium repositories]

Author: russell
Date: Thu Jun  4 11:02:59 2009
New Revision: 199085

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=199085
Log:
Fix a couple more bugs.

Modified:
    team/group/security_events/main/security_events.c
    team/group/security_events/res/res_security_log.c
    team/group/security_events/tests/test_security_events.c

Modified: team/group/security_events/main/security_events.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/security_events/main/security_events.c?view=diff&rev=199085&r1=199084&r2=199085
==============================================================================
--- team/group/security_events/main/security_events.c (original)
+++ team/group/security_events/main/security_events.c Thu Jun  4 11:02:59 2009
@@ -41,7 +41,7 @@
 	const char *name;
 	uint32_t version;
 	int (*handler)(const struct ast_security_event_common *);
-#define MAX_SECURITY_IES 6
+#define MAX_SECURITY_IES 8
 	enum ast_event_ie_type required_ies[MAX_SECURITY_IES];
 	enum ast_event_ie_type optional_ies[MAX_SECURITY_IES];
 #undef MAX_SECURITY_IES
@@ -51,6 +51,7 @@
 		.version = AST_SECURITY_EVENT_FAILED_ACL_VERSION,
 		.handler = handle_failed_acl,
 		.required_ies = {
+			AST_EVENT_IE_SERVICE,
 			AST_EVENT_IE_EVENT_VERSION,
 			AST_EVENT_IE_ACCOUNT_ID,
 			AST_EVENT_IE_SESSION_ID,

Modified: team/group/security_events/res/res_security_log.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/security_events/res/res_security_log.c?view=diff&rev=199085&r1=199084&r2=199085
==============================================================================
--- team/group/security_events/res/res_security_log.c (original)
+++ team/group/security_events/res/res_security_log.c Thu Jun  4 11:02:59 2009
@@ -69,17 +69,17 @@
 	switch (ast_event_get_ie_pltype(ie_type)) {
 	case AST_EVENT_IE_PLTYPE_UINT:
 		ast_str_append(str, 0, ",%s=\"%u\"",
-				ast_event_get_ie_type_name(AST_EVENT_IE_SECURITY_EVENT),
+				ast_event_get_ie_type_name(ie_type),
 				ast_event_get_ie_uint(event, ie_type));
 		break;
 	case AST_EVENT_IE_PLTYPE_STR:
 		ast_str_append(str, 0, ",%s=\"%s\"",
-				ast_event_get_ie_type_name(AST_EVENT_IE_SECURITY_EVENT),
+				ast_event_get_ie_type_name(ie_type),
 				ast_event_get_ie_str(event, ie_type));
 		break;
 	case AST_EVENT_IE_PLTYPE_BITFLAGS:
 		ast_str_append(str, 0, ",%s=\"%u\"",
-				ast_event_get_ie_type_name(AST_EVENT_IE_SECURITY_EVENT),
+				ast_event_get_ie_type_name(ie_type),
 				ast_event_get_ie_bitflags(event, ie_type));
 		break;
 	case AST_EVENT_IE_PLTYPE_UNKNOWN:

Modified: team/group/security_events/tests/test_security_events.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/security_events/tests/test_security_events.c?view=diff&rev=199085&r1=199084&r2=199085
==============================================================================
--- team/group/security_events/tests/test_security_events.c (original)
+++ team/group/security_events/tests/test_security_events.c Thu Jun  4 11:02:59 2009
@@ -71,7 +71,7 @@
 	sin_local.sin_port = htons(12121);
 
 	inet_aton("192.168.1.2", &sin_remote.sin_addr);
-	sin_local.sin_port = htons(12345);
+	sin_remote.sin_port = htons(12345);
 
 	ast_security_event_report(AST_SEC_EVT(&failed_acl_event));
 }