]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/socket.cpp
Move the socket functions like insp_ntoa into their own namespace. They arent really...
[user/henk/code/inspircd.git] / src / socket.cpp
index b7d102647343afa06364eaa4cadc455d0b05f3cc..0f84912de4eda24765b96110118e61b8b15caf05 100644 (file)
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
 #include <string>
-#include <unistd.h>
-#include <fcntl.h>
-#include <poll.h>
-#include <sstream>
-#include <iostream>
-#include <fstream>
-#include <stdexcept>
+#include "configreader.h"
 #include "socket.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
 #include "inspstring.h"
 #include "helperfuncs.h"
 #include "socketengine.h"
-
+#include "wildcard.h"
+#include "message.h"
 
 extern InspIRCd* ServerInstance;
-extern ServerConfig* Config;
 extern time_t TIME;
 
-InspSocket* socket_ref[MAX_DESCRIPTORS];
+using namespace std;
+using namespace irc::sockets;
 
-InspSocket::InspSocket()
+/* Used when comparing CIDR masks for the modulus bits left over.
+ * A lot of ircd's seem to do this:
+ * ((-1) << (8 - (mask % 8)))
+ * But imho, it sucks in comparison to a nice neat lookup table.
+ */
+const char inverted_bits[8] = {        0x00, /* 00000000 - 0 bits - never actually used */
+                               0x80, /* 10000000 - 1 bits */
+                               0xC0, /* 11000000 - 2 bits */
+                               0xE0, /* 11100000 - 3 bits */
+                               0xF0, /* 11110000 - 4 bits */
+                               0xF8, /* 11111000 - 5 bits */
+                               0xFC, /* 11111100 - 6 bits */
+                               0xFE  /* 11111110 - 7 bits */
+};
+
+/* Match raw bytes using CIDR bit matching, used by higher level MatchCIDR() */
+bool irc::sockets::MatchCIDRBits(unsigned char* address, unsigned char* mask, unsigned int mask_bits)
 {
-       this->state = I_DISCONNECTED;
-       this->fd = -1;
-       this->ClosePending = false;
+       unsigned int modulus = mask_bits % 8; /* Number of whole bytes in the mask */
+       unsigned int divisor = mask_bits / 8; /* Remaining bits in the mask after whole bytes are dealt with */
+
+       /* First compare the whole bytes, if they dont match, return false */
+       if (memcmp(address, mask, divisor))
+               return false;
+
+       /* Now if there are any remainder bits, we compare them with logic AND */
+       if (modulus)
+               if ((address[divisor] & inverted_bits[modulus]) != (mask[divisor] & inverted_bits[modulus]))
+                       /* If they dont match, return false */
+                       return false;
+
+       /* The address matches the mask, to mask_bits bits of mask */
+       return true;
 }
 
-InspSocket::InspSocket(int newfd, char* ip)
+/* Match CIDR, but dont attempt to match() against leading *!*@ sections */
+bool irc::sockets::MatchCIDR(const char* address, const char* cidr_mask)
 {
-       this->fd = newfd;
-       this->state = I_CONNECTED;
-       strlcpy(this->IP,ip,MAXBUF);
-       this->ClosePending = false;
-       ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE);
-       socket_ref[this->fd] = this;
+       return MatchCIDR(address, cidr_mask, false);
 }
 
-InspSocket::InspSocket(const std::string &ahost, int aport, bool listening, unsigned long maxtime) : fd(-1)
+/* Match CIDR strings, e.g. 127.0.0.1 to 127.0.0.0/8 or 3ffe:1:5:6::8 to 3ffe:1::0/32
+ * If you have a lot of hosts to match, youre probably better off building your mask once
+ * and then using the lower level MatchCIDRBits directly.
+ *
+ * This will also attempt to match any leading usernames or nicknames on the mask, using
+ * match(), when match_with_username is true.
+ */
+bool irc::sockets::MatchCIDR(const char* address, const char* cidr_mask, bool match_with_username)
 {
-       strlcpy(host,ahost.c_str(),MAXBUF);
-       this->ClosePending = false;
-       if (listening) {
-               if ((this->fd = OpenTCPSocket()) == ERROR)
+       unsigned char addr_raw[16];
+       unsigned char mask_raw[16];
+       unsigned int bits = 0;
+       char* mask = NULL;
+
+       /* The caller is trying to match ident@<mask>/bits.
+        * Chop off the ident@ portion, use match() on it
+        * seperately.
+        */
+       if (match_with_username)
+       {
+               /* Duplicate the strings, and try to find the position
+                * of the @ symbol in each */
+               char* address_dupe = strdup(address);
+               char* cidr_dupe = strdup(cidr_mask);
+       
+               /* Use strchr not strrchr, because its going to be nearer to the left */
+               char* username_mask_pos = strrchr(cidr_dupe, '@');
+               char* username_addr_pos = strrchr(address_dupe, '@');
+
+               /* Both strings have an @ symbol in them */
+               if (username_mask_pos && username_addr_pos)
                {
-                       this->fd = -1;
-                       this->state = I_ERROR;
-                       this->OnError(I_ERR_SOCKET);
-                       this->ClosePending = true;
-                       log(DEBUG,"OpenTCPSocket() error");
-                        return;
+                       /* Zero out the location of the @ symbol */
+                       *username_mask_pos = *username_addr_pos = 0;
+
+                       /* Try and match() the strings before the @
+                        * symbols, and recursively call MatchCIDR without
+                        * username matching enabled to match the host part.
+                        */
+                       bool result = (match(address_dupe, cidr_dupe) && MatchCIDR(username_addr_pos + 1, username_mask_pos + 1, false));
+
+                       /* Free the stuff we created */
+                       free(address_dupe);
+                       free(cidr_dupe);
+
+                       /* Return a result */
+                       return result;
                }
                else
                {
-                       if (!BindSocket(this->fd,this->client,this->server,aport,(char*)ahost.c_str()))
-                       {
-                               this->Close();
-                               this->fd = -1;
-                               this->state = I_ERROR;
-                               this->OnError(I_ERR_BIND);
-                               this->ClosePending = true;
-                               log(DEBUG,"BindSocket() error %s",strerror(errno));
-                               return;
-                       }
-                       else
-                       {
-                               this->state = I_LISTENING;
-                               ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE);
-                               socket_ref[this->fd] = this;
-                               log(DEBUG,"New socket now in I_LISTENING state");
-                               return;
-                       }
-               }                       
+                       /* One or both didnt have an @ in,
+                        * just match as CIDR
+                        */
+                       free(address_dupe);
+                       free(cidr_dupe);
+                       mask = strdup(cidr_mask);
+               }
+       }
+       else
+       {
+               /* Make a copy of the cidr mask string,
+                * we're going to change it
+                */
+               mask = strdup(cidr_mask);
+       }
+
+       in_addr  address_in4;
+       in_addr  mask_in4;
+
+
+       /* Use strrchr for this, its nearer to the right */
+       char* bits_chars = strrchr(mask,'/');
+
+       if (bits_chars)
+       {
+               bits = atoi(bits_chars + 1);
+               *bits_chars = 0;
        }
        else
        {
-               strlcpy(this->host,ahost.c_str(),MAXBUF);
-               this->port = aport;
+               /* No 'number of bits' field! */
+               return false;
+       }
+
+#ifdef SUPPORT_IP6LINKS
+       in6_addr address_in6;
+       in6_addr mask_in6;
 
-               if (!inet_aton(host,&addy))
+       if (inet_pton(AF_INET6, address, &address_in6) > 0)
+       {
+               if (inet_pton(AF_INET6, mask, &mask_in6) > 0)
                {
-                       log(DEBUG,"Attempting to resolve %s",this->host);
-                       /* Its not an ip, spawn the resolver */
-                       this->dns.SetNS(std::string(Config->DNSServer));
-                       this->dns.ForwardLookupWithFD(host,fd);
-                       timeout_end = time(NULL) + maxtime;
-                       timeout = false;
-                       this->state = I_RESOLVING;
-                       socket_ref[this->fd] = this;
+                       memcpy(&addr_raw, &address_in6.s6_addr, 16);
+                       memcpy(&mask_raw, &mask_in6.s6_addr, 16);
+
+                       if (bits > 128)
+                               bits = 128;
                }
                else
                {
-                       log(DEBUG,"No need to resolve %s",this->host);
-                       strlcpy(this->IP,host,MAXBUF);
-                       timeout_end = time(NULL) + maxtime;
-                       this->DoConnect();
+                       /* The address was valid ipv6, but the mask
+                        * that goes with it wasnt.
+                        */
+                       free(mask);
+                       return false;
                }
        }
-}
-
-void InspSocket::SetQueues(int nfd)
-{
-        // attempt to increase socket sendq and recvq as high as its possible
-       int sendbuf = 32768;
-       int recvbuf = 32768;
-       setsockopt(nfd,SOL_SOCKET,SO_SNDBUF,(const void *)&sendbuf,sizeof(sendbuf));
-       setsockopt(nfd,SOL_SOCKET,SO_RCVBUF,(const void *)&recvbuf,sizeof(sendbuf));
-}
-
-bool InspSocket::DoResolve()
-{
-       log(DEBUG,"In DoResolve(), trying to resolve IP");
-       if (this->dns.HasResult())
+       else
+#endif
+       if (inet_pton(AF_INET, address, &address_in4) > 0)
        {
-               log(DEBUG,"Socket has result");
-               std::string res_ip = dns.GetResultIP();
-               if (res_ip != "")
+               if (inet_pton(AF_INET, mask, &mask_in4) > 0)
                {
-                       log(DEBUG,"Socket result set to %s",res_ip.c_str());
-                       strlcpy(this->IP,res_ip.c_str(),MAXBUF);
-                       socket_ref[this->fd] = NULL;
+                       memcpy(&addr_raw, &address_in4.s_addr, 4);
+                       memcpy(&mask_raw, &mask_in4.s_addr, 4);
+
+                       if (bits > 32)
+                               bits = 32;
                }
                else
                {
-                       log(DEBUG,"Socket DNS failure");
-                       this->Close();
-                       this->state = I_ERROR;
-                       this->OnError(I_ERR_RESOLVE);
-                       this->fd = -1;
-                       this->ClosePending = true;
+                       /* The address was valid ipv4,
+                        * but the mask that went with it wasnt.
+                        */
+                       free(mask);
                        return false;
                }
-               return this->DoConnect();
        }
-       log(DEBUG,"No result for socket yet!");
-       return true;
-}
-
-bool InspSocket::DoConnect()
-{
-       log(DEBUG,"In DoConnect()");
-       if ((this->fd = socket(AF_INET, SOCK_STREAM, 0)) == -1)
+       else
        {
-               log(DEBUG,"Cant socket()");
-               this->state = I_ERROR;
-               this->OnError(I_ERR_SOCKET);
-               this->fd = -1;
+               /* The address was neither ipv4 or ipv6 */
+               free(mask);
                return false;
        }
 
-       log(DEBUG,"Part 2 DoConnect() %s",this->IP);
-       inet_aton(this->IP,&addy);
-       addr.sin_family = AF_INET;
-       addr.sin_addr = addy;
-       addr.sin_port = htons(this->port);
-
-       int flags;
-       flags = fcntl(this->fd, F_GETFL, 0);
-       fcntl(this->fd, F_SETFL, flags | O_NONBLOCK);
-
-       if (connect(this->fd, (sockaddr*)&this->addr,sizeof(this->addr)) == -1)
-       {
-               if (errno != EINPROGRESS)
-               {
-                       log(DEBUG,"Error connect() %d: %s",this->fd,strerror(errno));
-                       this->OnError(I_ERR_CONNECT);
-                       this->Close();
-                       this->state = I_ERROR;
-                       this->fd = -1;
-                       this->ClosePending = true;
-                       return false;
-               }
-       }
-       this->state = I_CONNECTING;
-       ServerInstance->SE->AddFd(this->fd,false,X_ESTAB_MODULE);
-       socket_ref[this->fd] = this;
-       this->SetQueues(this->fd);
-       log(DEBUG,"Returning true from InspSocket::DoConnect");
-       return true;
+       /* Low-level-match the bits in the raw data */
+       free(mask);
+       return MatchCIDRBits(addr_raw, mask_raw, bits);
 }
 
-
-void InspSocket::Close()
+inline void irc::sockets::Blocking(int s)
 {
-       if (this->fd != -1)
-       {
-               this->OnClose();
-               shutdown(this->fd,2);
-               close(this->fd);
-               socket_ref[this->fd] = NULL;
-               this->ClosePending = true;
-               this->fd = -1;
-       }
+       int flags = fcntl(s, F_GETFL, 0);
+       fcntl(s, F_SETFL, flags ^ O_NONBLOCK);
 }
 
-std::string InspSocket::GetIP()
+inline void irc::sockets::NonBlocking(int s)
 {
-       return this->IP;
+       int flags = fcntl(s, F_GETFL, 0);
+       fcntl(s, F_SETFL, flags | O_NONBLOCK);
 }
 
-char* InspSocket::Read()
+
+/** This will bind a socket to a port. It works for UDP/TCP.
+ * It can only bind to IP addresses, if you wish to bind to hostnames
+ * you should first resolve them using class 'Resolver'.
+ */ 
+bool irc::sockets::BindSocket(int sockfd, insp_sockaddr client, insp_sockaddr server, int port, char* addr)
 {
-       if ((fd < 0) || (fd > MAX_DESCRIPTORS))
-               return NULL;
-       int n = recv(this->fd,this->ibuf,sizeof(this->ibuf),0);
-       if ((n > 0) && (n <= (int)sizeof(this->ibuf)))
+       memset(&server,0,sizeof(server));
+       insp_inaddr addy;
+
+       if (*addr == '*')
+               *addr = 0;
+
+       if ((*addr) && (insp_aton(addr,&addy) < 1))
+       {
+               log(DEBUG,"Invalid IP '%s' given to BindSocket()", addr);
+               return false;;
+       }
+
+#ifdef IPV6
+       server.sin6_family = AF_FAMILY;
+#else
+       server.sin_family = AF_FAMILY;
+#endif
+       if (!*addr)
        {
-               ibuf[n] = 0;
-               return ibuf;
+#ifdef IPV6
+               memcpy(&addy, &server.sin6_addr, sizeof(in6_addr));
+#else
+               server.sin_addr.s_addr = htonl(INADDR_ANY);
+#endif
        }
        else
        {
-               if (errno == EAGAIN)
+#ifdef IPV6
+               memcpy(&addy, &server.sin6_addr, sizeof(in6_addr));
+#else
+               server.sin_addr = addy;
+#endif
+       }
+#ifdef IPV6
+       server.sin6_port = htons(port);
+#else
+       server.sin_port = htons(port);
+#endif
+       if (bind(sockfd,(struct sockaddr*)&server,sizeof(server)) < 0)
+       {
+               return false;
+       }
+       else
+       {
+               log(DEBUG,"Bound port %s:%d",*addr ? addr : "*",port);
+               if (listen(sockfd, ServerInstance->Config->MaxConn) == -1)
                {
-                       return "";
+                       log(DEFAULT,"ERROR in listen(): %s",strerror(errno));
+                       return false;
                }
                else
                {
-                       log(DEBUG,"EOF or error on socket: %s",strerror(errno));
-                       return NULL;
+                       NonBlocking(sockfd);
+                       return true;
                }
        }
 }
 
-void InspSocket::MarkAsClosed()
+
+// Open a TCP Socket
+int irc::sockets::OpenTCPSocket()
 {
-       log(DEBUG,"Marked as closed");
-       this->ClosePending = true;
+       int sockfd;
+       int on = 1;
+       struct linger linger = { 0 };
+  
+       if ((sockfd = socket (AF_FAMILY, SOCK_STREAM, 0)) < 0)
+       {
+               log(DEFAULT,"Error creating TCP socket: %s",strerror(errno));
+               return (ERROR);
+       }
+       else
+       {
+               setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
+               /* This is BSD compatible, setting l_onoff to 0 is *NOT* http://web.irc.org/mla/ircd-dev/msg02259.html */
+               linger.l_onoff = 1;
+               linger.l_linger = 1;
+               setsockopt(sockfd, SOL_SOCKET, SO_LINGER, &linger,sizeof(linger));
+               return (sockfd);
+       }
 }
 
-// There are two possible outcomes to this function.
-// It will either write all of the data, or an undefined amount.
-// If an undefined amount is written the connection has failed
-// and should be aborted.
-int InspSocket::Write(const std::string &data)
+/* XXX: Probably belongs in class InspIRCd */
+bool HasPort(int port, char* addr)
 {
-       if (this->ClosePending)
-               return false;
-
-       /*int result = write(this->fd,data.c_str(),data.length());
-       if (result < 1)
-               return false;
-       return true;*/
-
-       /* Try and append the data to the back of the queue, and send it on its way
-        */
-       outbuffer.push_back(data);
-       return (!this->FlushWriteBuffer());
+       ServerConfig* Config = ServerInstance->Config;
+       for (unsigned long count = 0; count < ServerInstance->stats->BoundPortCount; count++)
+       {
+               if ((port == Config->ports[count]) && (!strcasecmp(Config->addrs[count],addr)))
+               {
+                       return true;
+               }
+       }
+       return false;
 }
 
-bool InspSocket::FlushWriteBuffer()
+/* XXX: Probably belongs in class InspIRCd */
+int irc::sockets::BindPorts(bool bail)
 {
-       if (this->ClosePending)
-               return true;
+       char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF];
+       insp_sockaddr client, server;
+       int clientportcount = 0;
+       int BoundPortCount = 0;
+       ServerConfig* Config = ServerInstance->Config;
 
-       if ((this->fd > -1) && (this->state == I_CONNECTED))
+       if (!bail)
        {
-               if (outbuffer.size())
+               int InitialPortCount = ServerInstance->stats->BoundPortCount;
+               log(DEBUG,"Initial port count: %d",InitialPortCount);
+
+               for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "bind"); count++)
+               {
+                       Config->ConfValue(Config->config_data, "bind", "port", count, configToken, MAXBUF);
+                       Config->ConfValue(Config->config_data, "bind", "address", count, Addr, MAXBUF);
+                       Config->ConfValue(Config->config_data, "bind", "type", count, Type, MAXBUF);
+
+                       if (((!*Type) || (!strcmp(Type,"clients"))) && (!HasPort(atoi(configToken),Addr)))
+                       {
+                               // modules handle server bind types now
+                               Config->ports[clientportcount+InitialPortCount] = atoi(configToken);
+                               if (*Addr == '*')
+                                       *Addr = 0;
+
+                               strlcpy(Config->addrs[clientportcount+InitialPortCount],Addr,256);
+                               clientportcount++;
+                               log(DEBUG,"NEW binding %s:%s [%s] from config",Addr,configToken, Type);
+                       }
+               }
+               int PortCount = clientportcount;
+               if (PortCount)
                {
-                       int result = write(this->fd,outbuffer[0].c_str(),outbuffer[0].length());
-                       if (result > 0)
+                       for (int count = InitialPortCount; count < InitialPortCount + PortCount; count++)
                        {
-                               if ((unsigned int)result == outbuffer[0].length())
+                               if ((Config->openSockfd[count] = OpenTCPSocket()) == ERROR)
                                {
-                                       /* The whole block was written (usually a line)
-                                        * Pop the block off the front of the queue
-                                        */
-                                       outbuffer.pop_front();
+                                       log(DEBUG,"Bad fd %d binding port [%s:%d]",Config->openSockfd[count],Config->addrs[count],Config->ports[count]);
                                }
                                else
                                {
-                                       std::string temp = outbuffer[0].substr(result);
-                                       outbuffer[0] = temp;
+                                       if (!BindSocket(Config->openSockfd[count],client,server,Config->ports[count],Config->addrs[count]))
+                                       {
+                                               log(DEFAULT,"Failed to bind port [%s:%d]: %s",Config->addrs[count],Config->ports[count],strerror(errno));
+                                       }
+                                       else
+                                       {
+                                               /* Associate the new open port with a slot in the socket engine */
+                                               if (Config->openSockfd[count] > -1)
+                                               {
+                                                       if (!ServerInstance->SE->AddFd(Config->openSockfd[count],true,X_LISTEN))
+                                                       {
+                                                               log(DEFAULT,"ERK! Failed to add listening port to socket engine!");
+                                                               shutdown(Config->openSockfd[count],2);
+                                                               close(Config->openSockfd[count]);
+                                                       }
+                                                       else
+                                                               BoundPortCount++;
+                                               }
+                                       }
                                }
                        }
-                       else if ((result == -1) && (errno != EAGAIN))
-                       {
-                               log(DEBUG,"Write error on socket: %s",strerror(errno));
-                               this->OnError(I_ERR_WRITE);
-                               this->state = I_ERROR;
-                               return true;
-                       }
+                       return InitialPortCount + BoundPortCount;
                }
-       }
-       return (fd > -1);
-}
-
-bool InspSocket::Timeout(time_t current)
-{
-       if (!socket_ref[this->fd] || !ServerInstance->SE->HasFd(this->fd))
-       {
-               log(DEBUG,"No FD or socket ref");
-               return false;
+               else
+               {
+                       log(DEBUG,"There is nothing new to bind!");
+               }
+               return InitialPortCount;
        }
 
-       if (this->ClosePending)
+       for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "bind"); count++)
        {
-               log(DEBUG,"Close is pending");
-               return true;
-       }
+               Config->ConfValue(Config->config_data, "bind", "port", count, configToken, MAXBUF);
+               Config->ConfValue(Config->config_data, "bind", "address", count, Addr, MAXBUF);
+               Config->ConfValue(Config->config_data, "bind", "type", count, Type, MAXBUF);
 
-       if (((this->state == I_RESOLVING) || (this->state == I_CONNECTING)) && (current > timeout_end))
-       {
-               log(DEBUG,"Timed out, current=%lu timeout_end=%lu");
-               // for non-listening sockets, the timeout can occur
-               // which causes termination of the connection after
-               // the given number of seconds without a successful
-               // connection.
-               this->OnTimeout();
-               this->OnError(I_ERR_TIMEOUT);
-               timeout = true;
-               this->state = I_ERROR;
-               return true;
+               if ((!*Type) || (!strcmp(Type,"clients")))
+               {
+                       // modules handle server bind types now
+                       Config->ports[clientportcount] = atoi(configToken);
+
+                       // If the client put bind "*", this is an unrealism.
+                       // We don't actually support this as documented, but
+                       // i got fed up of people trying it, so now it converts
+                       // it to an empty string meaning the same 'bind to all'.
+                       if (*Addr == '*')
+                               *Addr = 0;
+
+                       strlcpy(Config->addrs[clientportcount],Addr,256);
+                       clientportcount++;
+                       log(DEBUG,"Binding %s:%s [%s] from config",Addr,configToken, Type);
+               }
        }
-       return this->FlushWriteBuffer();
-}
-
-bool InspSocket::Poll()
-{
-       if (!socket_ref[this->fd] || !ServerInstance->SE->HasFd(this->fd))
-               return false;
 
-       int incoming = -1;
-       bool n = true;
+       int PortCount = clientportcount;
 
-       if ((fd < 0) || (fd > MAX_DESCRIPTORS) || (this->ClosePending))
-               return false;
-
-       switch (this->state)
+       for (int count = 0; count < PortCount; count++)
        {
-               case I_RESOLVING:
-                       log(DEBUG,"State = I_RESOLVING, calling DoResolve()");
-                       return this->DoResolve();
-               break;
-               case I_CONNECTING:
-                       log(DEBUG,"State = I_CONNECTING");
-                       this->SetState(I_CONNECTED);
-                       /* Our socket was in write-state, so delete it and re-add it
-                        * in read-state.
-                        */
-                       ServerInstance->SE->DelFd(this->fd);
-                       ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE);
-                       return this->OnConnected();
-               break;
-               case I_LISTENING:
-                       length = sizeof (client);
-                       incoming = accept (this->fd, (sockaddr*)&client,&length);
-                       this->SetQueues(incoming);
-                       this->OnIncomingConnection(incoming,inet_ntoa(client.sin_addr));
-                       return true;
-               break;
-               case I_CONNECTED:
-                       n = this->OnDataReady();
-                       /* Flush any pending, but not till after theyre done with the event
-                        * so there are less write calls involved.
-                        * Both FlushWriteBuffer AND the return result of OnDataReady must
-                        * return true for this to be ok.
-                        */
-                       if (!this->FlushWriteBuffer())
-                               return false;
-                       return n;
-               break;
-               default:
-               break;
+               if ((Config->openSockfd[BoundPortCount] = OpenTCPSocket()) == ERROR)
+               {
+                       log(DEBUG,"Bad fd %d binding port [%s:%d]",Config->openSockfd[BoundPortCount],Config->addrs[count],Config->ports[count]);
+               }
+               else
+               {
+                       if (!BindSocket(Config->openSockfd[BoundPortCount],client,server,Config->ports[count],Config->addrs[count]))
+                       {
+                               log(DEFAULT,"Failed to bind port [%s:%d]: %s",Config->addrs[count],Config->ports[count],strerror(errno));
+                       }
+                       else
+                       {
+                               /* well we at least bound to one socket so we'll continue */
+                               BoundPortCount++;
+                       }
+               }
        }
-       return true;
+       return BoundPortCount;
 }
 
-void InspSocket::SetState(InspSocketState s)
+const char* irc::sockets::insp_ntoa(insp_inaddr n)
 {
-       log(DEBUG,"Socket state change");
-       this->state = s;
+       static char buf[1024];
+       inet_ntop(AF_FAMILY, &n, buf, sizeof(buf));
+       return buf;
 }
 
-InspSocketState InspSocket::GetState()
+int irc::sockets::insp_aton(const char* a, insp_inaddr* n)
 {
-       return this->state;
+       return inet_pton(AF_FAMILY, a, n);
 }
 
-int InspSocket::GetFd()
-{
-       return this->fd;
-}
-
-bool InspSocket::OnConnected() { return true; }
-void InspSocket::OnError(InspSocketError e) { return; }
-int InspSocket::OnDisconnect() { return 0; }
-int InspSocket::OnIncomingConnection(int newfd, char* ip) { return 0; }
-bool InspSocket::OnDataReady() { return true; }
-void InspSocket::OnTimeout() { return; }
-void InspSocket::OnClose() { return; }
-
-InspSocket::~InspSocket()
-{
-       this->Close();
-}