X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=09885eca16d3fd209f1e68f0eaebbbccb8701c1b;hb=3593e33ce374caee9aec0575b49ec9b0001a8ec6;hp=20a447ba74e6208d4902287c4bd793f0ea2a605f;hpb=2d04042f178d17e377cf5c286d927f3efc731f3f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socket.cpp b/src/socket.cpp index 20a447ba7..09885eca1 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -2,418 +2,549 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ -using namespace std; - -#include "inspircd_config.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "socket.h" +/* $Core: libIRCDsocket */ + #include "inspircd.h" -#include "inspircd_io.h" -#include "inspstring.h" -#include "helperfuncs.h" +#include "socket.h" #include "socketengine.h" +#include "wildcard.h" +using namespace irc::sockets; -extern InspIRCd* ServerInstance; -extern ServerConfig* Config; -extern time_t TIME; - -InspSocket* socket_ref[MAX_DESCRIPTORS]; - -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 unsigned 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 */ +}; + + +ListenSocket::ListenSocket(InspIRCd* Instance, int port, char* addr) : ServerInstance(Instance), desc("plaintext"), bind_addr(addr), bind_port(port) { - this->state = I_DISCONNECTED; - this->fd = -1; - this->ClosePending = false; + this->SetFd(OpenTCPSocket(addr)); + if (this->GetFd() > -1) + { + if (!Instance->BindSocket(this->fd,port,addr)) + this->fd = -1; +#ifdef IPV6 + if ((!*addr) || (strchr(addr,':'))) + this->family = AF_INET6; + else +#endif + this->family = AF_INET; + Instance->SE->AddFd(this); + } } -InspSocket::InspSocket(int newfd, char* ip) +ListenSocket::~ListenSocket() { - 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; + if (this->GetFd() > -1) + { + ServerInstance->SE->DelFd(this); + ServerInstance->Log(DEBUG,"Shut down listener on fd %d", this->fd); + if (ServerInstance->SE->Shutdown(this, 2) || ServerInstance->SE->Close(this)) + ServerInstance->Log(DEBUG,"Failed to cancel listener: %s", strerror(errno)); + this->fd = -1; + } } -InspSocket::InspSocket(const std::string &ahost, int aport, bool listening, unsigned long maxtime) : fd(-1) +void ListenSocket::HandleEvent(EventType, int) { - strlcpy(host,ahost.c_str(),MAXBUF); - this->ClosePending = false; - if (listening) { - if ((this->fd = OpenTCPSocket()) == ERROR) + sockaddr* sock_us = new sockaddr[2]; // our port number + sockaddr* client = new sockaddr[2]; + socklen_t uslen, length; // length of our port number + int incomingSockfd, in_port; + +#ifdef IPV6 + if (this->family == AF_INET6) + { + uslen = sizeof(sockaddr_in6); + length = sizeof(sockaddr_in6); + } + else +#endif + { + uslen = sizeof(sockaddr_in); + length = sizeof(sockaddr_in); + } + + incomingSockfd = ServerInstance->SE->Accept(this, (sockaddr*)client, &length); + + if ((incomingSockfd > -1) && (!ServerInstance->SE->GetSockName(this, sock_us, &uslen))) + { + char buf[MAXBUF]; +#ifdef IPV6 + if (this->family == AF_INET6) { - this->fd = -1; - this->state = I_ERROR; - this->OnError(I_ERR_SOCKET); - log(DEBUG,"OpenTCPSocket() error"); - return; + inet_ntop(AF_INET6, &((const sockaddr_in6*)client)->sin6_addr, buf, sizeof(buf)); + in_port = ntohs(((sockaddr_in6*)sock_us)->sin6_port); } else +#endif + { + inet_ntop(AF_INET, &((const sockaddr_in*)client)->sin_addr, buf, sizeof(buf)); + in_port = ntohs(((sockaddr_in*)sock_us)->sin_port); + } + + ServerInstance->SE->NonBlocking(incomingSockfd); + + if (ServerInstance->Config->GetIOHook(in_port)) { - if (!BindSocket(this->fd,this->client,this->server,aport,(char*)ahost.c_str())) + try { - this->Close(); - this->fd = -1; - this->state = I_ERROR; - this->OnError(I_ERR_BIND); - log(DEBUG,"BindSocket() error %s",strerror(errno)); - return; + ServerInstance->Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, buf, in_port); } - else + catch (CoreException& modexcept) { - 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; + ServerInstance->Log(DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); } - } + } + ServerInstance->stats->statsAccept++; + User::AddClient(ServerInstance, incomingSockfd, in_port, false, this->family, client); } else { - strlcpy(this->host,ahost.c_str(),MAXBUF); - this->port = aport; - - if (!inet_aton(host,&addy)) - { - 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; - } - else - { - log(DEBUG,"No need to resolve %s",this->host); - strlcpy(this->IP,host,MAXBUF); - timeout_end = time(NULL) + maxtime; - this->DoConnect(); - } + ServerInstance->SE->Shutdown(incomingSockfd, 2); + ServerInstance->SE->Close(incomingSockfd); + ServerInstance->stats->statsRefused++; } + delete[] client; + delete[] sock_us; } -void InspSocket::SetQueues(int nfd) +/* 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) { - // 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)); + unsigned int divisor = mask_bits / 8; /* Number of whole bytes in the mask */ + unsigned int modulus = mask_bits % 8; /* Remaining bits in the mask after whole bytes are dealt with */ + + /* First (this is faster) compare the odd bits with logic ops */ + if (modulus) + if ((address[divisor] & inverted_bits[modulus]) != (mask[divisor] & inverted_bits[modulus])) + /* If they dont match, return false */ + return false; + + /* Secondly (this is slower) compare the whole bytes */ + if (memcmp(address, mask, divisor)) + return false; + + /* The address matches the mask, to mask_bits bits of mask */ + return true; } -bool InspSocket::DoResolve() +/* Match CIDR, but dont attempt to match() against leading *!*@ sections */ +bool irc::sockets::MatchCIDR(const char* address, const char* cidr_mask) { - log(DEBUG,"In DoResolve(), trying to resolve IP"); - if (this->dns.HasResult()) + return MatchCIDR(address, cidr_mask, false); +} + +/* 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) +{ + unsigned char addr_raw[16]; + unsigned char mask_raw[16]; + unsigned int bits = 0; + char* mask = NULL; + + /* The caller is trying to match ident@/bits. + * Chop off the ident@ portion, use match() on it + * seperately. + */ + if (match_with_username) { - log(DEBUG,"Socket has result"); - std::string res_ip = dns.GetResultIP(); - if (res_ip != "") + /* 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) { - log(DEBUG,"Socket result set to %s",res_ip.c_str()); - strlcpy(this->IP,res_ip.c_str(),MAXBUF); - socket_ref[this->fd] = NULL; + /* 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 { - log(DEBUG,"Socket DNS failure"); - this->Close(); - this->state = I_ERROR; - this->OnError(I_ERR_RESOLVE); - this->fd = -1; - return false; + /* One or both didnt have an @ in, + * just match as CIDR + */ + free(address_dupe); + free(cidr_dupe); + mask = strdup(cidr_mask); } - 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; - return false; + /* Make a copy of the cidr mask string, + * we're going to change it + */ + mask = strdup(cidr_mask); } - 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); + in_addr address_in4; + in_addr mask_in4; - 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) + /* Use strrchr for this, its nearer to the right */ + char* bits_chars = strrchr(mask,'/'); + + if (bits_chars) { - if (errno != EINPROGRESS) - { - log(DEBUG,"Error connect() %d: %s",this->fd,strerror(errno)); - this->OnError(I_ERR_CONNECT); - this->state = I_ERROR; - this->Close(); - this->fd = -1; - return false; - } + bits = atoi(bits_chars + 1); + *bits_chars = 0; } - 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; -} - - -void InspSocket::Close() -{ - if (this->fd != -1) + else { - this->OnClose(); - shutdown(this->fd,2); - close(this->fd); - socket_ref[this->fd] = NULL; - this->fd = -1; + /* No 'number of bits' field! */ + free(mask); + return false; } -} -std::string InspSocket::GetIP() -{ - return this->IP; -} +#ifdef SUPPORT_IP6LINKS + in6_addr address_in6; + in6_addr mask_in6; -char* InspSocket::Read() -{ - 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))) + if (inet_pton(AF_INET6, address, &address_in6) > 0) { - ibuf[n] = 0; - return ibuf; + if (inet_pton(AF_INET6, mask, &mask_in6) > 0) + { + memcpy(&addr_raw, &address_in6.s6_addr, 16); + memcpy(&mask_raw, &mask_in6.s6_addr, 16); + + if (bits > 128) + bits = 128; + } + else + { + /* The address was valid ipv6, but the mask + * that goes with it wasnt. + */ + free(mask); + return false; + } } else +#endif + if (inet_pton(AF_INET, address, &address_in4) > 0) { - if (errno == EAGAIN) + if (inet_pton(AF_INET, mask, &mask_in4) > 0) { - return ""; + memcpy(&addr_raw, &address_in4.s_addr, 4); + memcpy(&mask_raw, &mask_in4.s_addr, 4); + + if (bits > 32) + bits = 32; } else { - log(DEBUG,"EOF or error on socket: %s",strerror(errno)); - return NULL; + /* The address was valid ipv4, + * but the mask that went with it wasnt. + */ + free(mask); + return false; } } -} + else + { + /* The address was neither ipv4 or ipv6 */ + free(mask); + return false; + } -void InspSocket::MarkAsClosed() -{ - log(DEBUG,"Marked as closed"); - this->ClosePending = true; + /* Low-level-match the bits in the raw data */ + free(mask); + return MatchCIDRBits(addr_raw, mask_raw, bits); } -// 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) +/** 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 InspIRCd::BindSocket(int sockfd, int port, char* addr, bool dolisten) { - if (this->ClosePending) - return false; + /* We allocate 2 of these, because sockaddr_in6 is larger than sockaddr (ugh, hax) */ + sockaddr* server = new sockaddr[2]; + memset(server,0,sizeof(sockaddr)*2); - /*int result = write(this->fd,data.c_str(),data.length()); - if (result < 1) - return false; - return true;*/ + int ret, size; - /* Try and append the data to the back of the queue, and send it on its way - */ - outbuffer.push_back(data); - return (!this->FlushWriteBuffer()); -} + if (*addr == '*') + *addr = 0; -bool InspSocket::FlushWriteBuffer() -{ - if (this->ClosePending) - return true; +#ifdef IPV6 + if (*addr) + { + /* There is an address here. Is it ipv6? */ + if (strchr(addr,':')) + { + /* Yes it is */ + in6_addr addy; + if (inet_pton(AF_INET6, addr, &addy) < 1) + { + delete[] server; + return false; + } - if ((this->fd > -1) && (this->state == I_CONNECTED)) + ((sockaddr_in6*)server)->sin6_family = AF_INET6; + memcpy(&(((sockaddr_in6*)server)->sin6_addr), &addy, sizeof(in6_addr)); + ((sockaddr_in6*)server)->sin6_port = htons(port); + size = sizeof(sockaddr_in6); + } + else + { + /* No, its not */ + in_addr addy; + if (inet_pton(AF_INET, addr, &addy) < 1) + { + delete[] server; + return false; + } + + ((sockaddr_in*)server)->sin_family = AF_INET; + ((sockaddr_in*)server)->sin_addr = addy; + ((sockaddr_in*)server)->sin_port = htons(port); + size = sizeof(sockaddr_in); + } + } + else + { + if (port == -1) + { + /* Port -1: Means UDP IPV4 port binding - Special case + * used by DNS engine. + */ + ((sockaddr_in*)server)->sin_family = AF_INET; + ((sockaddr_in*)server)->sin_addr.s_addr = htonl(INADDR_ANY); + ((sockaddr_in*)server)->sin_port = 0; + size = sizeof(sockaddr_in); + } + else + { + /* Theres no address here, default to ipv6 bind to all */ + ((sockaddr_in6*)server)->sin6_family = AF_INET6; + memset(&(((sockaddr_in6*)server)->sin6_addr), 0, sizeof(in6_addr)); + ((sockaddr_in6*)server)->sin6_port = htons(port); + size = sizeof(sockaddr_in6); + } + } +#else + /* If we aren't built with ipv6, the choice becomes simple */ + ((sockaddr_in*)server)->sin_family = AF_INET; + if (*addr) + { + /* There is an address here. */ + in_addr addy; + if (inet_pton(AF_INET, addr, &addy) < 1) + { + delete[] server; + return false; + } + ((sockaddr_in*)server)->sin_addr = addy; + } + else + { + /* Bind ipv4 to all */ + ((sockaddr_in*)server)->sin_addr.s_addr = htonl(INADDR_ANY); + } + /* Bind ipv4 port number */ + ((sockaddr_in*)server)->sin_port = htons(port); + size = sizeof(sockaddr_in); +#endif + ret = SE->Bind(sockfd, server, size); + delete[] server; + + if (ret < 0) + { + return false; + } + else { - if (outbuffer.size()) + if (dolisten) { - log(DEBUG,"Writing %d to socket",outbuffer.size()); - int result = write(this->fd,outbuffer[0].c_str(),outbuffer[0].length()); - if (result > 0) + if (SE->Listen(sockfd, Config->MaxConn) == -1) { - log(DEBUG,"Wrote %d to socket",result); - if ((unsigned int)result == outbuffer[0].length()) - { - /* The whole block was written (usually a line) - * Pop the block off the front of the queue - */ - log(DEBUG,"Popping front item, now %d items left",outbuffer.size()); - outbuffer.pop_front(); - } - else - { - log(DEBUG,"Cutting front item"); - std::string temp = outbuffer[0].substr(result); - outbuffer[0] = temp; - log(DEBUG,"Front item is now: ",outbuffer[0].c_str()); - } + this->Log(DEFAULT,"ERROR in listen(): %s",strerror(errno)); + return false; } - else if ((result == -1) && (errno != EAGAIN)) + else { - log(DEBUG,"Write error on socket: %s",strerror(errno)); - this->OnError(I_ERR_WRITE); - this->state = I_ERROR; + this->Log(DEBUG,"New socket binding for %d with listen: %s:%d", sockfd, addr, port); + SE->NonBlocking(sockfd); return true; } } + else + { + this->Log(DEBUG,"New socket binding for %d without listen: %s:%d", sockfd, addr, port); + return true; + } } - return false; } -bool InspSocket::Timeout(time_t current) +// Open a TCP Socket +int irc::sockets::OpenTCPSocket(char* addr, int socktype) { - if (!socket_ref[this->fd] || !ServerInstance->SE->HasFd(this->fd)) - { - log(DEBUG,"No FD or socket ref"); - return false; - } - - if (this->ClosePending) + int sockfd; + int on = 1; + addr = addr; + struct linger linger = { 0, 0 }; +#ifdef IPV6 + if (strchr(addr,':') || (!*addr)) + sockfd = socket (PF_INET6, socktype, 0); + else + sockfd = socket (PF_INET, socktype, 0); + if (sockfd < 0) +#else + if ((sockfd = socket (PF_INET, socktype, 0)) < 0) +#endif { - log(DEBUG,"Close is pending"); - return true; + return ERROR; } - - if (((this->state == I_RESOLVING) || (this->state == I_CONNECTING)) && (current > timeout_end)) + else { - 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; + setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (char*)&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, (char*)&linger,sizeof(linger)); + return (sockfd); } - return this->FlushWriteBuffer(); } -bool InspSocket::Poll() +int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports) { - if (!socket_ref[this->fd] || !ServerInstance->SE->HasFd(this->fd)) - return false; + char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF]; + int bound = 0; + bool started_with_nothing = (Config->ports.size() == 0); + std::vector > old_ports; - int incoming = -1; - bool n = true; + /* XXX: Make a copy of the old ip/port pairs here */ + for (std::vector::iterator o = Config->ports.begin(); o != Config->ports.end(); ++o) + old_ports.push_back(make_pair((*o)->GetIP(), (*o)->GetPort())); - if ((fd < 0) || (fd > MAX_DESCRIPTORS) || (this->ClosePending)) - return false; + 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 (strncmp(Addr, "::ffff:", 7) == 0) + this->Log(DEFAULT, "Using 4in6 (::ffff:) isn't recommended. You should bind IPv4 addresses directly instead."); + + if ((!*Type) || (!strcmp(Type,"clients"))) + { + irc::portparser portrange(configToken, false); + int portno = -1; + while ((portno = portrange.GetToken())) + { + if (*Addr == '*') + *Addr = 0; + + bool skip = false; + for (std::vector::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n) + { + if (((*n)->GetIP() == Addr) && ((*n)->GetPort() == portno)) + { + skip = true; + /* XXX: Here, erase from our copy of the list */ + for (std::vector >::iterator k = old_ports.begin(); k != old_ports.end(); ++k) + { + if ((k->first == Addr) && (k->second == portno)) + { + old_ports.erase(k); + break; + } + } + } + } + if (!skip) + { + ListenSocket* ll = new ListenSocket(this, portno, Addr); + if (ll->GetFd() > -1) + { + bound++; + Config->ports.push_back(ll); + } + else + { + failed_ports.push_back(std::make_pair(Addr, portno)); + } + ports_found++; + } + } + } + } - switch (this->state) + /* XXX: Here, anything left in our copy list, close as removed */ + if (!started_with_nothing) { - 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. - */ - return (n && !this->FlushWriteBuffer()); - break; - default: - break; + for (size_t k = 0; k < old_ports.size(); ++k) + { + for (std::vector::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n) + { + if (((*n)->GetIP() == old_ports[k].first) && ((*n)->GetPort() == old_ports[k].second)) + { + this->Log(DEFAULT,"Port binding %s:%d was removed from the config file, closing.", old_ports[k].first.c_str(), old_ports[k].second); + delete *n; + Config->ports.erase(n); + break; + } + } + } } - return true; -} -void InspSocket::SetState(InspSocketState s) -{ - log(DEBUG,"Socket state change"); - this->state = s; + return bound; } -InspSocketState InspSocket::GetState() +const char* irc::sockets::insp_ntoa(insp_inaddr n) { - return this->state; + static char buf[1024]; + inet_ntop(AF_FAMILY, &n, buf, sizeof(buf)); + return buf; } -int InspSocket::GetFd() +int irc::sockets::insp_aton(const char* a, insp_inaddr* n) { - return this->fd; + return inet_pton(AF_FAMILY, a, n); } -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(); -}