Remove uneccessary socket includes now included in socket.h

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

diff --git a/src/inspircd_io.cpp b/src/inspircd_io.cpp
index 9753e182ebb9ef511db8aeb01b433eed1ba2efce..723e5a48a4cce88a51d31e2099724cb312b8b184 100644 (file)
--- a/src/inspircd_io.cpp
+++ b/src/inspircd_io.cpp
@@ -52,8 +52,8 @@ ServerConfig::ServerConfig()
        *CustomVersion = *motd = *rules = *PrefixQuit = *DieValue = *DNSServer = '\0';
        *OperOnlyStats = *ModPath = *MyExecutable = *DisabledCommands = *PID = '\0';
        log_file = NULL;
-       OperSpyWhois = nofork = HideBans = HideSplits = false;
-       AllowHalfop = true;
+       forcedebug = OperSpyWhois = nofork = HideBans = HideSplits = false;
+       writelog = AllowHalfop = true;
        dns_timeout = DieDelay = 5;
        MaxTargets = 20;
        NetBufferSize = 10240;
@@ -1320,7 +1320,7 @@ bool ServerConfig::ConfValueBool(ConfigDataHash &target, const std::string &tag,
        
 int ServerConfig::ConfValueEnum(ConfigDataHash &target, const char* tag)
 {
-       return ConfValueEnum(target, std::string(tag));
+       return target.count(tag);
 }
 
 int ServerConfig::ConfValueEnum(ConfigDataHash &target, const std::string &tag)
@@ -1365,10 +1365,10 @@ int ServerConfig::ConfVarEnum(ConfigDataHash &target, const std::string &tag, in
  * a maximum of one second before it times out, using the DNS
  * server specified in the configuration file.
  */ 
-bool BindSocket(int sockfd, struct sockaddr_in client, struct sockaddr_in server, int port, char* addr)
+bool BindSocket(int sockfd, insp_sockaddr client, insp_sockaddr server, int port, char* addr)
 {
        memset(&server,0,sizeof(server));
-       struct in_addr addy;
+       insp_inaddr addy;
        bool resolved = false;
        char resolved_addr[128];
 
@@ -1463,7 +1463,7 @@ bool HasPort(int port, char* addr)
 int BindPorts(bool bail)
 {
        char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF];
-       sockaddr_in client,server;
+       insp_sockaddr client, server;
        int clientportcount = 0;
        int BoundPortCount = 0;