Cut down on debug on restart

[user/henk/code/inspircd.git] / src / socketengine_epoll.cpp

diff --git a/src/socketengine_epoll.cpp b/src/socketengine_epoll.cpp
index 1f4f02548d3ae08ea5bd8ddd18946a85faaee7a8..245509a304e065da5b5fa73f6f55516d8acef40d 100644 (file)
--- a/src/socketengine_epoll.cpp
+++ b/src/socketengine_epoll.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -140,7 +137,8 @@ int EPollEngine::DispatchEvents()
                if (events[j].events & EPOLLHUP)
                {
                        ServerInstance->Log(DEBUG,"Handle error event on fd %d", events[j].data.fd);
-                       ref[events[j].data.fd]->HandleEvent(EVENT_ERROR, 0);
+                       if (ref[events[j].data.fd])
+                               ref[events[j].data.fd]->HandleEvent(EVENT_ERROR, 0);
                        continue;
                }
                if (events[j].events & EPOLLERR)
@@ -149,12 +147,14 @@ int EPollEngine::DispatchEvents()
                        if (getsockopt(events[j].data.fd, SOL_SOCKET, SO_ERROR, &errcode, &codesize) < 0)
                                errcode = errno;
                        ServerInstance->Log(DEBUG,"Handle error event on fd %d: %s", events[j].data.fd, strerror(errcode));
-                       ref[events[j].data.fd]->HandleEvent(EVENT_ERROR, errcode);
+                       if (ref[events[j].data.fd])
+                               ref[events[j].data.fd]->HandleEvent(EVENT_ERROR, errcode);
                        continue;
                }
                if (events[j].events & EPOLLOUT)
                {
                        struct epoll_event ev;
+                       memset(&ev,0,sizeof(struct epoll_event));
                        ev.events = EPOLLIN;
                        ev.data.fd = events[j].data.fd;
                        int i = epoll_ctl(EngineHandle, EPOLL_CTL_MOD, events[j].data.fd, &ev);