X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspsocket.cpp;h=dc0c5bebafc7e519f22252f9f683837de4066e83;hb=5ee83046945a0ca415f49a43b5563b4696f9ee7a;hp=6987d5ccd5c929c6c1797ae1a7b8f03ad49bf897;hpb=ed61aa1ed4b7418126bd99c62aa84d44e78b95ba;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp index 6987d5ccd..dc0c5beba 100644 --- a/src/inspsocket.cpp +++ b/src/inspsocket.cpp @@ -2,12 +2,9 @@ * | 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. * @@ -15,14 +12,11 @@ */ #include "socket.h" -#include "configreader.h" #include "inspstring.h" #include "socketengine.h" #include "inspircd.h" using irc::sockets::OpenTCPSocket; -using irc::sockets::insp_inaddr; -using irc::sockets::insp_sockaddr; bool InspSocket::Readable() { @@ -31,6 +25,7 @@ bool InspSocket::Readable() InspSocket::InspSocket(InspIRCd* SI) { + this->Timeout = NULL; this->state = I_DISCONNECTED; this->fd = -1; this->WaitingForWriteEvent = false; @@ -40,6 +35,7 @@ InspSocket::InspSocket(InspIRCd* SI) InspSocket::InspSocket(InspIRCd* SI, int newfd, const char* ip) { + this->Timeout = NULL; this->fd = newfd; this->state = I_CONNECTED; strlcpy(this->IP,ip,MAXBUF); @@ -50,28 +46,28 @@ InspSocket::InspSocket(InspIRCd* SI, int newfd, const char* ip) this->Instance->SE->AddFd(this); } -InspSocket::InspSocket(InspIRCd* SI, const std::string &ipaddr, int aport, bool listening, unsigned long maxtime) +InspSocket::InspSocket(InspIRCd* SI, const std::string &ipaddr, int aport, bool listening, unsigned long maxtime, const std::string &connectbindip) { + 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()) == ERROR) + if ((this->fd = OpenTCPSocket(host)) == ERROR) { this->fd = -1; this->state = I_ERROR; this->OnError(I_ERR_SOCKET); - this->Instance->Log(DEBUG,"OpenTCPSocket() error"); return; } else { - if (!SI->BindSocket(this->fd,this->client,this->server,aport,(char*)ipaddr.c_str())) + if (!SI->BindSocket(this->fd,aport,(char*)ipaddr.c_str())) { - this->Instance->Log(DEBUG,"BindSocket() error %s",strerror(errno)); this->Close(); this->fd = -1; this->state = I_ERROR; @@ -82,6 +78,7 @@ InspSocket::InspSocket(InspIRCd* SI, const std::string &ipaddr, int aport, bool else { this->state = I_LISTENING; + this->port = aport; if (this->fd > -1) { if (!this->Instance->SE->AddFd(this)) @@ -91,31 +88,51 @@ InspSocket::InspSocket(InspIRCd* SI, const std::string &ipaddr, int aport, bool this->OnError(I_ERR_NOMOREFDS); } } - this->Instance->Log(DEBUG,"New socket now in I_LISTENING state"); return; } - } + } } else { strlcpy(this->host,ipaddr.c_str(),MAXBUF); this->port = aport; - if (insp_aton(host,&addy) < 1) + 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) { - this->Instance->Log(DEBUG,"You cannot pass hostnames to InspSocket, resolve them first with Resolver!"); + 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; - this->OnError(I_ERR_RESOLVE); return; } else { - this->Instance->Log(DEBUG,"No need to resolve %s",this->host); strlcpy(this->IP,host,MAXBUF); timeout_val = maxtime; - this->DoConnect(); + if (!this->DoConnect()) + { + this->OnError(I_ERR_CONNECT); + this->Close(); + this->fd = -1; + this->state = I_ERROR; + return; + } } } } @@ -131,8 +148,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)); + 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. @@ -143,92 +160,159 @@ void InspSocket::SetQueues(int nfd) * 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(this->Instance); - - this->Instance->Log(DEBUG,"In InspSocket::BindAddr()"); - for (int j =0; j < Conf.Enumerate("bind"); j++) + 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; - - if (insp_aton(IP.c_str(),&n) > 0) - { - this->Instance->Log(DEBUG,"Found an IP to bind to: %s",IP.c_str()); + /* The [2] is required because we may write a sockaddr_in6 here, and sockaddr_in6 is larger than sockaddr, where sockaddr_in4 is not. */ + sockaddr* s = new sockaddr[2]; #ifdef IPV6 - s.sin6_addr = n; - s.sin6_family = AF_FAMILY; -#else - s.sin_addr = n; - s.sin_family = AF_FAMILY; -#endif - if (bind(this->fd,(struct sockaddr*)&s,sizeof(s)) < 0) + if (v6) + { + in6_addr n; + if (inet_pton(AF_INET6, IP.c_str(), &n) > 0) { - this->Instance->Log(DEBUG,"Cant bind()"); - this->state = I_ERROR; - this->OnError(I_ERR_BIND); - this->fd = -1; - return false; + memcpy(&((sockaddr_in6*)s)->sin6_addr, &n, sizeof(sockaddr_in6)); + ((sockaddr_in6*)s)->sin6_port = 0; + ((sockaddr_in6*)s)->sin6_family = AF_INET6; + size = sizeof(sockaddr_in6); + } + else + { + delete[] s; + j++; + continue; } - this->Instance->Log(DEBUG,"bind() reports outbound fd bound to ip %s",IP.c_str()); - return true; } else +#endif + { + in_addr n; + if (inet_aton(IP.c_str(), &n) > 0) + { + ((sockaddr_in*)s)->sin_addr = n; + ((sockaddr_in*)s)->sin_port = 0; + ((sockaddr_in*)s)->sin_family = AF_INET; + } + else + { + delete[] s; + j++; + continue; + } + } + + if (Instance->SE->Bind(this->fd, s, size) < 0) { - this->Instance->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++; } - this->Instance->Log(DEBUG,"Found no suitable IPs to bind, binding INADDR_ANY"); return true; } bool InspSocket::DoConnect() { - this->Instance->Log(DEBUG,"In DoConnect()"); - if ((this->fd = socket(AF_FAMILY, SOCK_STREAM, 0)) == -1) + /* The [2] is required because we may write a sockaddr_in6 here, and sockaddr_in6 is larger than sockaddr, where sockaddr_in4 is not. */ + 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) { - this->Instance->Log(DEBUG,"Cant socket()"); this->state = I_ERROR; this->OnError(I_ERR_SOCKET); + delete[] addr; return false; } - if ((strstr(this->IP,"::ffff:") != (char*)&this->IP) && (strstr(this->IP,"::FFFF:") != (char*)&this->IP)) +#ifdef IPV6 + if (v6) { - if (!this->BindAddr()) - return false; + 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); + } } - - this->Instance->Log(DEBUG,"Part 2 DoConnect() %s",this->IP); - insp_aton(this->IP,&addy); -#ifdef IPV6 - addr.sin6_family = AF_FAMILY; - memcpy(&addr.sin6_addr, &addy, 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); + else #endif + { + 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); + } + } - int flags; - flags = fcntl(this->fd, F_GETFL, 0); - fcntl(this->fd, F_SETFL, flags | O_NONBLOCK); + Instance->SE->NonBlocking(this->fd); - if (connect(this->fd, (sockaddr*)&this->addr,sizeof(this->addr)) == -1) +#ifdef WIN32 + /* UGH for the LOVE OF ZOMBIE JESUS SOMEONE FIX THIS!!!!!!!!!!! */ + Instance->SE->Blocking(this->fd); +#endif + + if (Instance->SE->Connect(this, (sockaddr*)addr, size) == -1) { if (errno != EINPROGRESS) { - this->Instance->Log(DEBUG,"Error connect() %d: %s",this->fd,strerror(errno)); this->OnError(I_ERR_CONNECT); this->Close(); this->state = I_ERROR; @@ -238,6 +322,10 @@ bool InspSocket::DoConnect() this->Timeout = new SocketTimeout(this->GetFd(), this->Instance, this, timeout_val, this->Instance->Time()); this->Instance->Timers->AddTimer(this->Timeout); } +#ifdef WIN32 + /* CRAQ SMOKING STUFF TO BE FIXED */ + Instance->SE->NonBlocking(this->fd); +#endif this->state = I_CONNECTING; if (this->fd > -1) { @@ -250,30 +338,38 @@ bool InspSocket::DoConnect() } this->SetQueues(this->fd); } - this->Instance->Log(DEBUG,"Returning true from InspSocket::DoConnect"); return true; } void InspSocket::Close() { + /* Save this, so we dont lose it, + * otherise on failure, error messages + * might be inaccurate. + */ + int save = errno; if (this->fd > -1) { - if (this->IsIOHooked && Instance->Config->GetIOHook(this)) + if (this->IsIOHooked && Instance->Config->GetIOHook(this)) { try { Instance->Config->GetIOHook(this)->OnRawSocketClose(this->fd); } - catch (ModuleException& modexcept) + catch (CoreException& modexcept) { - Instance->Log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); + Instance->Log(DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); } } - this->OnClose(); - shutdown(this->fd,2); - close(this->fd); + Instance->SE->Shutdown(this, 2); + if (Instance->SE->Close(this) != -1) + this->OnClose(); + + if (Instance->SocketCull.find(this) == Instance->SocketCull.end()) + Instance->SocketCull[this] = this; } + errno = save; } std::string InspSocket::GetIP() @@ -283,7 +379,7 @@ std::string InspSocket::GetIP() char* InspSocket::Read() { - if ((fd < 0) || (fd > MAX_DESCRIPTORS)) + if (!Instance->SE->BoundsCheckFd(this)) return NULL; int n = 0; @@ -296,9 +392,9 @@ char* InspSocket::Read() { MOD_RESULT = Instance->Config->GetIOHook(this)->OnRawSocketRead(this->fd,this->ibuf,sizeof(this->ibuf),result2); } - catch (ModuleException& modexcept) + catch (CoreException& modexcept) { - Instance->Log(DEBUG,"Module exception caught: %s",modexcept.GetReason()); + Instance->Log(DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); } if (MOD_RESULT < 0) { @@ -324,23 +420,14 @@ char* InspSocket::Read() { int err = errno; if (err == EAGAIN) - { return ""; - } else - { - if (!n) - this->Instance->Log(DEBUG,"EOF or error on socket: EOF"); - else - this->Instance->Log(DEBUG,"EOF or error on socket: %s",strerror(err)); return NULL; - } } } void InspSocket::MarkAsClosed() { - this->Instance->Log(DEBUG,"Marked as closed"); } // There are two possible outcomes to this function. @@ -367,33 +454,15 @@ bool InspSocket::FlushWriteBuffer() { try { - int result = Instance->Config->GetIOHook(this)->OnRawSocketWrite(this->fd, outbuffer[0].c_str(), outbuffer[0].length()); - if (result > 0) - { - if ((unsigned int)result == outbuffer[0].length()) - { - outbuffer.pop_front(); - } - else - { - std::string temp = outbuffer[0].substr(result); - outbuffer[0] = temp; - errno = EAGAIN; - } - } - else if ((result == -1) && (errno != EAGAIN)) - { - this->Instance->Log(DEBUG,"Write error on socket: %s",strerror(errno)); - this->OnError(I_ERR_WRITE); - this->state = I_ERROR; - this->Instance->SE->DelFd(this); - this->Close(); - return true; - } + /* 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(); } - catch (ModuleException& modexcept) + catch (CoreException& modexcept) { - Instance->Log(DEBUG,"Module exception caught: %s",modexcept.GetReason()); + Instance->Log(DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); return true; } } @@ -406,10 +475,11 @@ bool InspSocket::FlushWriteBuffer() while (outbuffer.size() && (errno != EAGAIN)) { /* Send a line */ - int result = write(this->fd,outbuffer[0].c_str(),outbuffer[0].length()); + int result = Instance->SE->Send(this, outbuffer[0].c_str(), outbuffer[0].length(), 0); + if (result > 0) { - if ((unsigned int)result == outbuffer[0].length()) + if ((unsigned int)result >= outbuffer[0].length()) { /* The whole block was written (usually a line) * Pop the block off the front of the queue, @@ -430,9 +500,14 @@ bool InspSocket::FlushWriteBuffer() errno = EAGAIN; } } + else if (result == 0) + { + this->Instance->SE->DelFd(this); + this->Close(); + return true; + } else if ((result == -1) && (errno != EAGAIN)) { - this->Instance->Log(DEBUG,"Write error on socket: %s",strerror(errno)); this->OnError(I_ERR_WRITE); this->state = I_ERROR; this->Instance->SE->DelFd(this); @@ -454,14 +529,10 @@ bool InspSocket::FlushWriteBuffer() void SocketTimeout::Tick(time_t now) { if (ServerInstance->SE->GetRef(this->sfd) != this->sock) - { - ServerInstance->Log(DEBUG,"Our socket has been deleted before the timeout was reached."); return; - } if (this->sock->state == I_CONNECTING) { - ServerInstance->Log(DEBUG,"Timed out, current=%lu",now); // for non-listening sockets, the timeout can occur // which causes termination of the connection after // the given number of seconds without a successful @@ -469,83 +540,103 @@ void SocketTimeout::Tick(time_t now) this->sock->OnTimeout(); this->sock->OnError(I_ERR_TIMEOUT); this->sock->timeout = true; - ServerInstance->SE->DelFd(this->sock); + /* 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; - this->sock->Close(); - delete this->sock; - return; + + if (ServerInstance->SocketCull.find(this->sock) == ServerInstance->SocketCull.end()) + ServerInstance->SocketCull[this->sock] = this->sock; } + + this->sock->Timeout = NULL; } bool InspSocket::Poll() { - if (this->Instance->SE->GetRef(this->fd) != this) - return false; - int incoming = -1; - if ((fd < 0) || (fd > MAX_DESCRIPTORS)) +#ifndef WINDOWS + if (!Instance->SE->BoundsCheckFd(this)) + return false; +#endif + + if (Instance->SE->GetRef(this->fd) != this) return false; switch (this->state) { case I_CONNECTING: - this->Instance->Log(DEBUG,"State = I_CONNECTING"); /* Our socket was in write-state, so delete it and re-add it * in read-state. */ +#ifndef WINDOWS if (this->fd > -1) { this->Instance->SE->DelFd(this); - this->SetState(I_CONNECTED); if (!this->Instance->SE->AddFd(this)) return false; } +#endif + this->SetState(I_CONNECTED); + if (Instance->Config->GetIOHook(this)) { + Instance->Log(DEBUG,"Hook for raw connect"); try { Instance->Config->GetIOHook(this)->OnRawSocketConnect(this->fd); } - catch (ModuleException& modexcept) + catch (CoreException& modexcept) { - Instance->Log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); + 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); - + { + /* The [2] is required because we may write a sockaddr_in6 here, and sockaddr_in6 is larger than sockaddr, where sockaddr_in4 is not. */ + sockaddr* client = new sockaddr[2]; + length = sizeof (sockaddr_in); + std::string recvip; +#ifdef IPV6 + if ((!*this->host) || strchr(this->host, ':')) + length = sizeof(sockaddr_in6); +#endif + incoming = Instance->SE->Accept(this, client, &length); #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, ':')) + { + char buf[1024]; + recvip = inet_ntop(AF_INET6, &((sockaddr_in6*)client)->sin6_addr, buf, sizeof(buf)); + } + else #endif + Instance->SE->NonBlocking(incoming); + + recvip = inet_ntoa(((sockaddr_in*)client)->sin_addr); + this->OnIncomingConnection(incoming, (char*)recvip.c_str()); if (this->IsIOHooked) { try { -#ifdef IPV6 - Instance->Config->GetIOHook(this)->OnRawSocketAccept(incoming, insp_ntoa(client.sin6_addr), this->port); -#else - Instance->Config->GetIOHook(this)->OnRawSocketAccept(incoming, insp_ntoa(client.sin_addr), this->port); -#endif + Instance->Config->GetIOHook(this)->OnRawSocketAccept(incoming, recvip.c_str(), this->port); } - catch (ModuleException& modexcept) + catch (CoreException& modexcept) { - Instance->Log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); + Instance->Log(DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); } } this->SetQueues(incoming); + + delete[] client; return true; + } break; case I_CONNECTED: /* Process the read event */ @@ -559,7 +650,6 @@ bool InspSocket::Poll() void InspSocket::SetState(InspSocketState s) { - this->Instance->Log(DEBUG,"Socket state change"); this->state = s; } @@ -585,6 +675,11 @@ void InspSocket::OnClose() { return; } InspSocket::~InspSocket() { this->Close(); + if (Timeout) + { + Instance->Timers->DelTimer(Timeout); + Timeout = NULL; + } } void InspSocket::HandleEvent(EventType et, int errornum) @@ -592,17 +687,32 @@ void InspSocket::HandleEvent(EventType et, int errornum) switch (et) { case EVENT_ERROR: - this->Instance->SE->DelFd(this); - this->Close(); - delete this; + 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()) { - this->Instance->SE->DelFd(this); - this->Close(); - delete this; + if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end()) + this->Instance->SocketCull[this] = this; return; } break; @@ -612,9 +722,8 @@ void InspSocket::HandleEvent(EventType et, int errornum) this->WaitingForWriteEvent = false; if (!this->OnWriteReady()) { - this->Instance->SE->DelFd(this); - this->Close(); - delete this; + if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end()) + this->Instance->SocketCull[this] = this; return; } } @@ -631,12 +740,10 @@ void InspSocket::HandleEvent(EventType et, int errornum) } else { - Instance->Log(DEBUG,"State=%d CONNECTED=%d", this->state, I_CONNECTED); if (this->FlushWriteBuffer()) { - this->Instance->SE->DelFd(this); - this->Close(); - delete this; + if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end()) + this->Instance->SocketCull[this] = this; return; } }