diff options
| author | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2010-03-02 03:23:18 +0000 |
|---|---|---|
| committer | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2010-03-02 03:23:18 +0000 |
| commit | 9b2cb52a12bf17d23417e689a1c07765d3bdaed5 (patch) | |
| tree | 0622354f9be12fb836af47033d097ff60b7d989c | |
| parent | a018f26eddbc72fdbf87fe5ee89112a53311fff1 (diff) | |
Fix some more incorrect socket use
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12585 e03df62e-2008-0410-955e-edbf42e46eb7
| -rw-r--r-- | src/inspsocket.cpp | 5 | ||||
| -rw-r--r-- | src/modules/extra/m_pgsql.cpp | 12 | ||||
| -rw-r--r-- | src/modules/m_ident.cpp | 1 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/rsquit.cpp | 1 |
4 files changed, 1 insertions, 18 deletions
diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp index e3b8f8c8a..c20b76dd7 100644 --- a/src/inspsocket.cpp +++ b/src/inspsocket.cpp @@ -446,11 +446,6 @@ void SocketTimeout::Tick(time_t) // connection. this->sock->OnTimeout(); this->sock->OnError(I_ERR_TIMEOUT); - - /* 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; ServerInstance->GlobalCulls.AddItem(sock); diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp index 629193ea1..b1f6916d0 100644 --- a/src/modules/extra/m_pgsql.cpp +++ b/src/modules/extra/m_pgsql.cpp @@ -735,17 +735,7 @@ class SQLConn : public EventHandler void Close() { - if (!ServerInstance->SE->DelFd(this)) - { - if (sql && PQstatus(sql) == CONNECTION_BAD) - { - ServerInstance->SE->DelFd(this, true); - } - else - { - ServerInstance->Logs->Log("m_pgsql",DEBUG, "BUG: PQsocket cant be removed from socket engine!"); - } - } + ServerInstance->SE->DelFd(this); if(sql) { diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp index d20c9d8dd..2d810dde2 100644 --- a/src/modules/m_ident.cpp +++ b/src/modules/m_ident.cpp @@ -189,7 +189,6 @@ class IdentRequestSocket : public EventHandler ServerInstance->Logs->Log("m_ident",DEBUG,"Close ident socket %d", GetFd()); ServerInstance->SE->DelFd(this); ServerInstance->SE->Close(GetFd()); - ServerInstance->SE->Shutdown(GetFd(), SHUT_WR); this->SetFd(-1); } } diff --git a/src/modules/m_spanningtree/rsquit.cpp b/src/modules/m_spanningtree/rsquit.cpp index 39378c31d..d285520f9 100644 --- a/src/modules/m_spanningtree/rsquit.cpp +++ b/src/modules/m_spanningtree/rsquit.cpp @@ -57,7 +57,6 @@ CmdResult CommandRSQuit::Handle (const std::vector<std::string>& parameters, Use const char *reason = parameters.size() == 2 ? parameters[1].c_str() : "No reason"; ServerInstance->SNO->WriteToSnoMask('l',"RSQUIT: Server \002%s\002 removed from network by %s (%s)", parameters[0].c_str(), user->nick.c_str(), reason); sock->Squit(server_target, std::string("Server quit by ") + user->GetFullRealHost() + " (" + reason + ")"); - ServerInstance->SE->DelFd(sock); sock->Close(); } } |