Everybody hates typos

[user/henk/code/inspircd.git] / src / modules.cpp

diff --git a/src/modules.cpp b/src/modules.cpp
index 6f2fc82ec444eae7abd10c862f191b5fac81e09d..bb6e9227294434560b035a45626e17c69c565074 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -44,9 +44,7 @@ using namespace std;
 #include <sstream>
 #include <vector>
 #include <deque>
-#include "connection.h"
 #include "users.h"
-#include "servers.h"
 #include "ctables.h"
 #include "globals.h"
 #include "modules.h"
@@ -59,6 +57,7 @@ using namespace std;
 #include "inspstring.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
+#include "socket.h"
 
 #ifdef USE_KQUEUE
 extern int kq;
@@ -74,6 +73,8 @@ extern std::vector<ircd_module*> factory;
 
 extern std::vector<std::string> include_stack;
 
+extern std::vector<InspSocket*> module_sockets;
+
 extern time_t TIME;
 
 extern int LogLevel;
@@ -104,14 +105,14 @@ extern std::vector<std::string> module_names;
 
 extern int boundPortCount;
 extern int portCount;
-extern int SERVERportCount;
+
 extern int ports[MAXSOCKS];
-extern int defaultRoute;
 
-extern std::vector<long> auth_cookies;
+
+
 extern std::stringstream config_f;
 
-extern serverrec* me[32];
+
 
 extern FILE *log_file;
 
@@ -305,7 +306,7 @@ std::string Event::GetEventID()
                Module::Module() { }
                Module::~Module() { }
 void           Module::OnUserConnect(userrec* user) { }
-void           Module::OnUserQuit(userrec* user) { }
+void           Module::OnUserQuit(userrec* user, std::string message) { }
 void           Module::OnUserDisconnect(userrec* user) { }
 void           Module::OnUserJoin(userrec* user, chanrec* channel) { }
 void           Module::OnUserPart(userrec* user, chanrec* channel) { }
@@ -315,8 +316,9 @@ void                Module::OnRehash() { }
 void           Module::OnServerRaw(std::string &raw, bool inbound, userrec* user) { }
 int            Module::OnUserPreJoin(userrec* user, chanrec* chan, const char* cname) { return 0; }
 int            Module::OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params) { return false; }
+void           Module::OnMode(userrec* user, void* dest, int target_type, std::string text) { };
 Version                Module::GetVersion() { return Version(1,0,0,0,VF_VENDOR); }
-void           Module::OnOper(userrec* user) { };
+void           Module::OnOper(userrec* user, std::string opertype) { };
 void           Module::OnInfo(userrec* user) { };
 void           Module::OnWhois(userrec* source, userrec* dest) { };
 int            Module::OnUserPreInvite(userrec* source,userrec* dest,chanrec* channel) { return 0; };
@@ -330,6 +332,7 @@ string_list Module::OnChannelSync(chanrec* chan) { string_list empty; return emp
 void           Module::On005Numeric(std::string &output) { };
 int            Module::OnKill(userrec* source, userrec* dest, std::string reason) { return 0; };
 void           Module::OnLoadModule(Module* mod,std::string name) { };
+void           Module::OnUnloadModule(Module* mod,std::string name) { };
 void           Module::OnBackgroundTimer(time_t curtime) { };
 void           Module::OnSendList(userrec* user, chanrec* channel, char mode) { };
 int            Module::OnPreCommand(std::string command, char **parameters, int pcnt, userrec *user) { return 0; };
@@ -346,7 +349,6 @@ void                Module::OnStats(char symbol) { };
 int            Module::OnChangeLocalUserHost(userrec* user, std::string newhost) { return 0; };
 int            Module::OnChangeLocalUserGECOS(userrec* user, std::string newhost) { return 0; };
 int            Module::OnLocalTopicChange(userrec* user, chanrec* chan, std::string topic) { return 0; };
-int            Module::OnMeshToken(char token,string_list params,serverrec* source,serverrec* reply, std::string tcp_host,std::string ipaddr,int port) { return 0; };
 void           Module::OnEvent(Event* event) { return; };
 char*          Module::OnRequest(Request* request) { return NULL; };
 int            Module::OnOperCompare(std::string password, std::string input) { return 0; };
@@ -358,6 +360,8 @@ void                Module::OnRawSocketAccept(int fd, std::string ip, int localport) { };
 int            Module::OnRawSocketWrite(int fd, char* buffer, int count) { return 0; };
 void           Module::OnRawSocketClose(int fd) { };
 int            Module::OnRawSocketRead(int fd, char* buffer, unsigned int count, int &readresult) { return 0; };
+void           Module::OnUserMessage(userrec* user, void* dest, int target_type, std::string text) { };
+void           Module::OnUserNotice(userrec* user, void* dest, int target_type, std::string text) { };
 
 // server is a wrapper class that provides methods to all of the C-style
 // exports in the core
@@ -371,6 +375,23 @@ Server::~Server()
 {
 }
 
+void Server::AddSocket(InspSocket* sock)
+{
+       module_sockets.push_back(sock);
+}
+
+void Server::DelSocket(InspSocket* sock)
+{
+       for (std::vector<InspSocket*>::iterator a = module_sockets.begin(); a < module_sockets.end(); a++)
+       {
+               if (*a == sock)
+               {
+                       module_sockets.erase(a);
+                       return;
+               }
+       }
+}
+
 void Server::SendOpers(std::string s)
 {
        WriteOpers("%s",s.c_str());
@@ -763,50 +784,6 @@ bool Server::IsValidMask(std::string mask)
        return true;
 }
 
-void Server::MeshSendAll(std::string text)
-{
-       NetSendToAll((char*)text.c_str());
-}
-
-void Server::MeshSendCommon(userrec* user, std::string text)
-{
-       if (user)
-               NetSendToCommon(user,(char*)text.c_str());
-}
-
-void Server::MeshSendAllAlive(std::string text)
-{
-       NetSendToAllAlive((char*)text.c_str());
-}
-
-void Server::MeshSendUnicast(std::string destination, std::string text)
-{
-       NetSendToOne((char*)destination.c_str(),(char*)text.c_str());
-}
-
-void Server::MeshSendAllExcept(std::string target, std::string text)
-{
-       NetSendToAllExcept(target.c_str(),(char*)text.c_str());
-}
-
-bool Server::MeshCheckChan(chanrec *c,std::string servername)
-{
-       if (c)
-       {
-               return ChanAnyOnThisServer(c,(char*)servername.c_str());
-       }
-       else return false;
-}
-
-bool Server::MeshCheckCommon(userrec* u,std::string servername)
-{
-       if (u)
-       {
-               return CommonOnThisServer(u,(char*)servername.c_str());
-       }
-       else return false;
-}
-
 Module* Server::FindModule(std::string name)
 {
        for (int i = 0; i <= MODCOUNT; i++)