Changeset 547

Timestamp:

05/04/06 10:34:25 (3 years ago)

Author:

oxff

Message:

nepenthes-experimental: added ability to send command upon logon (e.g. NickServ? auth), limited to one JOIN per connect

Files:

• nepenthes/branches/nepenthes-experimental/modules/log-irc/IrcDialogue.cpp (modified) (2 diffs)
• nepenthes/branches/nepenthes-experimental/modules/log-irc/IrcDialogue.hpp (modified) (1 diff)
• 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) (1 diff)
• nepenthes/branches/nepenthes-experimental/modules/log-irc/log-irc.hpp (modified) (1 diff)

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

@@ -71 +71 @@
-        m_ConsumeLevel = CL_ASSIGN;
-        m_LogIrc = logirc;
+        m_LoggedOn = false;
-
-        m_State = IRCDIA_REQUEST_SEND;
@@ -274 +275 @@
-void IrcDialogue::loggedOn()
-{
+        if(m_LoggedOn)
+                return;
+                
+        try
+        {
+                string connectCommand = m_LogIrc->getConnectCommand();
+                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";
-        m_Socket->doRespond((char *) joinCommand.data(), joinCommand.size());
+        
+        m_LoggedOn = true;
-}
-

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

@@ -87 +87 @@
-                void processMessage(const char * origin, const char * target, const char * message);
-                
-
+, m_LoggedOn
-                
-                LogIrc  *m_LogIrc;

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

@@ -30 +30 @@
-            pass    "foo";
-        };
+        
+        // has to be one IRC command NOT terminated with \r\n
+        // connect-command = "PRIVMSG NickServ :IDENTIFY mypassword";
-    };
-};

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

@@ -347 +347 @@
-}
-
+string LogIrc::getConnectCommand()
+{
+        string connectCommand = m_Config->getValString("log-irc.irc.connect-command");
+        
+        if(connectCommand.empty())
+                throw (void *) 0;
+        
+        return connectCommand + "\r\n";
+}
+
+
-void LogIrc::setDialogue(IrcDialogue *dia)
-{

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

@@ -88 +88 @@
-                string getTorServer();
-                string getIrcServer();
+                
+                //! throws exception if no command was specified
+                string getConnectCommand();
-
-