Log duplicate UUID events a bit better

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12580 e03df62e-2008-0410-955e-edbf42e46eb7
danieldg · Mar 2, 2010 · a6560f4 · a6560f4
1 parent dcc8063
commit a6560f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
@@ -76,6 +76,7 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 	}
 	catch (...)
 	{
+		ServerInstance->Logs->Log("m_spanningtree", DEFAULT, "Duplicate UUID %s in client introduction", params[0].c_str());
 		return CMD_INVALID;
 	}
 	(*(ServerInstance->Users->clientlist))[params[2]] = _new;

diff --git a/src/socketengines/socketengine_epoll.cpp b/src/socketengines/socketengine_epoll.cpp
@@ -233,6 +233,9 @@ int EPollEngine::DispatchEvents()
 		{
 			ReadEvents++;
 			eh->HandleEvent(EVENT_READ);
+			if (eh != ref[events[j].data.fd])
+				// whoa! we got deleted, better not give out the write event
+				continue;
 		}
 		if (events[j].events & EPOLLOUT)
 		{