2009-05-08 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Added xml-rpc functionality. Currently only addURI commad is
	supported. To enable xml-rpc, run aria2 with
	--enable-http-server. This option name is temporal and will be
	changed. The feature that reports download progress in html format
	is temporarily disabled.
	* src/HttpServer.cc
	* src/HttpServer.h
	* src/HttpServerBodyCommand.cc
	* src/HttpServerBodyCommand.h
	* src/HttpServerCommand.cc
	* src/HttpServerResponseCommand.cc
	* src/Makefile.am
	* src/OptionParser.cc
	* src/OptionParser.h
	* src/RequestGroupMan.cc
	* src/RequestGroupMan.h
	* src/XmlRpcMethod.cc
	* src/XmlRpcMethod.h
	* src/XmlRpcMethodFactory.cc
	* src/XmlRpcMethodFactory.h
	* src/XmlRpcMethodImpl.cc
	* src/XmlRpcMethodImpl.h
	* src/download_helper.cc
	* src/download_helper.h
	* test/Makefile.am
	* test/XmlRpcMethodTest.cc

1 files changed, 122 insertions, 0 deletions

diff --git a/src/HttpServerBodyCommand.cc b/src/HttpServerBodyCommand.cc
new file mode 100644
index 00000000..6ed81ec5
--- /dev/null
+++ b/src/HttpServerBodyCommand.cc
@@ -0,0 +1,122 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2009 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 "HttpServerBodyCommand.h"
+#include "SocketCore.h"
+#include "DownloadEngine.h"
+#include "HttpServer.h"
+#include "HttpHeader.h"
+#include "Logger.h"
+#include "RequestGroup.h"
+#include "RequestGroupMan.h"
+#include "RecoverableException.h"
+#include "HttpServerResponseCommand.h"
+#include "OptionParser.h"
+#include "OptionHandler.h"
+#include "XmlRpcRequestProcessor.h"
+#include "XmlRpcRequestParserStateMachine.h"
+#include "XmlRpcMethod.h"
+#include "XmlRpcMethodFactory.h"
+
+namespace aria2 {
+
+HttpServerBodyCommand::HttpServerBodyCommand
+(int32_t cuid,
+ const SharedHandle<HttpServer>& httpServer,
+ DownloadEngine* e,
+ const SharedHandle<SocketCore>& socket):
+  Command(cuid),
+  _e(e),
+  _socket(socket),
+  _httpServer(httpServer)
+{
+  _e->addSocketForReadCheck(_socket, this);
+}
+
+HttpServerBodyCommand::~HttpServerBodyCommand()
+{
+  _e->deleteSocketForReadCheck(_socket, this);
+}
+
+bool HttpServerBodyCommand::execute()
+{
+  if(_e->_requestGroupMan->downloadFinished() || _e->isHaltRequested()) {
+    return true;
+  }
+  if(_socket->isReadable(0)) {
+    _timeout.reset();
+
+    try {
+      if(_httpServer->receiveBody()) {
+	// Do something for requestpath and body
+	if(_httpServer->getRequestPath() == "/rpc") {
+	  // For xml-rpc, disable keep-alive
+	  //_httpServer->disableKeepAlive();
+	  xmlrpc::XmlRpcRequest req =
+	    xmlrpc::XmlRpcRequestProcessor().parseMemory(_httpServer->getBody());
+	  
+	  SharedHandle<xmlrpc::XmlRpcMethod> method =
+	    xmlrpc::XmlRpcMethodFactory::create(req._methodName);
+	  std::string response = method->execute(req, _e);
+	  _httpServer->feedResponse(response, "text/xml");
+	  Command* command =
+	    new HttpServerResponseCommand(cuid, _httpServer, _e, _socket);
+	  command->setStatus(Command::STATUS_ONESHOT_REALTIME);
+	  _e->commands.push_back(command);
+	  _e->setNoWait(true);
+	  return true;
+	} else {
+	  return true;
+	}
+      } else {
+	_e->commands.push_back(this);
+	return false;
+      }	
+    } catch(RecoverableException& e) {
+      logger->info("CUID#%d - Error occurred while reading HTTP request body",
+		   e, cuid);
+      return true;
+    }
+  } else {
+    if(_timeout.elapsed(30)) {
+      logger->info("HTTP request body timeout.");
+      return true;
+    } else {
+      _e->commands.push_back(this);
+      return false;
+    }
+  }
+}
+
+} // namespace aria2