-/* +------------------------------------+
- * | 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 <attilamolnar@hush.com>
+ * Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ * Copyright (C) 2012 ChrisTX <xpipe@hotmail.de>
+ * Copyright (C) 2009, 2011 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ * Copyright (C) 2009 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2008-2009 Craig Edwards <brain@inspircd.org>
*
- * 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 <http://www.gnu.org/licenses/>.
*/
+
#include "inspircd.h"
#include "threadengines/threadengine_win32.h"
-ThreadEngine::ThreadEngine(InspIRCd* Instance)
-{
-}
-
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<Thread*>(parameter);
+ Thread* pt = static_cast<Thread*>(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
{
SocketThread* parent;
public:
- ThreadSignalSocket(SocketThread* t, InspIRCd* SI, int newfd, const 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;
- sockaddr_in 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(int nfd)
+ void OnError(BufferedSocketError)
{
- new ThreadSignalSocket(parent, ServerInstance, nfd, "");
- ServerInstance->SE->DelFd(this);
+ 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)
{
- return ntohs(sock_us.sin_port);
+ 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, 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");
-
+
+ if (!BindAndListen(listenFD, 0, "127.0.0.1"))
+ throw CoreException("Could not create ITC pipe");
+ SocketEngine::NonBlocking(connFD);
+
struct sockaddr_in addr;
- inet_aton("127.0.0.1", &addr.sin_addr);
- addr.sin_family = AF_INET;
- addr.sin_port = htons(listener->GetPort());
+ socklen_t sz = sizeof(addr);
+ getsockname(listenFD, reinterpret_cast<struct sockaddr*>(&addr), &sz);
+ connect(connFD, reinterpret_cast<struct sockaddr*>(&addr), sz);
+ SocketEngine::Blocking(listenFD);
+ int nfd = accept(listenFD, reinterpret_cast<struct sockaddr*>(&addr), &sz);
+ if (nfd < 0)
+ throw CoreException("Could not create ITC pipe");
+ new ThreadSignalSocket(this, nfd);
+ closesocket(listenFD);
- 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");
- }
+ SocketEngine::Blocking(connFD);
this->signal.connFD = connFD;
}
projects / user / henk / code / inspircd.git / blobdiff