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

[SVN commits to the Digium repositories]

Author: russell
Date: Sat Jul 11 14:00:04 2009
New Revision: 206019

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=206019
Log:
Fix compat with trunk and issues from code review

Modified:
    team/group/security_events/doc/tex/security-events.tex
    team/group/security_events/main/event.c
    team/group/security_events/res/res_security_log.c
    team/group/security_events/tests/test_security_events.c

Modified: team/group/security_events/doc/tex/security-events.tex
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/security_events/doc/tex/security-events.tex?view=diff&rev=206019&r1=206018&r2=206019
==============================================================================
--- team/group/security_events/doc/tex/security-events.tex (original)
+++ team/group/security_events/doc/tex/security-events.tex Sat Jul 11 14:00:04 2009
@@ -61,13 +61,13 @@
     Asterisk trunk was recently updated to include support for dynamic logger
 levels.  This module takes advantage of this functionality to create a
 custom "security" logger level.  Then, when this module is in use, logger.conf
-can configured to put security events into a file:
+can be configured to put security events into a file:
 
 \begin{verbatim}
     security_log => security
 \end{verbatim}
 
-    The content of this file are a well defined and easily interpretable
+    The content of this file is a well defined and easily interpretable
 format for external scripts to read and act upon.  The definition for the format
 of the log file is described later in this chapter.
 
@@ -189,7 +189,7 @@
 IE: SessionID
 Content: This is a string used to identify the session associated with the
          event.  The format of the session identifier is specific to the
-         service.  In the case of SIP, this would be the call ID.
+         service.  In the case of SIP, this would be the Call-ID.
 
 IE: SessionTV
 Content: The time that the session associated with the SessionID started.
@@ -243,7 +243,7 @@
 
 IE: ExpectedResponse
 Content: This is a service specific string that represents the response
-         that was expected to be received from a user attempting 
+         that was expected to be received from a user attempting
          challenge/response authentication.
 
 \end{verbatim}

Modified: team/group/security_events/main/event.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/security_events/main/event.c?view=diff&rev=206019&r1=206018&r2=206019
==============================================================================
--- team/group/security_events/main/event.c (original)
+++ team/group/security_events/main/event.c Sat Jul 11 14:00:04 2009
@@ -192,8 +192,8 @@
 	[AST_EVENT_UNSUB]               = "Unsubscription",
 	[AST_EVENT_DEVICE_STATE]        = "DeviceState",
 	[AST_EVENT_DEVICE_STATE_CHANGE] = "DeviceStateChange",
+	[AST_EVENT_CEL]                 = "CEL",
 	[AST_EVENT_SECURITY]            = "Security",
-	{ AST_EVENT_CEL, "CEL" },
 };
 
 /*!

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=206019&r1=206018&r2=206019
==============================================================================
--- team/group/security_events/res/res_security_log.c (original)
+++ team/group/security_events/res/res_security_log.c Sat Jul 11 14:00:04 2009
@@ -137,7 +137,8 @@
 	}
 
 	if (!(security_event_sub = ast_event_subscribe(AST_EVENT_SECURITY,
-			security_event_cb, NULL, AST_EVENT_IE_END))) {
+			security_event_cb, "Security Event Logger",
+			NULL, AST_EVENT_IE_END))) {
 		ast_logger_unregister_level(LOG_SECURITY_NAME);
 		LOG_SECURITY = -1;
 		return AST_MODULE_LOAD_DECLINE;

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=206019&r1=206018&r2=206019
==============================================================================
--- team/group/security_events/tests/test_security_events.c (original)
+++ team/group/security_events/tests/test_security_events.c Sat Jul 11 14:00:04 2009
@@ -264,7 +264,7 @@
 		.common.service    = "TEST",
 		.common.module     = AST_MODULE,
 		.common.account_id = "George",
-		.common.session_id = "alksdjf023423h4lka0df",
+		.common.session_id = "asdkl23478289lasdkf",
 		.common.session_tv = &session_tv,
 		.common.local_addr = {
 			.sin  = &sin_local,