Remove InspIRCd* parameters and fields

[user/henk/code/inspircd.git] / src / threadengines / threadengine_win32.cpp

diff --git a/src/threadengines/threadengine_win32.cpp b/src/threadengines/threadengine_win32.cpp
index eb710bbdeaec99fe2c9cbc64c31b13654b2c0fbb..e880d597f71b367f16cf8ed4548923c8bdf5363a 100644 (file)
--- a/src/threadengines/threadengine_win32.cpp
+++ b/src/threadengines/threadengine_win32.cpp
@@ -14,7 +14,7 @@
 #include "inspircd.h"
 #include "threadengines/threadengine_win32.h"
 
-ThreadEngine::ThreadEngine(InspIRCd* Instance)
+ThreadEngine::ThreadEngine()
 {
 }
 
@@ -40,7 +40,7 @@ ThreadEngine::~ThreadEngine()
 
 DWORD WINAPI ThreadEngine::Entry(void* parameter)
 {
-       Thread* pt = reinterpret_cast<Thread*>(parameter);
+       Thread* pt = static_cast<Thread*>(parameter);
        pt->Run();
        return 0;
 }
@@ -55,81 +55,42 @@ class ThreadSignalSocket : public BufferedSocket
 {
        SocketThread* parent;
  public:
-       ThreadSignalSocket(SocketThread* t, InspIRCd* SI, int newfd, char* ip)
-               : BufferedSocket(SI, newfd, ip), parent(t)
+       ThreadSignalSocket(SocketThread* t, int newfd)
+               : BufferedSocket(newfd), parent(t)
        {
        }
-       
-       virtual bool OnDataReady()
-       {
-               char data = 0;
-               if (ServerInstance->SE->Recv(this, &data, 1, 0) > 0)
-               {
-                       parent->OnNotify();
-                       return true;
-               }
-               return false;
-       }
-};
-
-class ThreadSignalListener : public ListenSocketBase
-{
-       SocketThread* parent;
-       irc::sockets::insp_sockaddr sock_us;
- public:
-       ThreadSignalListener(SocketThread* t, InspIRCd* Instance, int port, const std::string &addr) : ListenSocketBase(Instance, port, addr), parent(t)
-       {
-               socklen_t uslen = sizeof(sock_us);
-               if (getsockname(this->fd,(sockaddr*)&sock_us,&uslen))
-               {
-                       throw ModuleException("Could not getsockname() to find out port number for ITC port");
-               }
-       }
 
-       virtual void OnAcceptReady(const std::string &ipconnectedto, int nfd, const std::string &incomingip)
+       void OnDataReady()
        {
-               new ThreadSignalSocket(parent, ServerInstance, nfd, const_cast<char*>(ipconnectedto.c_str()));
-               ServerInstance->SE->DelFd(this);
-               // XXX unsafe casts suck
-       }
-/* Using getsockname and ntohs, we can determine which port number we were allocated */
-       int GetPort()
-       {
-#ifdef IPV6
-               return ntohs(sock_us.sin6_port);
-#else
-               return ntohs(sock_us.sin_port);
-#endif
+               recvq.clear();
+               parent->OnNotify();
        }
 };
 
-SocketThread::SocketThread(InspIRCd* SI)
+SocketThread::SocketThread()
 {
-       ThreadSignalListener* listener = new ThreadSignalListener(this, SI, 0, "127.0.0.1");
-       if (listener->GetFd() == -1)
+       int listenFD = socket(AF_INET, SOCK_STREAM, 0);
+       if (listenFD == -1)
                throw CoreException("Could not create ITC pipe");
        int connFD = socket(AF_INET, SOCK_STREAM, 0);
        if (connFD == -1)
                throw CoreException("Could not create ITC pipe");
-       
-       irc::sockets::insp_sockaddr addr;
-
-#ifdef IPV6
-       irc::sockets::insp_aton("::1", &addr.sin6_addr);
-       addr.sin6_family = AF_INET6;
-       addr.sin6_port = htons(listener->GetPort());
-#else
-       irc::sockets::insp_aton("127.0.0.1", &addr.sin_addr);
-       addr.sin_family = AF_INET;
-       addr.sin_port = htons(listener->GetPort());
-#endif
-
-       if (connect(connFD, reinterpret_cast<struct sockaddr*>(&addr), sizeof(addr)) == -1)
-       {
-               SI->SE->DelFd(listener);
-               closesocket(connFD);
-               throw CoreException("Could not connet to ITC pipe");
-       }
+
+       if (!SI->BindSocket(listenFD, 0, "127.0.0.1", true))
+               throw CoreException("Could not create ITC pipe");
+       SI->SE->NonBlocking(connFD);
+
+       struct sockaddr_in addr;
+       socklen_t sz = sizeof(addr);
+       getsockname(listenFD, reinterpret_cast<struct sockaddr*>(&addr), &sz);
+       connect(connFD, reinterpret_cast<struct sockaddr*>(&addr), sz);
+       int nfd = accept(listenFD);
+       if (nfd < 0)
+               throw CoreException("Could not create ITC pipe");
+       new ThreadSignalSocket(parent, nfd);
+       closesocket(listenFD);
+
+       SI->SE->Blocking(connFD);
        this->signal.connFD = connFD;
 }