* ---------------------------------------------------
*/
-using namespace std;
-
#include "inspircd_config.h"
#include "inspircd.h"
-#include "inspircd_io.h"
+#include "configreader.h"
#include <unistd.h>
#include <sys/errno.h>
#include <sys/ioctl.h>
#include <sys/utsname.h>
-#include <cstdio>
-#include <time.h>
#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
#include "users.h"
#include "globals.h"
#include "inspstring.h"
#include "dnsqueue.h"
-#include <time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <string.h>
#include "dns.h"
#include "helperfuncs.h"
#include "hashcomp.h"
#include "socketengine.h"
+#include "socket.h"
extern ServerConfig* Config;
extern InspIRCd* ServerInstance;
{
if ((std::string((char*)inet_ntoa(usr->ip4)) == ip) && (hostname.length() < 65))
{
- strlcpy(usr->host,hostname.c_str(),MAXBUF);
- strlcpy(usr->dhost,hostname.c_str(),MAXBUF);
+ strlcpy(usr->host,hostname.c_str(),64);
+ strlcpy(usr->dhost,hostname.c_str(),64);
/*address_cache::iterator address = addrcache.find(usr->ip4);
if (address == addrcache.end())
{
* from the socket engine, as dns.cpp tracks it
* for us if we are in single-threaded country.
*/
- delete x;
+ DELETE(x);
}
}
else
/* its fd is dodgy, the dns code probably
* bashed it due to error. Free the class.
*/
- delete x;
+ DELETE(x);
}
/* If we got down here, the dns lookup was valid, BUT,
* its still in progress. Be patient, and wait for
if (ServerInstance && ServerInstance->SE)
ServerInstance->SE->DelFd(fdcheck);
}
-