[SVN-NetXMS] revision 3316

* { font-family: Consolas, Lucida Console, Courier New; font-size: 100%; }
h1 { font-size: 150%; }
td.linenos { background-color: #f0f0f0; padding-right: 10px; }
span.lineno { background-color: #f0f0f0; padding: 0 5px 0 5px; }
pre { line-height: 100%; width: 100%; }
.highlight span { width: 100%; display:-moz-inline-stack; display:inline-block; zoom:1; *display:inline; }
body { background: #ffffff; }
body .c { color: #999988; font-style: italic } /* Comment */
body .err { color: #a61717; background-color: #e3d2d2 } /* Error */
body .k { font-weight: bold } /* Keyword */
body .o { font-weight: bold } /* Operator */
body .cm { color: #999988; font-style: italic } /* Comment.Multiline */
body .cp { color: #999999; font-weight: bold } /* Comment.Preproc */
body .c1 { color: #999988; font-style: italic } /* Comment.Single */
body .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
body .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
body .ge { font-style: italic } /* Generic.Emph */
body .gr { color: #aa0000 } /* Generic.Error */
body .gh { color: #999999 } /* Generic.Heading */
body .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
body .go { color: #888888 } /* Generic.Output */
body .gp { color: #555555 } /* Generic.Prompt */
body .gs { font-weight: bold } /* Generic.Strong */
body .gu { color: #aaaaaa } /* Generic.Subheading */
body .gt { color: #aa0000 } /* Generic.Traceback */
body .kc { font-weight: bold } /* Keyword.Constant */
body .kd { font-weight: bold } /* Keyword.Declaration */
body .kp { font-weight: bold } /* Keyword.Pseudo */
body .kr { font-weight: bold } /* Keyword.Reserved */
body .kt { color: #445588; font-weight: bold } /* Keyword.Type */
body .m { color: #009999 } /* Literal.Number */
body .s { color: #bb8844 } /* Literal.String */
body .na { color: #008080 } /* Name.Attribute */
body .nb { color: #999999 } /* Name.Builtin */
body .nc { color: #445588; font-weight: bold } /* Name.Class */
body .no { color: #008080 } /* Name.Constant */
body .ni { color: #800080 } /* Name.Entity */
body .ne { color: #990000; font-weight: bold } /* Name.Exception */
body .nf { color: #990000; font-weight: bold } /* Name.Function */
body .nn { color: #555555 } /* Name.Namespace */
body .nt { color: #000080 } /* Name.Tag */
body .nv { color: #008080 } /* Name.Variable */
body .ow { font-weight: bold } /* Operator.Word */
body .w { color: #bbbbbb } /* Text.Whitespace */
body .mf { color: #009999 } /* Literal.Number.Float */
body .mh { color: #009999 } /* Literal.Number.Hex */
body .mi { color: #009999 } /* Literal.Number.Integer */
body .mo { color: #009999 } /* Literal.Number.Oct */
body .sb { color: #bb8844 } /* Literal.String.Backtick */
body .sc { color: #bb8844 } /* Literal.String.Char */
body .sd { color: #bb8844 } /* Literal.String.Doc */
body .s2 { color: #bb8844 } /* Literal.String.Double */
body .se { color: #bb8844 } /* Literal.String.Escape */
body .sh { color: #bb8844 } /* Literal.String.Heredoc */
body .si { color: #bb8844 } /* Literal.String.Interpol */
body .sx { color: #bb8844 } /* Literal.String.Other */
body .sr { color: #808000 } /* Literal.String.Regex */
body .s1 { color: #bb8844 } /* Literal.String.Single */
body .ss { color: #bb8844 } /* Literal.String.Symbol */
body .bp { color: #999999 } /* Name.Builtin.Pseudo */
body .vc { color: #008080 } /* Name.Variable.Class */
body .vg { color: #008080 } /* Name.Variable.Global */
body .vi { color: #008080 } /* Name.Variable.Instance */
body .il { color: #009999 } /* Literal.Number.Integer.Long */

Info

Revision:3316
Author:victor

Date:2008-06-18 14:55:33 +0300 (Wed, 18 Jun 2008)

Comment:implemented event processing by modules; fixed bug in user command processing by modules

Changes
U trunk/src/server/core/evproc.cpp
U trunk/src/server/core/netobj.cpp
U trunk/src/server/core/session.cpp

Diff
Modified: trunk/src/server/core/evproc.cpp
===================================================================
--- trunk/src/server/core/evproc.cpp 2008-06-18 11:11:48 UTC (rev 3315)
+++ trunk/src/server/core/evproc.cpp 2008-06-18 11:55:33 UTC (rev 3316)
@@ -103,6 +103,7 @@
 THREAD_RESULT THREAD_CALL EventProcessor(void *arg)
 {
    Event *pEvent;
+ DWORD i;
 
         m_threadStormDetector = ThreadCreateEx(EventStormDetector, 0, NULL);
    while(!ShutdownInProgress())
@@ -119,6 +120,13 @@
       // Attempt to correlate event to some of previous events
       CorrelateEvent(pEvent);
 
+ // Pass event to modules
+ for(i = 0; i < g_dwNumModules; i++)
+ {
+ if (g_pModuleList[i].pfEventHandler != NULL)
+ g_pModuleList[i].pfEventHandler(pEvent);
+ }
+
       // Write event to log if required
       if (pEvent->Flags() & EF_LOG)
       {

Modified: trunk/src/server/core/netobj.cpp
===================================================================
--- trunk/src/server/core/netobj.cpp 2008-06-18 11:11:48 UTC (rev 3315)
+++ trunk/src/server/core/netobj.cpp 2008-06-18 11:55:33 UTC (rev 3316)
@@ -280,7 +280,7 @@
                 {
                         TCHAR *escName, *escValue;
                 
- for(i = 0; i < m_customAttributes.Size(); i++)
+ for(i = 0; i < (int)m_customAttributes.Size(); i++)
                         {
                                 escName = EncodeSQLString(m_customAttributes.GetKeyByIndex(i));
                                 escValue = EncodeSQLString(m_customAttributes.GetValueByIndex(i));

Modified: trunk/src/server/core/session.cpp
===================================================================
--- trunk/src/server/core/session.cpp 2008-06-18 11:11:48 UTC (rev 3315)
+++ trunk/src/server/core/session.cpp 2008-06-18 11:55:33 UTC (rev 3316)
@@ -1183,8 +1183,11 @@
          default:
             // Pass message to loaded modules
             for(i = 0; i < g_dwNumModules; i++)
- if (g_pModuleList[i].pfCommandHandler(m_wCurrentCmd, pMsg, this))
- break; // Message was processed by the module
+ {
+ if (g_pModuleList[i].pfCommandHandler != NULL)
+ if (g_pModuleList[i].pfCommandHandler(m_wCurrentCmd, pMsg, this))
+ break; // Message was processed by the module
+ }
             if (i == g_dwNumModules)
             {
                CSCPMessage response;
Received on Wed Jun 18 2008 - 14:55:33 EEST