X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspsocket.cpp;h=d78ace31891601d3b5d7d61179aefe8fabea2f9f;hb=ddba35710aa04e33bb061225764a7a9a1165beae;hp=b872ea7e65279de6e8066adc72f68d9ff5dd246c;hpb=7aab0d12db670fea68a258d9ae2b05ea5c4615be;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index b872ea7e6..d78ace318 100644
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -1,16 +1,27 @@
-/*       +------------------------------------+
- *       | 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) 2007-2009 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2006-2007 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
  *
- * 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 "socket.h"
 #include "inspstring.h"
@@ -71,16 +82,6 @@ BufferedSocketError BufferedSocket::BeginConnect(const std::string &ipaddr, int
 	return BeginConnect(addr, bind, maxtime);
 }
 
-static void IncreaseOSBuffers(int fd)
-{
-	// attempt to increase socket sendq and recvq as high as its possible
-	int sendbuf = 32768;
-	int recvbuf = 32768;
-	setsockopt(fd,SOL_SOCKET,SO_SNDBUF,(const char *)&sendbuf,sizeof(sendbuf));
-	setsockopt(fd,SOL_SOCKET,SO_RCVBUF,(const char *)&recvbuf,sizeof(recvbuf));
-	// on failure, do nothing. I'm a little sick of people trying to interpret this message as a result of why their incorrect setups don't work.
-}
-
 BufferedSocketError BufferedSocket::BeginConnect(const irc::sockets::sockaddrs& dest, const irc::sockets::sockaddrs& bind, unsigned long timeout)
 {
 	if (fd < 0)
@@ -111,8 +112,6 @@ BufferedSocketError BufferedSocket::BeginConnect(const irc::sockets::sockaddrs&
 	this->Timeout = new SocketTimeout(this->GetFd(), this, timeout, ServerInstance->Time());
 	ServerInstance->Timers->AddTimer(this->Timeout);
 
-	IncreaseOSBuffers(fd);
-
 	ServerInstance->Logs->Log("SOCKET", DEBUG,"BufferedSocket::DoConnect success");
 	return I_ERR_NONE;
 }
@@ -183,7 +182,7 @@ void StreamSocket::DoRead()
 	else
 	{
 		char* ReadBuffer = ServerInstance->GetReadBuffer();
-		int n = recv(fd, ReadBuffer, ServerInstance->Config->NetBufferSize, 0);
+		int n = ServerInstance->SE->Recv(this, ReadBuffer, ServerInstance->Config->NetBufferSize, 0);
 		if (n == ServerInstance->Config->NetBufferSize)
 		{
 			ServerInstance->SE->ChangeEventMask(this, FD_WANT_FAST_READ | FD_ADD_TRIAL_READ);
@@ -201,7 +200,7 @@ void StreamSocket::DoRead()
 			error = "Connection closed";
 			ServerInstance->SE->ChangeEventMask(this, FD_WANT_NO_READ | FD_WANT_NO_WRITE);
 		}
-		else if (errno == EAGAIN)
+		else if (SocketEngine::IgnoreError())
 		{
 			ServerInstance->SE->ChangeEventMask(this, FD_WANT_FAST_READ | FD_READ_WILL_BLOCK);
 		}
@@ -292,7 +291,7 @@ void StreamSocket::DoWrite()
 					}
 					else if (rv < 0)
 					{
-						if (errno == EAGAIN || errno == EINTR)
+						if (errno == EINTR || SocketEngine::IgnoreError())
 							ServerInstance->SE->ChangeEventMask(this, FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK);
 						else
 							SetError(strerror(errno));
@@ -301,7 +300,7 @@ void StreamSocket::DoWrite()
 					else if (rv < itemlen)
 					{
 						ServerInstance->SE->ChangeEventMask(this, FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK);
-						front = front.substr(itemlen - rv);
+						front = front.substr(rv);
 						sendq_len -= rv;
 						return;
 					}
@@ -389,7 +388,7 @@ void StreamSocket::DoWrite()
 			{
 				error = "Connection closed";
 			}
-			else if (errno == EAGAIN)
+			else if (SocketEngine::IgnoreError())
 			{
 				eventChange = FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK;
 			}