X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmessage.cpp;h=de6e012ac15fca3bbace1d2229af91aeff4b29cd;hb=0dbb612a36296bff93db35abec4e87dc9bba1795;hp=ce51f8c87c5be28c0d064f988c573260c1d84bc3;hpb=b70de5aa7840e8b43c9c5bdbeb0146ec1d5ea1a0;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/message.cpp b/src/message.cpp index ce51f8c87..de6e012ac 100644 --- a/src/message.cpp +++ b/src/message.cpp @@ -19,7 +19,6 @@ using namespace std; #include "inspircd_config.h" #include "inspircd.h" #include "inspircd_io.h" -#include "inspircd_util.h" #include #include #include @@ -50,13 +49,8 @@ using namespace std; extern int MODCOUNT; extern std::vector modules; extern std::vector factory; - -extern char ServerName[MAXBUF]; - extern time_t TIME; - -extern FILE *log_file; -extern char DNSServer[MAXBUF]; +extern ServerConfig* Config; /* return 0 or 1 depending if users u and u2 share one or more common channels * (used by QUIT, NICK etc which arent channel specific notices) */ @@ -183,9 +177,9 @@ void NonBlocking(int s) int CleanAndResolve (char *resolvedHost, const char *unresolvedHost) { - DNS d(DNSServer); + DNS d(Config->DNSServer); int fd = d.ReverseLookup(unresolvedHost); - if (fd < 1) + if (fd < 0) return 0; time_t T = time(NULL)+1; while ((!d.HasResult()) && (time(NULL)