* Added XMLRPC-C support and hooked it up to FastCGI. Calling a test

function is now possible.


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@887 e378c898-3ddf-0310-93e7-cc216c733640

src/rpc/Makefile.am

@@ -2,6 +2,8 @@ noinst_LIBRARIES = libsub_rpc.a
 
 libsub_rpc_a_SOURCES = \
 	fast_cgi.cc \
-	fast_cgi.h
+	fast_cgi.h \
+	xmlrpc.h \
+	xmlrpc.cc
 
 INCLUDES = -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)

src/rpc/fast_cgi.cc

@@ -43,6 +43,7 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <rak/functional_fun.h>
 #include <torrent/exceptions.h>
 
 #include "globals.h"
@@ -116,6 +117,7 @@ FastCgi::event_read() {
   int length;
   char* endPtr;
   char* buffer = NULL;
+  slot_write slotWrite;
 
   const char* contentLength = FCGX_GetParam("CONTENT_LENGTH", m_request->envp);
 
@@ -131,14 +133,15 @@ FastCgi::event_read() {
     goto event_read_exit;
   }
 
-  if (FCGX_PutS("This worked!!!", m_request->out) == -1) {
+  slotWrite.set(rak::mem_fn(this, &FastCgi::receive_write));
+
+  if (!m_slotProcess(buffer, length, slotWrite) ||
+      FCGX_FFlush(m_request->out) == -1) {
     control->core()->push_log("FastCGI could not write data.");
     goto event_read_exit;
   }
 
-  control->core()->push_log("Got a message: " + std::string(buffer, buffer + 30));
-
-  FCGX_Finish_r(m_request);
+  control->core()->push_log("Processed an XMLRPC call.");
 
 event_read_exit:
   FCGX_Finish_r(m_request);
@@ -154,6 +157,15 @@ FastCgi::event_error() {
   throw torrent::internal_error("FastCgi::event_error().");
 }
 
+bool
+FastCgi::receive_write(const char* buffer, uint32_t length) {
+  return
+    FCGX_FPrintF(m_request->out,
+                 "Content-type: text/plain\r\n"
+                 "Content-length: %i\r\n\r\n", length) != -1 &&
+    FCGX_PutStr(buffer, length, m_request->out) != -1;
+}
+
 #else
 
 FastCgi::FastCgi(const std::string& path) { throw torrent::resource_error("FastCGI not supported."); }
@@ -162,6 +174,8 @@ void FastCgi::event_read() {}
 void FastCgi::event_write() {}
 void FastCgi::event_error() {}
 
+void FastCgi::receive_write(const char* buffer, uint32_t length);
+
 #endif
 
 }

src/rpc/fast_cgi.h

@@ -42,24 +42,38 @@
 
 struct FCGX_Request;
 
+namespace rak {
+  template <typename Result, typename Arg1, typename Arg2> class function2;
+  template <typename Result, typename Arg1, typename Arg2, typename Arg3> class function3;
+}
+
 namespace rpc {
 
 class FastCgi : public torrent::Event {
 public:
+  typedef rak::function2<bool, const char*, uint32_t>             slot_write;
+  typedef rak::function3<bool, const char*, uint32_t, slot_write> slot_process;
+
   FastCgi(const std::string& path);
   virtual ~FastCgi();
 
   const std::string   path() const { return m_path; }
 
+  void                set_slot_process(slot_process::base_type* s) { m_slotProcess.set(s); }
+
   virtual void        event_read();
   virtual void        event_write();
   virtual void        event_error();
 
+  bool                receive_write(const char* buffer, uint32_t length);
+
 private:
   static bool         m_initialized;
 
   FCGX_Request*       m_request;
   std::string         m_path;
+
+  slot_process        m_slotProcess;
 };
 
 }

src/rpc/xmlrpc.cc

@@ -0,0 +1,93 @@
+// rTorrent - BitTorrent client
+// Copyright (C) 2005-2006, Jari Sundell
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  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.
+//
+// Contact:  Jari Sundell <jaris@ifi.uio.no>
+//
+//           Skomakerveien 33
+//           3185 Skoppum, NORWAY
+
+#include "config.h"
+
+#include <xmlrpc.h>
+#include <xmlrpc_server.h>
+
+#include "xmlrpc.h"
+
+namespace rpc {
+
+xmlrpc_value*
+xmlrpc_test_add(xmlrpc_env* env, xmlrpc_value* value, void* serverInfo) {
+  // Grabbed from the XMLRPC-C examples.
+  xmlrpc_int32 x, y, z;
+
+  /* Parse our argument array. */
+  xmlrpc_parse_value(env, value, "(ii)", &x, &y);
+  if (env->fault_occurred)
+    return NULL;
+
+  /* Add our two numbers. */
+  z = x + y;
+
+  /* Return our result. */
+  return xmlrpc_build_value(env, "i", z);
+}
+
+XmlRpc::XmlRpc() : m_env(new xmlrpc_env) {
+  xmlrpc_env_init(m_env);
+
+  m_registry = xmlrpc_registry_new(m_env);
+
+  // Move this out.
+  xmlrpc_registry_add_method_w_doc(m_env, m_registry, NULL, "my.test", &xmlrpc_test_add, new int, "i:ii", "Not much.");
+}
+
+XmlRpc::~XmlRpc() {
+  xmlrpc_registry_free(m_registry);
+  xmlrpc_env_clean(m_env);
+  delete m_env;
+}
+
+bool
+XmlRpc::process(const char* inBuffer, uint32_t length, slot_write slotWrite) {
+  xmlrpc_env localEnv;
+  xmlrpc_env_init(&localEnv);
+
+  xmlrpc_mem_block* memblock = xmlrpc_registry_process_call(&localEnv, m_registry, NULL, inBuffer, length);
+
+  bool result = slotWrite((const char*)xmlrpc_mem_block_contents(memblock),
+                          xmlrpc_mem_block_size(memblock));
+
+  xmlrpc_mem_block_free(memblock);
+  xmlrpc_env_clean(&localEnv);
+  return result;
+}
+
+}

src/rpc/xmlrpc.h

@@ -0,0 +1,63 @@
+// rTorrent - BitTorrent client
+// Copyright (C) 2005-2006, Jari Sundell
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  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.
+//
+// Contact:  Jari Sundell <jaris@ifi.uio.no>
+//
+//           Skomakerveien 33
+//           3185 Skoppum, NORWAY
+
+#ifndef RTORRENT_RPC_XMLRPC_H
+#define RTORRENT_RPC_XMLRPC_H
+
+#include <rak/functional_fun.h>
+
+typedef struct _xmlrpc_env xmlrpc_env;
+typedef struct _xmlrpc_registry xmlrpc_registry;
+
+namespace rpc {
+
+class XmlRpc {
+public:
+  typedef rak::function2<bool, const char*, uint32_t> slot_write;
+
+  XmlRpc();
+  ~XmlRpc();
+
+  bool                process(const char* inBuffer, uint32_t length, slot_write slotWrite);
+
+private:
+  xmlrpc_env*         m_env;
+  xmlrpc_registry*    m_registry;
+};
+
+}
+
+#endif