X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fthreadengines%2Fthreadengine_win32.cpp;h=b14f46e8e7d004413be9c4403e51ea91490da5ff;hb=a30a0074edac353cb60e134b43fa8ff0ffb67f8b;hp=5a0635a097b93e039a296261a6b633cb151c8797;hpb=59dbcc1245468218ec7e2372b2678351382a34f0;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/threadengines/threadengine_win32.cpp b/src/threadengines/threadengine_win32.cpp index 5a0635a09..b14f46e8e 100644 --- a/src/threadengines/threadengine_win32.cpp +++ b/src/threadengines/threadengine_win32.cpp @@ -1,129 +1,123 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2013-2014 Attila Molnar + * Copyright (C) 2012 Robby + * Copyright (C) 2012 ChrisTX + * Copyright (C) 2009, 2011 Daniel De Graaf + * Copyright (C) 2009 Uli Schlachter + * Copyright (C) 2009 Dennis Friis + * Copyright (C) 2008-2009 Craig Edwards * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + #include "inspircd.h" #include "threadengines/threadengine_win32.h" -ThreadEngine::ThreadEngine(InspIRCd* Instance) -{ -} - -void ThreadEngine::Create(Thread* thread) +void ThreadEngine::Start(Thread* thread) { - ThreadData* data = new ThreadData; - thread->state = data; + thread->state.handle = CreateThread(NULL, 0, ThreadEngine::Entry, thread, 0, NULL); - DWORD ThreadId = 0; - data->handle = CreateThread(NULL,0,ThreadEngine::Entry,thread,0,&ThreadId); - - if (data->handle == NULL) + if (thread->state.handle == NULL) { - thread->state = NULL; - delete data; - throw CoreException(std::string("Unable to create new thread: ") + dlerror()); + DWORD lasterr = GetLastError(); + std::string err = "Unable to create new thread: " + ConvToStr(lasterr); + SetLastError(ERROR_SUCCESS); + throw CoreException(err); } } -ThreadEngine::~ThreadEngine() -{ -} - DWORD WINAPI ThreadEngine::Entry(void* parameter) { - Thread* pt = reinterpret_cast(parameter); + Thread* pt = static_cast(parameter); pt->Run(); return 0; } -void ThreadData::FreeThread(Thread* thread) +void ThreadEngine::Stop(Thread* thread) { thread->SetExitFlag(); + HANDLE handle = thread->state.handle; WaitForSingleObject(handle,INFINITE); + CloseHandle(handle); } class ThreadSignalSocket : public BufferedSocket { - SignalThread* parent; + SocketThread* parent; public: - ThreadSignalSocket(SignalThread* t, InspIRCd* SI, int newfd, char* ip) - : BufferedSocket(SI, newfd, ip), parent(t) + ThreadSignalSocket(SocketThread* t, int newfd) + : BufferedSocket(newfd), parent(t) { - parent->results = this; } - - 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) + void OnDataReady() { - 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"); - } + recvq.clear(); + parent->OnNotify(); } - virtual void OnAcceptReady(const std::string &ipconnectedto, int nfd, const std::string &incomingip) + void OnError(BufferedSocketError) { - new ThreadSignalSocket(parent, ServerInstance, nfd, const_cast(ipconnectedto.c_str())); - ServerInstance->SE->DelFd(this); - // XXX unsafe casts suck + ServerInstance->GlobalCulls.AddItem(this); } -/* Using getsockname and ntohs, we can determine which port number we were allocated */ - int GetPort() +}; + +static bool BindAndListen(int sockfd, int port, const char* addr) +{ + irc::sockets::sockaddrs servaddr; + if (!irc::sockets::aptosa(addr, port, servaddr)) + return false; + + if (SocketEngine::Bind(sockfd, servaddr) != 0) + return false; + + if (SocketEngine::Listen(sockfd, ServerInstance->Config->MaxConn) != 0) { -#ifdef IPV6 - return ntohs(sock_us.sin6_port); -#else - return ntohs(sock_us.sin_port); -#endif + ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "ERROR in listen(): %s", strerror(errno)); + return false; } -}; -SocketThread::SocketThread(InspIRCd* SI) + return true; +} + +SocketThread::SocketThread() { - ThreadSignalListener* listener = new ThreadSignalListener(this, ServerInstance, 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::sockaddrs addr; - irc::sockets::insp_aton("127.0.0.1", &addr.in4.sin_addr); - addr.in4.sin_family = AF_INET; - addr.in4.sin_port = htons(listener->GetPort()); - if (connect(connFD, &addr.sa, sizeof(addr.in4)) == -1) - { - ServerInstance->SE->DelFd(listener); - close(connFD); - throw CoreException("Could not connet to ITC pipe"); - } + if (!BindAndListen(listenFD, 0, "127.0.0.1")) + throw CoreException("Could not create ITC pipe"); + SocketEngine::NonBlocking(connFD); + + struct sockaddr_in addr; + socklen_t sz = sizeof(addr); + getsockname(listenFD, reinterpret_cast(&addr), &sz); + connect(connFD, reinterpret_cast(&addr), sz); + SocketEngine::Blocking(listenFD); + int nfd = accept(listenFD, reinterpret_cast(&addr), &sz); + if (nfd < 0) + throw CoreException("Could not create ITC pipe"); + new ThreadSignalSocket(this, nfd); + closesocket(listenFD); + + SocketEngine::Blocking(connFD); this->signal.connFD = connFD; } @@ -135,5 +129,9 @@ void SocketThread::NotifyParent() SocketThread::~SocketThread() { - close(signal.connFD); + if (signal.connFD >= 0) + { + shutdown(signal.connFD, 2); + closesocket(signal.connFD); + } }