X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsocketengine.cpp;h=27abd0ad630f45e358d401ffa9e65a9895a3112e;hb=2e04480f21298262daa5c6d9b0d1b24c52f00756;hp=98916e6023bb21620b01198d52f09a4bba3b24da;hpb=cd712c40e1b352c05e7ae0f72e0a5e84cdf64323;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socketengine.cpp b/src/socketengine.cpp
index 98916e602..27abd0ad6 100644
--- a/src/socketengine.cpp
+++ b/src/socketengine.cpp
@@ -1,21 +1,32 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2005-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Burlex <???@???>
+ *   Copyright (C) 2007 Dennis Friis <peavey@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"
 
 EventHandler::EventHandler()
 {
 	fd = -1;
+	event_mask = 0;
 }
 
 void EventHandler::SetFd(int FD)
@@ -87,7 +98,7 @@ bool SocketEngine::HasFd(int fd)
 {
 	if ((fd < 0) || (fd > GetMaxFds()))
 		return false;
-	return ref[fd];
+	return (ref[fd] != NULL);
 }
 
 EventHandler* SocketEngine::GetRef(int fd)
@@ -114,7 +125,7 @@ int SocketEngine::Accept(EventHandler* fd, sockaddr *addr, socklen_t *addrlen)
 
 int SocketEngine::Close(EventHandler* fd)
 {
-#ifdef WINDOWS
+#ifdef _WIN32
 	return closesocket(fd->GetFd());
 #else
 	return close(fd->GetFd());
@@ -123,7 +134,7 @@ int SocketEngine::Close(EventHandler* fd)
 
 int SocketEngine::Close(int fd)
 {
-#ifdef WINDOWS
+#ifdef _WIN32
 	return closesocket(fd);
 #else
 	return close(fd);
@@ -132,7 +143,7 @@ int SocketEngine::Close(int fd)
 
 int SocketEngine::Blocking(int fd)
 {
-#ifdef WINDOWS
+#ifdef _WIN32
 	unsigned long opt = 0;
 	return ioctlsocket(fd, FIONBIO, &opt);
 #else
@@ -143,7 +154,7 @@ int SocketEngine::Blocking(int fd)
 
 int SocketEngine::NonBlocking(int fd)
 {
-#ifdef WINDOWS
+#ifdef _WIN32
 	unsigned long opt = 1;
 	return ioctlsocket(fd, FIONBIO, &opt);
 #else
@@ -165,31 +176,44 @@ void SocketEngine::SetReuse(int fd)
 
 int SocketEngine::RecvFrom(EventHandler* fd, void *buf, size_t len, int flags, sockaddr *from, socklen_t *fromlen)
 {
-	this->UpdateStats(len, 0);
-	return recvfrom(fd->GetFd(), (char*)buf, len, flags, from, fromlen);
+	int nbRecvd = recvfrom(fd->GetFd(), (char*)buf, len, flags, from, fromlen);
+	if (nbRecvd > 0)
+		this->UpdateStats(nbRecvd, 0);
+	return nbRecvd;
 }
 
 int SocketEngine::Send(EventHandler* fd, const void *buf, size_t len, int flags)
 {
-	this->UpdateStats(0, len);
-	return send(fd->GetFd(), (char*)buf, len, flags);
+	int nbSent = send(fd->GetFd(), (const char*)buf, len, flags);
+	if (nbSent > 0)
+		this->UpdateStats(0, nbSent);
+	return nbSent;
 }
 
 int SocketEngine::Recv(EventHandler* fd, void *buf, size_t len, int flags)
 {
-	this->UpdateStats(len, 0);
-	return recv(fd->GetFd(), (char*)buf, len, flags);
+	int nbRecvd = recv(fd->GetFd(), (char*)buf, len, flags);
+	if (nbRecvd > 0)
+		this->UpdateStats(nbRecvd, 0);
+	return nbRecvd;
 }
 
 int SocketEngine::SendTo(EventHandler* fd, const void *buf, size_t len, int flags, const sockaddr *to, socklen_t tolen)
 {
-	this->UpdateStats(0, len);
-	return sendto(fd->GetFd(), (char*)buf, len, flags, to, tolen);
+	int nbSent = sendto(fd->GetFd(), (const char*)buf, len, flags, to, tolen);
+	if (nbSent > 0)
+		this->UpdateStats(0, nbSent);
+	return nbSent;
 }
 
 int SocketEngine::Connect(EventHandler* fd, const sockaddr *serv_addr, socklen_t addrlen)
 {
-	return connect(fd->GetFd(), serv_addr, addrlen);
+	int ret = connect(fd->GetFd(), serv_addr, addrlen);
+#ifdef _WIN32
+	if ((ret == SOCKET_ERROR) && (WSAGetLastError() == WSAEWOULDBLOCK))
+		errno = EINPROGRESS;
+#endif
+	return ret;
 }
 
 int SocketEngine::Shutdown(EventHandler* fd, int how)