diff options
| -rw-r--r-- | include/inspircd.h | 9 | ||||
| -rw-r--r-- | src/inspircd.cpp | 10 |
2 files changed, 9 insertions, 10 deletions
diff --git a/include/inspircd.h b/include/inspircd.h index fb6b8c316..e9d3b10ed 100644 --- a/include/inspircd.h +++ b/include/inspircd.h @@ -96,12 +96,16 @@ class InspIRCd { private: + char MODERR[MAXBUF]; void erase_factory(int j); - void erase_module(int j); + void erase_module(int j); public: time_t startup_time; + std::string GetRevision(); + std::string GetVersionString(); + char* ModuleError(); bool LoadModule(const char* filename); bool UnloadModule(const char* filename); InspIRCd(int argc, char** argv); @@ -115,12 +119,10 @@ void kill_link(userrec *user,const char* r); void kill_link_silent(userrec *user,const char* r); void call_handler(const char* commandname,char **parameters, int pcnt, userrec *user); bool is_valid_cmd(const char* commandname, int pcnt, userrec * user); -std::string GetRevision(); int loop_call(handlerfunc fn, char **parameters, int pcnt, userrec *u, int start, int end, int joins); void AddWhoWas(userrec* u); void ConnectUser(userrec *user); userrec* ReHashNick(char* Old, char* New); -char* ModuleError(); /* optimization tricks to save us walking the user hash */ void AddOper(userrec* user); void DeleteOper(userrec* user); @@ -128,7 +130,6 @@ void handle_version(char **parameters, int pcnt, userrec *user); /* userrec optimization stuff */ void AddServerName(std::string servername); const char* FindServerNamePtr(std::string servername); -std::string GetVersionString(); void* dns_task(void* arg); void process_buffer(const char* cmdbuf,userrec *user); void FullConnectUser(userrec* user); diff --git a/src/inspircd.cpp b/src/inspircd.cpp index ccb4ff3e2..0a1eb14e6 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -142,7 +142,7 @@ void DeleteOper(userrec* user) } } -std::string GetRevision() +std::string InspIRCd::GetRevision() { /* w00t got me to replace a bunch of strtok_r * with something nicer, so i did this. Its the @@ -855,7 +855,7 @@ void ConnectUser(userrec *user) } } -std::string GetVersionString() +std::string InspIRCd::GetVersionString() { char versiondata[MAXBUF]; #ifdef THREADED_DNS @@ -869,7 +869,7 @@ std::string GetVersionString() void handle_version(char **parameters, int pcnt, userrec *user) { - WriteServ(user->fd,"351 %s :%s",user->nick,GetVersionString().c_str()); + WriteServ(user->fd,"351 %s :%s",user->nick,ServerInstance->GetVersionString().c_str()); } @@ -1359,9 +1359,7 @@ void process_buffer(const char* cmdbuf,userrec *user) } } -char MODERR[MAXBUF]; - -char* ModuleError() +char* InspIRCd::ModuleError() { return MODERR; } |