[svn-commits] russell: branch group/security_events r201187 - in /team/group/security_event...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Tue Jun 16 16:52:57 CDT 2009
Author: russell
Date: Tue Jun 16 16:52:53 2009
New Revision: 201187
URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=201187
Log:
Move session ID to common struct
Modified:
team/group/security_events/channels/chan_sip.c
team/group/security_events/include/asterisk/security_events_defs.h
team/group/security_events/main/manager.c
team/group/security_events/main/security_events.c
team/group/security_events/tests/test_security_events.c
Modified: team/group/security_events/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/security_events/channels/chan_sip.c?view=diff&rev=201187&r1=201186&r2=201187
==============================================================================
--- team/group/security_events/channels/chan_sip.c (original)
+++ team/group/security_events/channels/chan_sip.c Tue Jun 16 16:52:53 2009
@@ -12032,8 +12032,8 @@
.common.service = "SIP",
.common.module = AST_MODULE,
.common.account_id = peer->name,
-
- .session_id = pvt->callid,
+ .common.session_id = pvt->callid,
+
.acl_name = acl_name,
.session_tv = &pvt->session_tv,
.local_addr = {
@@ -12059,8 +12059,8 @@
.common.service = "SIP",
.common.module = AST_MODULE,
.common.account_id = peer_name,
-
- .session_id = pvt->callid,
+ .common.session_id = pvt->callid,
+
.session_tv = &pvt->session_tv,
.local_addr = {
.sin = encode_sin_local(&sin_local, pvt),
Modified: team/group/security_events/include/asterisk/security_events_defs.h
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/security_events/include/asterisk/security_events_defs.h?view=diff&rev=201187&r1=201186&r2=201187
==============================================================================
--- team/group/security_events/include/asterisk/security_events_defs.h (original)
+++ team/group/security_events/include/asterisk/security_events_defs.h Tue Jun 16 16:52:53 2009
@@ -178,6 +178,11 @@
* \note optional/required, depending on event type
*/
const char *account_id;
+ /*!
+ * \brief Session ID, specific to the service type
+ * \note Always required
+ */
+ const char *session_id;
};
/*!
@@ -195,11 +200,6 @@
*/
struct ast_security_event_common common;
/*!
- * \brief Session ID, specific to the service type
- * \note required
- */
- const char *session_id;
- /*!
* \brief ACL name, identifies which ACL was hit
* \note optional
*/
@@ -236,11 +236,6 @@
*/
struct ast_security_event_common common;
/*!
- * \brief Session ID, specific to the service type
- * \note required
- */
- const char *session_id;
- /*!
* \brief Session timeval, when the session started
* \note optional
*/
@@ -272,11 +267,6 @@
*/
struct ast_security_event_common common;
/*!
- * \brief Session ID, specific to the service type
- * \note required
- */
- const char *session_id;
- /*!
* \brief Session timeval, when the session started
* \note optional
*/
@@ -308,11 +298,6 @@
*/
struct ast_security_event_common common;
/*!
- * \brief Session ID, specific to the service type
- * \note required
- */
- const char *session_id;
- /*!
* \brief Session timeval, when the session started
* \note optional
*/
@@ -344,11 +329,6 @@
*/
struct ast_security_event_common common;
/*!
- * \brief Session ID, specific to the service type
- * \note required
- */
- const char *session_id;
- /*!
* \brief Session timeval, when the session started
* \note optional
*/
@@ -380,11 +360,6 @@
*/
struct ast_security_event_common common;
/*!
- * \brief Session ID, specific to the service type
- * \note required
- */
- const char *session_id;
- /*!
* \brief Session timeval, when the session started
* \note optional
*/
@@ -421,11 +396,6 @@
*/
struct ast_security_event_common common;
/*!
- * \brief Session ID, specific to the service type
- * \note required
- */
- const char *session_id;
- /*!
* \brief Session timeval, when the session started
* \note optional
*/
@@ -467,11 +437,6 @@
*/
struct ast_security_event_common common;
/*!
- * \brief Session ID, specific to the service type
- * \note required
- */
- const char *session_id;
- /*!
* \brief Session timeval, when the session started
* \note optional
*/
@@ -508,11 +473,6 @@
*/
struct ast_security_event_common common;
/*!
- * \brief Session ID, specific to the service type
- * \note required
- */
- const char *session_id;
- /*!
* \brief Session timeval, when the session started
* \note optional
*/
@@ -554,11 +514,6 @@
*/
struct ast_security_event_common common;
/*!
- * \brief Session ID, specific to the service type
- * \note required
- */
- const char *session_id;
- /*!
* \brief Session timeval, when the session started
* \note optional
*/
@@ -590,11 +545,6 @@
*/
struct ast_security_event_common common;
/*!
- * \brief Session ID, specific to the service type
- * \note required
- */
- const char *session_id;
- /*!
* \brief Session timeval, when the session started
* \note optional
*/
@@ -631,11 +581,6 @@
*/
struct ast_security_event_common common;
/*!
- * \brief Session ID, specific to the service type
- * \note required
- */
- const char *session_id;
- /*!
* \brief Session timeval, when the session started
* \note optional
*/
@@ -681,11 +626,6 @@
* \note Account ID required
*/
struct ast_security_event_common common;
- /*!
- * \brief Session ID, specific to the service type
- * \note required
- */
- const char *session_id;
/*!
* \brief Session timeval, when the session started
* \note optional
Modified: team/group/security_events/main/manager.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/security_events/main/manager.c?view=diff&rev=201187&r1=201186&r2=201187
==============================================================================
--- team/group/security_events/main/manager.c (original)
+++ team/group/security_events/main/manager.c Tue Jun 16 16:52:53 2009
@@ -1774,7 +1774,7 @@
};
ast_str_set(&session_id, 0, "%p", s->session);
- inval_acct_id.session_id = ast_str_buffer(session_id);
+ inval_acct_id.common.session_id = ast_str_buffer(session_id);
ast_security_event_report(AST_SEC_EVT(&inval_acct_id));
}
@@ -1801,7 +1801,7 @@
};
ast_str_set(&session_id, 0, "%p", s->session);
- failed_acl_event.session_id = ast_str_buffer(session_id);
+ failed_acl_event.common.session_id = ast_str_buffer(session_id);
ast_security_event_report(AST_SEC_EVT(&failed_acl_event));
}
@@ -1828,7 +1828,7 @@
};
ast_str_set(&session_id, 0, "%p", s->session);
- inval_password.session_id = ast_str_buffer(session_id);
+ inval_password.common.session_id = ast_str_buffer(session_id);
ast_security_event_report(AST_SEC_EVT(&inval_password));
}
@@ -1855,7 +1855,7 @@
};
ast_str_set(&session_id, 0, "%p", s->session);
- successful_auth.session_id = ast_str_buffer(session_id);
+ successful_auth.common.session_id = ast_str_buffer(session_id);
ast_security_event_report(AST_SEC_EVT(&successful_auth));
}
@@ -1883,7 +1883,7 @@
};
ast_str_set(&session_id, 0, "%p", s->session);
- req_not_allowed.session_id = ast_str_buffer(session_id);
+ req_not_allowed.common.session_id = ast_str_buffer(session_id);
ast_str_set(&request_type, 0, "Action: %s", action);
req_not_allowed.request_type = ast_str_buffer(request_type);
@@ -1914,7 +1914,7 @@
};
ast_str_set(&session_id, 0, "%p", s->session);
- req_bad_format.session_id = ast_str_buffer(session_id);
+ req_bad_format.common.session_id = ast_str_buffer(session_id);
ast_str_set(&request_type, 0, "Action: %s", action);
req_bad_format.request_type = ast_str_buffer(request_type);
@@ -1948,7 +1948,7 @@
};
ast_str_set(&session_id, 0, "%p", s->session);
- chal_resp_failed.session_id = ast_str_buffer(session_id);
+ chal_resp_failed.common.session_id = ast_str_buffer(session_id);
ast_security_event_report(AST_SEC_EVT(&chal_resp_failed));
}
@@ -1975,7 +1975,7 @@
};
ast_str_set(&session_id, 0, "%p", s->session);
- session_limit.session_id = ast_str_buffer(session_id);
+ session_limit.common.session_id = ast_str_buffer(session_id);
ast_security_event_report(AST_SEC_EVT(&session_limit));
}
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=201187&r1=201186&r2=201187
==============================================================================
--- team/group/security_events/main/security_events.c (original)
+++ team/group/security_events/main/security_events.c Tue Jun 16 16:52:53 2009
@@ -57,7 +57,7 @@
{ AST_EVENT_IE_SERVICE, SEC_EVT_FIELD(common, service) },
{ AST_EVENT_IE_EVENT_VERSION, SEC_EVT_FIELD(common, version) },
{ AST_EVENT_IE_ACCOUNT_ID, SEC_EVT_FIELD(common, account_id) },
- { AST_EVENT_IE_SESSION_ID, SEC_EVT_FIELD(failed_acl, session_id) },
+ { AST_EVENT_IE_SESSION_ID, SEC_EVT_FIELD(common, session_id) },
{ AST_EVENT_IE_LOCAL_ADDR, SEC_EVT_FIELD(failed_acl, local_addr) },
{ AST_EVENT_IE_REMOTE_ADDR, SEC_EVT_FIELD(failed_acl, remote_addr) },
{ AST_EVENT_IE_END, 0 }
@@ -80,7 +80,7 @@
{ AST_EVENT_IE_SERVICE, SEC_EVT_FIELD(common, service) },
{ AST_EVENT_IE_EVENT_VERSION, SEC_EVT_FIELD(common, version) },
{ AST_EVENT_IE_ACCOUNT_ID, SEC_EVT_FIELD(common, account_id) },
- { AST_EVENT_IE_SESSION_ID, SEC_EVT_FIELD(inval_acct_id, session_id) },
+ { AST_EVENT_IE_SESSION_ID, SEC_EVT_FIELD(common, session_id) },
{ AST_EVENT_IE_LOCAL_ADDR, SEC_EVT_FIELD(inval_acct_id, local_addr) },
{ AST_EVENT_IE_REMOTE_ADDR, SEC_EVT_FIELD(inval_acct_id, remote_addr) },
{ AST_EVENT_IE_END, 0 }
@@ -102,7 +102,7 @@
{ AST_EVENT_IE_SERVICE, SEC_EVT_FIELD(common, service) },
{ AST_EVENT_IE_EVENT_VERSION, SEC_EVT_FIELD(common, version) },
{ AST_EVENT_IE_ACCOUNT_ID, SEC_EVT_FIELD(common, account_id) },
- { AST_EVENT_IE_SESSION_ID, SEC_EVT_FIELD(session_limit, session_id) },
+ { AST_EVENT_IE_SESSION_ID, SEC_EVT_FIELD(common, session_id) },
{ AST_EVENT_IE_LOCAL_ADDR, SEC_EVT_FIELD(session_limit, local_addr) },
{ AST_EVENT_IE_REMOTE_ADDR, SEC_EVT_FIELD(session_limit, remote_addr) },
{ AST_EVENT_IE_END, 0 }
@@ -124,7 +124,7 @@
{ AST_EVENT_IE_SERVICE, SEC_EVT_FIELD(common, service) },
{ AST_EVENT_IE_EVENT_VERSION, SEC_EVT_FIELD(common, version) },
{ AST_EVENT_IE_ACCOUNT_ID, SEC_EVT_FIELD(common, account_id) },
- { AST_EVENT_IE_SESSION_ID, SEC_EVT_FIELD(mem_limit, session_id) },
+ { AST_EVENT_IE_SESSION_ID, SEC_EVT_FIELD(common, session_id) },
{ AST_EVENT_IE_LOCAL_ADDR, SEC_EVT_FIELD(mem_limit, local_addr) },
{ AST_EVENT_IE_REMOTE_ADDR, SEC_EVT_FIELD(mem_limit, remote_addr) },
{ AST_EVENT_IE_END, 0 }
@@ -146,7 +146,7 @@
{ AST_EVENT_IE_SERVICE, SEC_EVT_FIELD(common, service) },
{ AST_EVENT_IE_EVENT_VERSION, SEC_EVT_FIELD(common, version) },
{ AST_EVENT_IE_ACCOUNT_ID, SEC_EVT_FIELD(common, account_id) },
- { AST_EVENT_IE_SESSION_ID, SEC_EVT_FIELD(load_avg, session_id) },
+ { AST_EVENT_IE_SESSION_ID, SEC_EVT_FIELD(common, session_id) },
{ AST_EVENT_IE_LOCAL_ADDR, SEC_EVT_FIELD(load_avg, local_addr) },
{ AST_EVENT_IE_REMOTE_ADDR, SEC_EVT_FIELD(load_avg, remote_addr) },
{ AST_EVENT_IE_END, 0 }
@@ -168,7 +168,7 @@
{ AST_EVENT_IE_SERVICE, SEC_EVT_FIELD(common, service) },
{ AST_EVENT_IE_EVENT_VERSION, SEC_EVT_FIELD(common, version) },
{ AST_EVENT_IE_ACCOUNT_ID, SEC_EVT_FIELD(common, account_id) },
- { AST_EVENT_IE_SESSION_ID, SEC_EVT_FIELD(req_no_support, session_id) },
+ { AST_EVENT_IE_SESSION_ID, SEC_EVT_FIELD(common, session_id) },
{ AST_EVENT_IE_LOCAL_ADDR, SEC_EVT_FIELD(req_no_support, local_addr) },
{ AST_EVENT_IE_REMOTE_ADDR, SEC_EVT_FIELD(req_no_support, remote_addr) },
{ AST_EVENT_IE_REQUEST_TYPE, SEC_EVT_FIELD(req_no_support, request_type) },
@@ -191,7 +191,7 @@
{ AST_EVENT_IE_SERVICE, SEC_EVT_FIELD(common, service) },
{ AST_EVENT_IE_EVENT_VERSION, SEC_EVT_FIELD(common, version) },
{ AST_EVENT_IE_ACCOUNT_ID, SEC_EVT_FIELD(common, account_id) },
- { AST_EVENT_IE_SESSION_ID, SEC_EVT_FIELD(req_not_allowed, session_id) },
+ { AST_EVENT_IE_SESSION_ID, SEC_EVT_FIELD(common, session_id) },
{ AST_EVENT_IE_LOCAL_ADDR, SEC_EVT_FIELD(req_not_allowed, local_addr) },
{ AST_EVENT_IE_REMOTE_ADDR, SEC_EVT_FIELD(req_not_allowed, remote_addr) },
{ AST_EVENT_IE_REQUEST_TYPE, SEC_EVT_FIELD(req_not_allowed, request_type) },
@@ -215,7 +215,7 @@
{ AST_EVENT_IE_SERVICE, SEC_EVT_FIELD(common, service) },
{ AST_EVENT_IE_EVENT_VERSION, SEC_EVT_FIELD(common, version) },
{ AST_EVENT_IE_ACCOUNT_ID, SEC_EVT_FIELD(common, account_id) },
- { AST_EVENT_IE_SESSION_ID, SEC_EVT_FIELD(auth_method_not_allowed, session_id) },
+ { AST_EVENT_IE_SESSION_ID, SEC_EVT_FIELD(common, session_id) },
{ AST_EVENT_IE_LOCAL_ADDR, SEC_EVT_FIELD(auth_method_not_allowed, local_addr) },
{ AST_EVENT_IE_REMOTE_ADDR, SEC_EVT_FIELD(auth_method_not_allowed, remote_addr) },
{ AST_EVENT_IE_AUTH_METHOD, SEC_EVT_FIELD(auth_method_not_allowed, auth_method) },
@@ -237,7 +237,7 @@
{ AST_EVENT_IE_SEVERITY, 0 },
{ AST_EVENT_IE_SERVICE, SEC_EVT_FIELD(common, service) },
{ AST_EVENT_IE_EVENT_VERSION, SEC_EVT_FIELD(common, version) },
- { AST_EVENT_IE_SESSION_ID, SEC_EVT_FIELD(req_bad_format, session_id) },
+ { AST_EVENT_IE_SESSION_ID, SEC_EVT_FIELD(common, session_id) },
{ AST_EVENT_IE_LOCAL_ADDR, SEC_EVT_FIELD(req_bad_format, local_addr) },
{ AST_EVENT_IE_REMOTE_ADDR, SEC_EVT_FIELD(req_bad_format, remote_addr) },
{ AST_EVENT_IE_REQUEST_TYPE, SEC_EVT_FIELD(req_bad_format, request_type) },
@@ -262,7 +262,7 @@
{ AST_EVENT_IE_SERVICE, SEC_EVT_FIELD(common, service) },
{ AST_EVENT_IE_EVENT_VERSION, SEC_EVT_FIELD(common, version) },
{ AST_EVENT_IE_ACCOUNT_ID, SEC_EVT_FIELD(common, account_id) },
- { AST_EVENT_IE_SESSION_ID, SEC_EVT_FIELD(successful_auth, session_id) },
+ { AST_EVENT_IE_SESSION_ID, SEC_EVT_FIELD(common, session_id) },
{ AST_EVENT_IE_LOCAL_ADDR, SEC_EVT_FIELD(successful_auth, local_addr) },
{ AST_EVENT_IE_REMOTE_ADDR, SEC_EVT_FIELD(successful_auth, remote_addr) },
{ AST_EVENT_IE_END, 0 }
@@ -284,7 +284,7 @@
{ AST_EVENT_IE_SERVICE, SEC_EVT_FIELD(common, service) },
{ AST_EVENT_IE_EVENT_VERSION, SEC_EVT_FIELD(common, version) },
{ AST_EVENT_IE_ACCOUNT_ID, SEC_EVT_FIELD(common, account_id) },
- { AST_EVENT_IE_SESSION_ID, SEC_EVT_FIELD(unexpected_addr, session_id) },
+ { AST_EVENT_IE_SESSION_ID, SEC_EVT_FIELD(common, session_id) },
{ AST_EVENT_IE_LOCAL_ADDR, SEC_EVT_FIELD(unexpected_addr, local_addr) },
{ AST_EVENT_IE_REMOTE_ADDR, SEC_EVT_FIELD(unexpected_addr, remote_addr) },
{ AST_EVENT_IE_EXPECTED_ADDR, SEC_EVT_FIELD(unexpected_addr, expected_addr) },
@@ -307,7 +307,7 @@
{ AST_EVENT_IE_SERVICE, SEC_EVT_FIELD(common, service) },
{ AST_EVENT_IE_EVENT_VERSION, SEC_EVT_FIELD(common, version) },
{ AST_EVENT_IE_ACCOUNT_ID, SEC_EVT_FIELD(common, account_id) },
- { AST_EVENT_IE_SESSION_ID, SEC_EVT_FIELD(chal_resp_failed, session_id) },
+ { AST_EVENT_IE_SESSION_ID, SEC_EVT_FIELD(common, session_id) },
{ AST_EVENT_IE_LOCAL_ADDR, SEC_EVT_FIELD(chal_resp_failed, local_addr) },
{ AST_EVENT_IE_REMOTE_ADDR, SEC_EVT_FIELD(chal_resp_failed, remote_addr) },
{ AST_EVENT_IE_CHALLENGE, SEC_EVT_FIELD(chal_resp_failed, challenge) },
@@ -332,7 +332,7 @@
{ AST_EVENT_IE_SERVICE, SEC_EVT_FIELD(common, service) },
{ AST_EVENT_IE_EVENT_VERSION, SEC_EVT_FIELD(common, version) },
{ AST_EVENT_IE_ACCOUNT_ID, SEC_EVT_FIELD(common, account_id) },
- { AST_EVENT_IE_SESSION_ID, SEC_EVT_FIELD(inval_password, session_id) },
+ { AST_EVENT_IE_SESSION_ID, SEC_EVT_FIELD(common, session_id) },
{ AST_EVENT_IE_LOCAL_ADDR, SEC_EVT_FIELD(inval_password, local_addr) },
{ AST_EVENT_IE_REMOTE_ADDR, SEC_EVT_FIELD(inval_password, remote_addr) },
{ AST_EVENT_IE_END, 0 }
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=201187&r1=201186&r2=201187
==============================================================================
--- team/group/security_events/tests/test_security_events.c (original)
+++ team/group/security_events/tests/test_security_events.c Tue Jun 16 16:52:53 2009
@@ -82,8 +82,8 @@
.common.service = "TEST",
.common.module = AST_MODULE,
.common.account_id = "Username",
-
- .session_id = "Session123",
+ .common.session_id = "Session123",
+
.acl_name = "TEST_ACL",
.session_tv = &session_tv,
.local_addr = {
@@ -120,8 +120,8 @@
.common.service = "TEST",
.common.module = AST_MODULE,
.common.account_id = "FakeUser",
-
- .session_id = "Session456",
+ .common.session_id = "Session456",
+
.session_tv = &session_tv,
.local_addr = {
.sin = &sin_local,
@@ -157,8 +157,8 @@
.common.service = "TEST",
.common.module = AST_MODULE,
.common.account_id = "Jenny",
-
- .session_id = "8675309",
+ .common.session_id = "8675309",
+
.session_tv = &session_tv,
.local_addr = {
.sin = &sin_local,
@@ -194,8 +194,8 @@
.common.service = "TEST",
.common.module = AST_MODULE,
.common.account_id = "Felix",
-
- .session_id = "Session2604",
+ .common.session_id = "Session2604",
+
.session_tv = &session_tv,
.local_addr = {
.sin = &sin_local,
@@ -231,8 +231,8 @@
.common.service = "TEST",
.common.module = AST_MODULE,
.common.account_id = "GuestAccount",
-
- .session_id = "XYZ123",
+ .common.session_id = "XYZ123",
+
.session_tv = &session_tv,
.local_addr = {
.sin = &sin_local,
@@ -268,8 +268,8 @@
.common.service = "TEST",
.common.module = AST_MODULE,
.common.account_id = "George",
-
- .session_id = "alksdjf023423h4lka0df",
+ .common.session_id = "alksdjf023423h4lka0df",
+
.session_tv = &session_tv,
.local_addr = {
.sin = &sin_local,
@@ -306,8 +306,8 @@
.common.service = "TEST",
.common.module = AST_MODULE,
.common.account_id = "George",
-
- .session_id = "alksdjf023423h4lka0df",
+ .common.session_id = "alksdjf023423h4lka0df",
+
.session_tv = &session_tv,
.local_addr = {
.sin = &sin_local,
@@ -345,8 +345,8 @@
.common.service = "TEST",
.common.module = AST_MODULE,
.common.account_id = "Bob",
-
- .session_id = "010101010101",
+ .common.session_id = "010101010101",
+
.session_tv = &session_tv,
.local_addr = {
.sin = &sin_local,
@@ -383,8 +383,8 @@
.common.service = "TEST",
.common.module = AST_MODULE,
.common.account_id = "Larry",
-
- .session_id = "838383fhfhf83hf8h3f8h",
+ .common.session_id = "838383fhfhf83hf8h3f8h",
+
.session_tv = &session_tv,
.local_addr = {
.sin = &sin_local,
@@ -422,8 +422,8 @@
.common.service = "TEST",
.common.module = AST_MODULE,
.common.account_id = "ValidUser",
-
- .session_id = "Session456",
+ .common.session_id = "Session456",
+
.session_tv = &session_tv,
.local_addr = {
.sin = &sin_local,
@@ -462,8 +462,8 @@
.common.service = "TEST",
.common.module = AST_MODULE,
.common.account_id = "CoolUser",
-
- .session_id = "Session789",
+ .common.session_id = "Session789",
+
.session_tv = &session_tv,
.local_addr = {
.sin = &sin_local,
@@ -506,8 +506,8 @@
.common.service = "TEST",
.common.module = AST_MODULE,
.common.account_id = "SuperDuperUser",
-
- .session_id = "Session1231231231",
+ .common.session_id = "Session1231231231",
+
.session_tv = &session_tv,
.local_addr = {
.sin = &sin_local,
@@ -546,8 +546,8 @@
.common.service = "TEST",
.common.module = AST_MODULE,
.common.account_id = "AccountIDGoesHere",
-
- .session_id = "SessionIDGoesHere",
+ .common.session_id = "SessionIDGoesHere",
+
.session_tv = &session_tv,
.local_addr = {
.sin = &sin_local,
More information about the svn-commits
mailing list