diff options
| author | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2010-03-02 00:36:58 +0000 |
|---|---|---|
| committer | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2010-03-02 00:36:58 +0000 |
| commit | a6560f4d50e3eea079dc983bd1e01ce9b1241ed8 (patch) | |
| tree | fa55b2625e37de833b1fcf771df73d15307024c6 | |
| parent | dcc8063a2889f70eb08cea23d25132ffdfef8e34 (diff) | |
Log duplicate UUID events a bit better
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12580 e03df62e-2008-0410-955e-edbf42e46eb7
| -rw-r--r-- | src/modules/m_spanningtree/uid.cpp | 1 | ||||
| -rw-r--r-- | src/socketengines/socketengine_epoll.cpp | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp index 7059d9603..118bdc500 100644 --- a/src/modules/m_spanningtree/uid.cpp +++ b/src/modules/m_spanningtree/uid.cpp @@ -76,6 +76,7 @@ CmdResult CommandUID::Handle(const parameterlist ¶ms, 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 index 934106e54..4176c3b3a 100644 --- 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) { |