From 495f02ebbceaf72c125d809f6ce38004b6dd580a Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Sat, 13 Sep 2008 16:32:47 +0000
Subject: 2008-09-14  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>

	Use non-blocking socket for TCP communication to avoid possible
	blocking due to buffer full.
	* src/AbstractProxyRequestCommand.cc
	* src/FtpConnection.cc
	* src/FtpConnection.h
	* src/FtpNegotiationCommand.cc
	* src/FtpNegotiationCommand.h
	* src/HttpConnection.cc
	* src/HttpConnection.h
	* src/HttpRequestCommand.cc
	* src/InitiatorMSEHandshakeCommand.cc
	* src/InitiatorMSEHandshakeCommand.h
	* src/MSEHandshake.cc
	* src/MSEHandshake.h
	* src/Makefile.am
	* src/PeerConnection.cc
	* src/PeerConnection.h
	* src/PeerInteractionCommand.cc
	* src/PeerListenCommand.cc
	* src/ReceiverMSEHandshakeCommand.cc
	* src/ReceiverMSEHandshakeCommand.h
	* src/SocketBuffer.cc
	* src/SocketBuffer.h
	* src/SocketCore.cc
	* src/SocketCore.h
---
 src/PeerConnection.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/PeerConnection.h')

diff --git a/src/PeerConnection.h b/src/PeerConnection.h
index d543d4e8..f8b94b0c 100644
--- a/src/PeerConnection.h
+++ b/src/PeerConnection.h
@@ -37,6 +37,7 @@
 
 #include "common.h"
 #include "SharedHandle.h"
+#include "SocketBuffer.h"
 #include <unistd.h>
 
 namespace aria2 {
@@ -64,6 +65,8 @@ private:
   unsigned char lenbuf[4];
   size_t lenbufLength;
 
+  SocketBuffer _socketBuffer;
+
   bool _encryptionEnabled;
   SharedHandle<ARC4Encryptor> _encryptor;
   SharedHandle<ARC4Decryptor> _decryptor;
@@ -72,7 +75,7 @@ private:
 
   void readData(unsigned char* data, size_t& length, bool encryption);
 
-  void sendData(const unsigned char* data, size_t length, bool encryption);
+  ssize_t sendData(const unsigned char* data, size_t length, bool encryption);
 
 public:
   PeerConnection(int32_t cuid, const SharedHandle<SocketCore>& socket, const Option* op);
-- 
cgit