diff options
| author | Adam <Adam@anope.org> | 2010-10-01 21:01:49 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2010-10-01 21:01:49 -0400 |
| commit | d44f7971b129aa7ba80999f16f17b8c7499686e1 (patch) | |
| tree | a86d08c3e641ed6b499b53b3bbb74e2a7f5b0dfb /modules/socketengines/m_socketengine_epoll.cpp | |
| parent | 70056dd4689eeab4f7a9b31a921e0d7e40d5ed0d (diff) | |
Rewrote some of the socket code to allow m_ssl to be a service.
This allows modules (xmlrpc) to create and accept SSL connections.
Also fixed unloading m_mysql at certain times and made the threading
engine always work correctly on Windows.
Diffstat (limited to 'modules/socketengines/m_socketengine_epoll.cpp')
| -rw-r--r-- | modules/socketengines/m_socketengine_epoll.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/socketengines/m_socketengine_epoll.cpp b/modules/socketengines/m_socketengine_epoll.cpp index 7b8dbdde5..713c1f0ff 100644 --- a/modules/socketengines/m_socketengine_epoll.cpp +++ b/modules/socketengines/m_socketengine_epoll.cpp @@ -48,7 +48,7 @@ class SocketEngineEPoll : public SocketEngineBase memset(&ev, 0, sizeof(ev)); ev.events = EPOLLIN; - ev.data.fd = s->GetSock(); + ev.data.fd = s->GetFD(); if (epoll_ctl(EngineHandle, EPOLL_CTL_ADD, ev.data.fd, &ev) == -1) { @@ -67,7 +67,7 @@ class SocketEngineEPoll : public SocketEngineBase memset(&ev, 0, sizeof(ev)); - ev.data.fd = s->GetSock(); + ev.data.fd = s->GetFD(); if (epoll_ctl(EngineHandle, EPOLL_CTL_DEL, ev.data.fd, &ev) == -1) { @@ -90,7 +90,7 @@ class SocketEngineEPoll : public SocketEngineBase memset(&ev, 0, sizeof(ev)); ev.events = EPOLLIN | EPOLLOUT; - ev.data.fd = s->GetSock(); + ev.data.fd = s->GetFD(); if (epoll_ctl(EngineHandle, EPOLL_CTL_MOD, ev.data.fd, &ev) == -1) Log() << "Unable to mark fd " << ev.data.fd << " as writable in socketengine epoll: " << Anope::LastError(); @@ -108,7 +108,7 @@ class SocketEngineEPoll : public SocketEngineBase memset(&ev, 0, sizeof(ev)); ev.events = EPOLLIN; - ev.data.fd = s->GetSock(); + ev.data.fd = s->GetFD(); if (epoll_ctl(EngineHandle, EPOLL_CTL_MOD, ev.data.fd, &ev) == -1) Log() << "Unable to mark fd " << ev.data.fd << " as unwritable in socketengine epoll: " << Anope::LastError(); |