Changeset 548

Timestamp:

05/04/06 11:44:39 (3 years ago)

Author:

oxff

Message:

nepenthes-experimental.log-irc: added dynamic log patterns, adjustable via irc, added !help command, added !pattern command, moved setting of connection command

Files:

• nepenthes/branches/nepenthes-experimental/modules/log-irc/IrcDialogue.cpp (modified) (5 diffs)
• nepenthes/branches/nepenthes-experimental/modules/log-irc/log-irc.conf.dist (modified) (1 diff)
• nepenthes/branches/nepenthes-experimental/modules/log-irc/log-irc.cpp (modified) (2 diffs)
• nepenthes/branches/nepenthes-experimental/modules/log-irc/log-irc.hpp (modified) (2 diffs)
• nepenthes/branches/nepenthes-experimental/nepenthes-core/include/LogManager.hpp (modified) (1 diff)

nepenthes/branches/nepenthes-experimental/modules/log-irc/IrcDialogue.cpp

@@ -31 +31 @@
-#include <ctype.h>
-#include <string>
+#include <string.h>
-#include <vector>
-
@@ -262 +263 @@
-                responseMessage += target;
-                
-string(message) == "!version"
+!strcmp(message, "!version")
-        {
-                responseMessage += " :nepenthes v" VERSION " compiled on [" __DATE__ " " __TIME__ "] with " MY_COMPILER " " __VERSION__ "\r\n";
-                m_Socket->doRespond((char *) responseMessage.data(), responseMessage.size());
-        }
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-void IrcDialogue::loggedOn()
-{
+        m_LogIrc->setDialogue(this);
+        
-        if(m_LoggedOn)
-                return;
-       
-try
-{
-       string connectCommand = m_LogIrc->getConnectCommand();
+
+string connectCommand = m_LogIrc->getConnectCommand();
+
+if(!connectCommand.empty())
-                m_Socket->doRespond((char *) connectCommand.data(), connectCommand.size());
-        }
-        catch(...)
-        { // no connect command was specified
-        }
-
-        string joinCommand = "JOIN " + m_LogIrc->getIrcChannel() + " " + m_LogIrc->getIrcChannelPass() + "\r\n";
@@ -334 +355 @@
-
-
-// TODO: format, translate
-
-struct FlagMapping
-{
- 
+
-        char    *m_ColorFlag;
-};
@@ -346 +365 @@
-        {
-                l_crit,
-helles rot
+light red
-        },
-        {
-                l_warn,
-     // lila
+ // purple
-        },
-        {
-                l_debug,
- 
+ 
-        },
-        {
-                l_info,
-helles gruen 
+light green
-        },
-    
+       
-                l_spam,
-unkel grau
-
+ark grey
+,
-};
-
-
-
-
+
-void IrcDialogue::logIrc(uint32_t mask, const char *message)
-{
-
-
-
-
+
-        {
-                if (strlen(message) > 450)
-                        return;
-
-
-
-
+
+
-                uint32_t i=0;
-
-i<sizeof(colors)/sizeof(struct FlagMapping);i++
-
- 
+ i < sizeof(colors) / sizeof(struct FlagMapping); ++i
+
+
-                        {
-                                line += colors[i].m_ColorFlag;
+                                break;
-                        }
-                }
@@ -394 +408 @@
-                line += message;
-
-line.c_str
+ line.data
-        }
-}       

nepenthes/branches/nepenthes-experimental/modules/log-irc/log-irc.conf.dist

@@ -33 +33 @@
-        // has to be one IRC command NOT terminated with \r\n
-        // connect-command = "PRIVMSG NickServ :IDENTIFY mypassword";
+        
+        // set the initial log tag pattern, like on cmdline; defaults sane
+        // pattern = "crit,warn,down";
-    };
-};

nepenthes/branches/nepenthes-experimental/modules/log-irc/log-irc.cpp

@@ -140 +140 @@
-                        m_IrcChannelPass= m_Config->getValString("log-irc.irc.channel.pass");
-
-
+
+
-                {
-                        logCrit("Error setting needed vars, check your config\n");
-                        return false;
-                }
+                
+                try
+                {
+                        setLogPattern(m_Config->getValString("log-irc.tag-pattern"));
+                }
+                catch (...)
+                {
+                        m_LogPatternNumeric = 0;
+                }
+                
+                try
+                {
+                        m_ConnectCommand = string(m_Config->getValString("log-irc.irc.connect-command")) + "\r\n";
+                }
+                catch (...)
+                {
+                }
+                
-                m_State = LIRC_NULL;
-                doStart();
@@ -287 +306 @@
-{
-        if (m_IrcDialogue != NULL)
-        {
-                m_IrcDialogue->logIrc(mask, message);
+}
+
+string LogIrc::getTorServer()
+{
+        return m_TorServer;
+}
+
+string LogIrc::getIrcServer()
+{
+        return m_IrcServer;
+}
+
+uint32_t LogIrc::getIrcIP()
+{
+        return m_IrcIP;
+}
+
+uint16_t LogIrc::getIrcPort()
+{
+        return m_IrcPort;
+}
+
+string LogIrc::getIrcPass()
+{
+        return m_IrcPass;
+}
+
+string LogIrc::getIrcNick()
+{
+        return m_IrcNick;
+}
+
+string LogIrc::getIrcIdent()
+{
+        return m_IrcIdent;
+}
+
+string LogIrc::getIrcUserInfo()
+{
+        return m_IrcUserInfo;
+}
+
+string LogIrc::getIrcChannel()
+{
+        return m_IrcChannel;
+}
+
+string LogIrc::getIrcChannelPass()
+{
+        return m_IrcChannelPass;
+}
+
+string LogIrc::getIrcUserModes()
+{
+        return m_IrcUserModes;
+}
+
+string LogIrc::getConnectCommand()
+{
+        return m_ConnectCommand;
+}
+
+
+bool LogIrc::logMaskMatches(uint32_t mask)
+{
+        if(!m_LogPatternNumeric)
+        {
+                // copied from common's original code
+                return ((mask & l_dl || mask & l_sub) && mask & l_mgr && !(mask & l_spam)) || (mask & l_warn || mask & l_crit);
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-void LogIrc::setDialogue(IrcDialogue *dia)

nepenthes/branches/nepenthes-experimental/modules/log-irc/log-irc.hpp

@@ -89 +89 @@
-                string getIrcServer();
-                
-                //! throws exception if no command was specified
-                string getConnectCommand();
-
-
-                void setDialogue(IrcDialogue *);
+                
+                bool logMaskMatches(uint32_t mask);
+                void setLogPattern(const char * patternString);
-
-                bool useTor();
-
-
-
+
+
-                log_irc_state m_State;
-
@@ -123 +124 @@
-                string m_IrcChannel;
-                string m_IrcChannelPass;
+                
+                uint32_t m_LogPatternNumeric;
+                
+                string m_ConnectCommand;
-
-                IrcDialogue *m_IrcDialogue;

nepenthes/branches/nepenthes-experimental/nepenthes-core/include/LogManager.hpp

@@ -60 +60 @@
-                const char                      *getTagName(uint32_t bit);
-                uint32_t                        getTagId(const char *tag);
-
+virtual 
-                void                            setColor(bool setting);
-                bool                            getColorSetting();