From ea1b4b3ee533146763245ecbbb4a31e3ed791498 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Sun, 16 Jan 2011 16:55:41 +0900
Subject: Eliminated SocketCore::peekData() form HTTP/FTP downloads.

We introduced SocketRecvBuffer which buffers received bytes. Since
HTTP response header and response body are divided with \r\n, we have
to buffer up several bytes to find this delimiter. We use
SocketRecvBuffer to hold these bytes and only consumes header and
passes SocketRecvBuffer, which may contain head of response body, to
next Command.  Since FTPConnection doesn't use SocketCore::peekData(),
we left it as is.
---
 src/SocketRecvBuffer.cc | 77 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 src/SocketRecvBuffer.cc

(limited to 'src/SocketRecvBuffer.cc')

diff --git a/src/SocketRecvBuffer.cc b/src/SocketRecvBuffer.cc
new file mode 100644
index 00000000..2c5a1cdf
--- /dev/null
+++ b/src/SocketRecvBuffer.cc
@@ -0,0 +1,77 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2011 Tatsuhiro Tsujikawa
+ *
+ * This program 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; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "SocketRecvBuffer.h"
+
+#include <cstring>
+
+#include "SocketCore.h"
+#include "LogFactory.h"
+
+namespace aria2 {
+
+SocketRecvBuffer::SocketRecvBuffer
+(const SharedHandle<SocketCore>& socket,
+ size_t capacity)
+  : socket_(socket),
+    capacity_(capacity),
+    buf_(new unsigned char[capacity_]),
+    bufLen_(0)
+{}
+
+SocketRecvBuffer::~SocketRecvBuffer()
+{
+  delete [] buf_;
+}
+
+ssize_t SocketRecvBuffer::recv()
+{
+  size_t len = capacity_-bufLen_;
+  if(len > 0) {
+    socket_->readData(buf_+bufLen_, len);
+    bufLen_ += len;
+  } else {
+    A2_LOG_DEBUG("Buffer full");
+  }
+  return len;
+}
+
+void SocketRecvBuffer::shiftBuffer(size_t offset)
+{
+  assert(offset <= bufLen_);
+  memmove(buf_, buf_+offset, bufLen_-offset);
+  bufLen_ -= offset;
+}
+
+} // namespace aria2
-- 
cgit