Make rehash work more than once per run, and fix some uninitialized values in connect...

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

diff --git a/src/socketengines/socketengine_epoll.cpp b/src/socketengines/socketengine_epoll.cpp
index 6b89544127d40a6afe34b070a28c938823f3522d..1be0d7cd2f2943b995cac1e3fdb2080f591609ba 100644 (file)
--- a/src/socketengines/socketengine_epoll.cpp
+++ b/src/socketengines/socketengine_epoll.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -13,7 +13,6 @@
 
 #include "inspircd.h"
 #include "exitcodes.h"
-#include <sys/epoll.h>
 #include "socketengines/socketengine_epoll.h"
 #include <ulimit.h>
 
@@ -92,7 +91,7 @@ void EPollEngine::WantWrite(EventHandler* eh)
         */
        struct epoll_event ev;
        memset(&ev,0,sizeof(ev));
-       ev.events = EPOLLOUT;
+       ev.events = EPOLLIN | EPOLLOUT;
        ev.data.fd = eh->GetFd();
        epoll_ctl(EngineHandle, EPOLL_CTL_MOD, eh->GetFd(), &ev);
 }
@@ -152,7 +151,7 @@ int EPollEngine::GetRemainingFds()
 
 int EPollEngine::DispatchEvents()
 {
-       socklen_t codesize;
+       socklen_t codesize = sizeof(int);
        int errcode;
        int i = epoll_wait(EngineHandle, events, GetMaxFds() - 1, 1000);