X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspsocket.cpp;h=edb58a05c7e74a19713b509212f465856036f245;hb=480e1e9e1ff6c39a154f3efc6e83b0ffc94a6c8d;hp=20cde3a1aa28f5e3763dd1e82fef0f7256db9d15;hpb=e505d47dc80f1eb302167c12618b170fcc0fd90c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp index 20cde3a1a..edb58a05c 100644 --- a/src/inspsocket.cpp +++ b/src/inspsocket.cpp @@ -2,78 +2,73 @@ * | 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. * * --------------------------------------------------- */ -#include -#include -#include -#include -#include -#include "inspircd_config.h" #include "socket.h" -#include "inspircd.h" #include "configreader.h" #include "inspstring.h" -#include "helperfuncs.h" #include "socketengine.h" -#include "message.h" - +#include "inspircd.h" -extern InspIRCd* ServerInstance; -extern ServerConfig* Config; -extern time_t TIME; +using irc::sockets::OpenTCPSocket; -InspSocket* socket_ref[MAX_DESCRIPTORS]; +bool InspSocket::Readable() +{ + return ((this->state != I_CONNECTING) && (this->WaitingForWriteEvent == false)); +} -InspSocket::InspSocket() +InspSocket::InspSocket(InspIRCd* SI) { + this->Timeout = NULL; this->state = I_DISCONNECTED; this->fd = -1; - this->ClosePending = false; + this->WaitingForWriteEvent = false; + this->Instance = SI; + this->IsIOHooked = false; } -InspSocket::InspSocket(int newfd, const char* ip) +InspSocket::InspSocket(InspIRCd* SI, int newfd, const char* ip) { + this->Timeout = NULL; this->fd = newfd; this->state = I_CONNECTED; strlcpy(this->IP,ip,MAXBUF); - this->ClosePending = false; + this->WaitingForWriteEvent = false; + this->Instance = SI; + this->IsIOHooked = false; if (this->fd > -1) - { - ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE); - socket_ref[this->fd] = this; - } + this->Instance->SE->AddFd(this); } -InspSocket::InspSocket(const std::string &ahost, int aport, bool listening, unsigned long maxtime) : fd(-1) +InspSocket::InspSocket(InspIRCd* SI, const std::string &ipaddr, int aport, bool listening, unsigned long maxtime, const std::string &connectbindip) { - strlcpy(host,ahost.c_str(),MAXBUF); - this->ClosePending = false; - if (listening) { - if ((this->fd = OpenTCPSocket()) == ERROR) + this->cbindip = connectbindip; + this->fd = -1; + this->Instance = SI; + strlcpy(host,ipaddr.c_str(),MAXBUF); + this->WaitingForWriteEvent = false; + this->IsIOHooked = false; + this->Timeout = NULL; + if (listening) + { + if ((this->fd = OpenTCPSocket(host)) == ERROR) { this->fd = -1; this->state = I_ERROR; this->OnError(I_ERR_SOCKET); - this->ClosePending = true; - log(DEBUG,"OpenTCPSocket() error"); return; } else { - if (!BindSocket(this->fd,this->client,this->server,aport,(char*)ahost.c_str())) + if (!SI->BindSocket(this->fd,aport,(char*)ipaddr.c_str())) { - log(DEBUG,"BindSocket() error %s",strerror(errno)); this->Close(); this->fd = -1; this->state = I_ERROR; @@ -84,57 +79,69 @@ InspSocket::InspSocket(const std::string &ahost, int aport, bool listening, unsi else { this->state = I_LISTENING; + this->port = aport; if (this->fd > -1) { - ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE); - socket_ref[this->fd] = this; + if (!this->Instance->SE->AddFd(this)) + { + this->Close(); + this->state = I_ERROR; + this->OnError(I_ERR_NOMOREFDS); + } } - log(DEBUG,"New socket now in I_LISTENING state"); return; } - } + } } else { - strlcpy(this->host,ahost.c_str(),MAXBUF); + strlcpy(this->host,ipaddr.c_str(),MAXBUF); this->port = aport; - if (insp_aton(host,&addy) < 0) + bool ipvalid = true; +#ifdef IPV6 + if (strchr(host,':')) + { + in6_addr n; + if (inet_pton(AF_INET6, host, &n) < 1) + ipvalid = false; + } + else +#endif + { + in_addr n; + if (inet_aton(host,&n) < 1) + ipvalid = false; + } + if (!ipvalid) { - 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; + this->Instance->Log(DEBUG,"BUG: Hostname passed to InspSocket, rather than an IP address!"); + this->OnError(I_ERR_CONNECT); + this->Close(); + this->fd = -1; + this->state = I_ERROR; + return; } else { - log(DEBUG,"No need to resolve %s",this->host); strlcpy(this->IP,host,MAXBUF); - timeout_end = time(NULL) + maxtime; - this->DoConnect(); + timeout_val = maxtime; + if (!this->DoConnect()) + { + this->OnError(I_ERR_CONNECT); + this->Close(); + this->fd = -1; + this->state = I_ERROR; + return; + } } } } void InspSocket::WantWrite() { - /** XXX: - * The socket engine may only have each FD in the list ONCE. - * This means we cant watch for write AND read at the same - * time. We have to remove the READ fd, to insert the WRITE - * fd. Once we receive our WRITE event (which WILL ARRIVE, - * pretty much gauranteed) we switch back to watching for - * READ events again. - * - * This behaviour may be fixed in a later version. - */ + this->Instance->SE->WantWrite(this); this->WaitingForWriteEvent = true; - ServerInstance->SE->DelFd(this->fd); - ServerInstance->SE->AddFd(this->fd,false,X_ESTAB_MODULE); } void InspSocket::SetQueues(int nfd) @@ -142,37 +149,8 @@ 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()) - { - log(DEBUG,"Socket has result"); - std::string res_ip = dns.GetResultIP(); - if (res_ip != "") - { - log(DEBUG,"Socket result set to %s",res_ip.c_str()); - strlcpy(this->IP,res_ip.c_str(),MAXBUF); - socket_ref[this->fd] = NULL; - } - else - { - log(DEBUG,"Socket DNS failure"); - this->Close(); - this->state = I_ERROR; - this->OnError(I_ERR_RESOLVE); - this->fd = -1; - this->ClosePending = true; - return false; - } - return this->DoConnect(); - } - log(DEBUG,"No result for socket yet!"); - return true; + if(setsockopt(nfd,SOL_SOCKET,SO_SNDBUF,(const char *)&sendbuf,sizeof(sendbuf)) || setsockopt(nfd,SOL_SOCKET,SO_RCVBUF,(const char *)&recvbuf,sizeof(sendbuf))) + this->Instance->Log(DEFAULT, "Could not increase SO_SNDBUF/SO_RCVBUF for socket %u", GetFd()); } /* Most irc servers require you to specify the ip you want to bind to. @@ -183,133 +161,214 @@ bool InspSocket::DoResolve() * This is easier to configure when you have a lot of links and a lot * of servers to configure. */ -bool InspSocket::BindAddr() +bool InspSocket::BindAddr(const std::string &ip) { - insp_inaddr n; - ConfigReader Conf; - - log(DEBUG,"In InspSocket::BindAddr()"); - for (int j =0; j < Conf.Enumerate("bind"); j++) + ConfigReader Conf(this->Instance); + socklen_t size = sizeof(sockaddr_in); +#ifdef IPV6 + bool v6 = false; + /* Are we looking for a binding to fit an ipv6 host? */ + if ((ip.empty()) || (ip.find(':') != std::string::npos)) + v6 = true; +#endif + int j = 0; + while (j < Conf.Enumerate("bind") || (!ip.empty())) { - std::string Type = Conf.ReadValue("bind","type",j); - std::string IP = Conf.ReadValue("bind","address",j); - if (Type == "servers") + std::string IP = ip.empty() ? Conf.ReadValue("bind","address",j) : ip; + if (!ip.empty() || Conf.ReadValue("bind","type",j) == "servers") { - if ((IP != "*") && (IP != "127.0.0.1") && (IP != "")) + if (!ip.empty() || ((IP != "*") && (IP != "127.0.0.1") && (!IP.empty()) && (IP != "::1"))) { - insp_sockaddr s; - char resolved_addr[MAXBUF]; - - if (insp_aton(IP.c_str(),&n) < 0) + sockaddr* s = new sockaddr[2]; +#ifdef IPV6 + if (v6) { - /* If they gave a hostname, bind to the IP it resolves to */ - log(DEBUG,"Resolving host %s",IP.c_str()); - if (CleanAndResolve(resolved_addr, IP.c_str(), true, 1)) + in6_addr n; + if (inet_pton(AF_INET6, IP.c_str(), &n) > 0) { - log(DEBUG,"Resolved host %s to %s",IP.c_str(),resolved_addr); - IP = resolved_addr; + memcpy(&((sockaddr_in6*)s)->sin6_addr, &n, sizeof(n)); + ((sockaddr_in6*)s)->sin6_port = 0; + ((sockaddr_in6*)s)->sin6_family = AF_INET6; + size = sizeof(sockaddr_in6); + } + else + { + delete[] s; + j++; + continue; } } - - if (insp_aton(IP.c_str(),&n) == 0) - { - log(DEBUG,"Found an IP to bind to: %s",IP.c_str()); -#ifdef IPV6 - s.sin6_addr = n; - s.sin6_family = AF_FAMILY; -#else - s.sin_addr = n; - s.sin_family = AF_FAMILY; + else #endif - if (bind(this->fd,(struct sockaddr*)&s,sizeof(s)) < 0) + { + in_addr n; + if (inet_aton(IP.c_str(), &n) > 0) { - log(DEBUG,"Cant bind()"); - this->state = I_ERROR; - this->OnError(I_ERR_BIND); - this->fd = -1; - return false; + ((sockaddr_in*)s)->sin_addr = n; + ((sockaddr_in*)s)->sin_port = 0; + ((sockaddr_in*)s)->sin_family = AF_INET; + } + else + { + delete[] s; + j++; + continue; } - log(DEBUG,"bind() reports outbound fd bound to ip %s",IP.c_str()); - return true; } - else + + if (bind(this->fd, s, size) < 0) { - log(DEBUG,"Address '%s' was not an IP address",IP.c_str()); + this->state = I_ERROR; + this->OnError(I_ERR_BIND); + this->fd = -1; + delete[] s; + return false; } + + delete[] s; + return true; } } + j++; } - log(DEBUG,"Found no suitable IPs to bind, binding INADDR_ANY"); return true; } bool InspSocket::DoConnect() { - log(DEBUG,"In DoConnect()"); - if ((this->fd = socket(AF_FAMILY, SOCK_STREAM, 0)) == -1) + sockaddr* addr = new sockaddr[2]; + socklen_t size = sizeof(sockaddr_in); +#ifdef IPV6 + bool v6 = false; + if ((!*this->host) || strchr(this->host, ':')) + v6 = true; + + if (v6) + { + this->fd = socket(AF_INET6, SOCK_STREAM, 0); + if ((this->fd > -1) && ((strstr(this->IP,"::ffff:") != (char*)&this->IP) && (strstr(this->IP,"::FFFF:") != (char*)&this->IP))) + { + if (!this->BindAddr(this->cbindip)) + { + delete[] addr; + return false; + } + } + } + else +#endif + { + this->fd = socket(AF_INET, SOCK_STREAM, 0); + if (this->fd > -1) + { + if (!this->BindAddr(this->cbindip)) + { + delete[] addr; + return false; + } + } + } + + if (this->fd == -1) { - log(DEBUG,"Cant socket()"); this->state = I_ERROR; this->OnError(I_ERR_SOCKET); - this->fd = -1; + delete[] addr; return false; } - if (!this->BindAddr()) - return false; - - log(DEBUG,"Part 2 DoConnect() %s",this->IP); - insp_aton(this->IP,&addy); #ifdef IPV6 - addr.sin6_family = AF_FAMILY; - memcpy(&addy, &addr.sin6_addr, sizeof(insp_inaddr)); - addr.sin6_port = htons(this->port); -#else - addr.sin_family = AF_FAMILY; - addr.sin_addr = addy; - addr.sin_port = htons(this->port); + if (v6) + { + in6_addr addy; + if (inet_pton(AF_INET6, this->host, &addy) > 0) + { + ((sockaddr_in6*)addr)->sin6_family = AF_INET6; + memcpy(&((sockaddr_in6*)addr)->sin6_addr, &addy, sizeof(addy)); + ((sockaddr_in6*)addr)->sin6_port = htons(this->port); + size = sizeof(sockaddr_in6); + } + } + else #endif - - int flags; - flags = fcntl(this->fd, F_GETFL, 0); + { + in_addr addy; + if (inet_aton(this->host, &addy) > 0) + { + ((sockaddr_in*)addr)->sin_family = AF_INET; + ((sockaddr_in*)addr)->sin_addr = addy; + ((sockaddr_in*)addr)->sin_port = htons(this->port); + } + } +#ifndef WIN32 + int 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) +#else + unsigned long flags = 0; + ioctlsocket(this->fd, FIONBIO, &flags); +#endif + if (connect(this->fd, (sockaddr*)addr, size) == -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->Timeout = new SocketTimeout(this->GetFd(), this->Instance, this, timeout_val, this->Instance->Time()); + this->Instance->Timers->AddTimer(this->Timeout); } +#ifdef WIN32 + /* Set nonblocking mode after the connect() call */ + flags = 0; + ioctlsocket(this->fd, FIONBIO, &flags); +#endif this->state = I_CONNECTING; if (this->fd > -1) { - ServerInstance->SE->AddFd(this->fd,false,X_ESTAB_MODULE); - socket_ref[this->fd] = this; + if (!this->Instance->SE->AddFd(this)) + { + this->OnError(I_ERR_NOMOREFDS); + this->Close(); + this->state = I_ERROR; + return false; + } this->SetQueues(this->fd); } - log(DEBUG,"Returning true from InspSocket::DoConnect"); return true; } void InspSocket::Close() { - if (this->fd != -1) + /* Save this, so we dont lose it, + * otherise on failure, error messages + * might be inaccurate. + */ + int save = errno; + if (this->fd > -1) { - this->OnClose(); + if (this->IsIOHooked && Instance->Config->GetIOHook(this)) + { + try + { + Instance->Config->GetIOHook(this)->OnRawSocketClose(this->fd); + } + catch (CoreException& modexcept) + { + Instance->Log(DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); + } + } shutdown(this->fd,2); - close(this->fd); - socket_ref[this->fd] = NULL; - this->ClosePending = true; - this->fd = -1; + if (close(this->fd) != -1) + this->OnClose(); + + if (Instance->SocketCull.find(this) == Instance->SocketCull.end()) + Instance->SocketCull[this] = this; } + errno = save; } std::string InspSocket::GetIP() @@ -319,9 +378,42 @@ std::string InspSocket::GetIP() char* InspSocket::Read() { +#ifdef WINDOWS + if ((fd < 0) || (m_internalFd > MAX_DESCRIPTORS)) +#else if ((fd < 0) || (fd > MAX_DESCRIPTORS)) +#endif return NULL; - int n = recv(this->fd,this->ibuf,sizeof(this->ibuf),0); + + int n = 0; + + if (this->IsIOHooked) + { + int result2 = 0; + int MOD_RESULT = 0; + try + { + MOD_RESULT = Instance->Config->GetIOHook(this)->OnRawSocketRead(this->fd,this->ibuf,sizeof(this->ibuf),result2); + } + catch (CoreException& modexcept) + { + Instance->Log(DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); + } + if (MOD_RESULT < 0) + { + n = -1; + errno = EAGAIN; + } + else + { + n = result2; + } + } + else + { + n = recv(this->fd,this->ibuf,sizeof(this->ibuf),0); + } + if ((n > 0) && (n <= (int)sizeof(this->ibuf))) { ibuf[n] = 0; @@ -329,22 +421,16 @@ char* InspSocket::Read() } else { - if (errno == EAGAIN) - { + int err = errno; + if (err == EAGAIN) return ""; - } else - { - log(DEBUG,"EOF or error on socket: %s",strerror(errno)); return NULL; - } } } void InspSocket::MarkAsClosed() { - log(DEBUG,"Marked as closed"); - this->ClosePending = true; } // There are two possible outcomes to this function. @@ -353,153 +439,210 @@ void InspSocket::MarkAsClosed() // and should be aborted. int InspSocket::Write(const std::string &data) { - 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); + this->Instance->SE->WantWrite(this); return (!this->FlushWriteBuffer()); } bool InspSocket::FlushWriteBuffer() { - if (this->ClosePending) - return true; - + errno = 0; if ((this->fd > -1) && (this->state == I_CONNECTED)) { - if (outbuffer.size()) + if (this->IsIOHooked) { - int result = write(this->fd,outbuffer[0].c_str(),outbuffer[0].length()); - if (result > 0) + while (outbuffer.size() && (errno != EAGAIN)) { - if ((unsigned int)result == outbuffer[0].length()) + try { - /* The whole block was written (usually a line) - * Pop the block off the front of the queue + /* XXX: The lack of buffering here is NOT a bug, modules implementing this interface have to + * implement their own buffering mechanisms */ + Instance->Config->GetIOHook(this)->OnRawSocketWrite(this->fd, outbuffer[0].c_str(), outbuffer[0].length()); outbuffer.pop_front(); } - else + catch (CoreException& modexcept) { - std::string temp = outbuffer[0].substr(result); - outbuffer[0] = temp; + Instance->Log(DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); + return true; } } - else if ((result == -1) && (errno != EAGAIN)) + } + else + { + /* If we have multiple lines, try to send them all, + * not just the first one -- Brain + */ + while (outbuffer.size() && (errno != EAGAIN)) { - log(DEBUG,"Write error on socket: %s",strerror(errno)); - this->OnError(I_ERR_WRITE); - this->state = I_ERROR; - this->ClosePending = true; - return true; + /* Send a line */ +#ifndef WIN32 + int result = write(this->fd,outbuffer[0].c_str(),outbuffer[0].length()); +#else + int result = send(this->fd,outbuffer[0].c_str(),outbuffer[0].length(), 0); +#endif + if (result > 0) + { + if ((unsigned int)result >= outbuffer[0].length()) + { + /* The whole block was written (usually a line) + * Pop the block off the front of the queue, + * dont set errno, because we are clear of errors + * and want to try and write the next block too. + */ + outbuffer.pop_front(); + } + else + { + std::string temp = outbuffer[0].substr(result); + outbuffer[0] = temp; + /* We didnt get the whole line out. arses. + * Try again next time, i guess. Set errno, + * because we shouldnt be writing any more now, + * until the socketengine says its safe to do so. + */ + errno = EAGAIN; + } + } + else if ((result == -1) && (errno != EAGAIN)) + { + this->OnError(I_ERR_WRITE); + this->state = I_ERROR; + this->Instance->SE->DelFd(this); + this->Close(); + return true; + } } } } - return (fd < 0); -} -bool InspSocket::Timeout(time_t current) -{ - if (!socket_ref[this->fd] || !ServerInstance->SE->HasFd(this->fd)) + if ((errno == EAGAIN) && (fd > -1)) { - log(DEBUG,"No FD or socket ref"); - return false; + this->Instance->SE->WantWrite(this); } - if (this->ClosePending) - { - log(DEBUG,"Close is pending"); - return true; - } + return (fd < 0); +} + +void SocketTimeout::Tick(time_t now) +{ + if (ServerInstance->SE->GetRef(this->sfd) != this->sock) + return; - if (((this->state == I_RESOLVING) || (this->state == I_CONNECTING)) && (current > timeout_end)) + if (this->sock->state == I_CONNECTING) { - 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; - this->ClosePending = true; - return true; + this->sock->OnTimeout(); + this->sock->OnError(I_ERR_TIMEOUT); + this->sock->timeout = true; + + /* NOTE: We must set this AFTER DelFd, as we added + * this socket whilst writeable. This means that we + * must DELETE the socket whilst writeable too! + */ + this->sock->state = I_ERROR; + + if (ServerInstance->SocketCull.find(this->sock) == ServerInstance->SocketCull.end()) + ServerInstance->SocketCull[this->sock] = this->sock; } - return this->FlushWriteBuffer(); + + this->sock->Timeout = NULL; } bool InspSocket::Poll() { - if (!socket_ref[this->fd] || !ServerInstance->SE->HasFd(this->fd)) +#ifdef WINDOWS + if(Instance->SE->GetRef(this->fd) != this) + return false; + int incoming = -1; +#else + if (this->Instance->SE->GetRef(this->fd) != this) return false; int incoming = -1; - bool n = true; - if ((fd < 0) || (fd > MAX_DESCRIPTORS) || (this->ClosePending)) + if ((fd < 0) || (fd > MAX_DESCRIPTORS)) return false; - +#endif switch (this->state) { - 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. */ +#ifndef WINDOWS if (this->fd > -1) { - ServerInstance->SE->DelFd(this->fd); - ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE); + this->Instance->SE->DelFd(this); + this->SetState(I_CONNECTED); + if (!this->Instance->SE->AddFd(this)) + return false; + } +#else + this->SetState(I_CONNECTED); +#endif + Instance->Log(DEBUG,"Inspsocket I_CONNECTING state"); + if (Instance->Config->GetIOHook(this)) + { + Instance->Log(DEBUG,"Hook for raw connect"); + try + { + Instance->Config->GetIOHook(this)->OnRawSocketConnect(this->fd); + } + catch (CoreException& modexcept) + { + Instance->Log(DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); + } } return this->OnConnected(); break; case I_LISTENING: - length = sizeof (client); - incoming = accept (this->fd, (sockaddr*)&client,&length); - this->SetQueues(incoming); + { + sockaddr* client = new sockaddr[2]; + length = sizeof (sockaddr_in); + std::string recvip; #ifdef IPV6 - this->OnIncomingConnection(incoming,(char*)insp_ntoa(client.sin6_addr)); -#else - this->OnIncomingConnection(incoming,(char*)insp_ntoa(client.sin_addr)); + if ((!*this->host) || strchr(this->host, ':')) + length = sizeof(sockaddr_in6); #endif - return true; - break; - case I_CONNECTED: - - if (this->WaitingForWriteEvent) + incoming = _accept (this->fd, client, &length); +#ifdef IPV6 + if ((!*this->host) || strchr(this->host, ':')) { - /* Switch back to read events */ - ServerInstance->SE->DelFd(this->fd); - ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE); - /* Trigger the write event */ - n = this->OnWriteReady(); + char buf[1024]; + recvip = inet_ntop(AF_INET6, &((sockaddr_in6*)client)->sin6_addr, buf, sizeof(buf)); } else +#endif + recvip = inet_ntoa(((sockaddr_in*)client)->sin_addr); + this->OnIncomingConnection(incoming, (char*)recvip.c_str()); + + if (this->IsIOHooked) { - /* Process the read event */ - n = this->OnDataReady(); + try + { + Instance->Config->GetIOHook(this)->OnRawSocketAccept(incoming, recvip.c_str(), this->port); + } + catch (CoreException& modexcept) + { + Instance->Log(DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); + } } - /* 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; + + this->SetQueues(incoming); + + delete[] client; + return true; + } + break; + case I_CONNECTED: + /* Process the read event */ + return this->OnDataReady(); break; default: break; @@ -509,7 +652,6 @@ bool InspSocket::Poll() void InspSocket::SetState(InspSocketState s) { - log(DEBUG,"Socket state change"); this->state = s; } @@ -535,4 +677,79 @@ void InspSocket::OnClose() { return; } InspSocket::~InspSocket() { this->Close(); + if (Timeout) + { + Instance->Timers->DelTimer(Timeout); + Timeout = NULL; + } } + +void InspSocket::HandleEvent(EventType et, int errornum) +{ + switch (et) + { + case EVENT_ERROR: + switch (errornum) + { + case ETIMEDOUT: + this->OnError(I_ERR_TIMEOUT); + break; + case ECONNREFUSED: + case 0: + this->OnError(this->state == I_CONNECTING ? I_ERR_CONNECT : I_ERR_WRITE); + break; + case EADDRINUSE: + this->OnError(I_ERR_BIND); + break; + case EPIPE: + case EIO: + this->OnError(I_ERR_WRITE); + break; + } + if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end()) + this->Instance->SocketCull[this] = this; + return; + break; + case EVENT_READ: + if (!this->Poll()) + { + if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end()) + this->Instance->SocketCull[this] = this; + return; + } + break; + case EVENT_WRITE: + if (this->WaitingForWriteEvent) + { + this->WaitingForWriteEvent = false; + if (!this->OnWriteReady()) + { + if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end()) + this->Instance->SocketCull[this] = this; + return; + } + } + if (this->state == I_CONNECTING) + { + /* This might look wrong as if we should be actually calling + * with EVENT_WRITE, but trust me it is correct. There are some + * writeability-state things in the read code, because of how + * InspSocket used to work regarding write buffering in previous + * versions of InspIRCd. - Brain + */ + this->HandleEvent(EVENT_READ); + return; + } + else + { + if (this->FlushWriteBuffer()) + { + if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end()) + this->Instance->SocketCull[this] = this; + return; + } + } + break; + } +} +