Changeset 1040

Timestamp:

02/28/08 19:54:36 (2 years ago)

Author:

rakshasa

Message:

* Added {get/set}_xmlrpc_size_limit to allow the user to specify
larger buffer size for handling direct loading of torrents through
xmlrpc.

* Allow file and tracker targets with the compact xmlrpc syntax,
e.g. "<infohash>:f<id>".

* Fixed an alignment bug in the DHT code.

Location:

trunk

Files:

• libtorrent/src/dht/dht_node.cc (modified) (2 diffs)
• libtorrent/src/download/download_info.h (modified) (2 diffs)
• rtorrent/src/command_network.cc (modified) (1 diff)
• rtorrent/src/rpc/xmlrpc.cc (modified) (4 diffs)
• rtorrent/src/rpc/xmlrpc.h (modified) (1 diff)

trunk/libtorrent/src/dht/dht_node.cc

@@ -41 +41 @@
 #include "torrent/object.h"
 
+// For SACompact...
+#include "download/download_info.h"
+
 #include "dht_node.h"
 
@@ -74 +77 @@
 DhtNode::store_compact(char* buffer) const {
   HashString::cast_from(buffer)->assign(data());
-  *(uint32_t*) (buffer+20) = address()->sa_inet()->address_n();
-  *(uint16_t*) (buffer+24) = address()->sa_inet()->port_n();
-  return buffer+26;
+
+  SocketAddressCompact sa(address()->sa_inet());
+  std::memcpy(buffer + 20, sa.c_str(), 6);
+
+  return buffer + 26;
 }
 

trunk/libtorrent/src/download/download_info.h

@@ -35 +35 @@
 //           3185 Skoppum, NORWAY
 
-#ifndef LIBTORRENT_TRACKER_INFO_H
-#define LIBTORRENT_TRACKER_INFO_H
+#ifndef LIBTORRENT_DOWNLOAD_INFO_H
+#define LIBTORRENT_DOWNLOAD_INFO_H
 
 #include <list>
@@ -190 +190 @@
   SocketAddressCompact() {}
   SocketAddressCompact(uint32_t a, uint16_t p) : addr(a), port(p) {}
+  SocketAddressCompact(const rak::socket_address_inet* sa) : addr(sa->address_n()), port(sa->port_n()) {}
 
   operator rak::socket_address () const {

trunk/rtorrent/src/command_network.cc

@@ -350 +350 @@
   ADD_COMMAND_STRING_UN("scgi_port",            rak::bind2nd(std::ptr_fun(&apply_scgi), 1));
   ADD_COMMAND_STRING_UN("scgi_local",           rak::bind2nd(std::ptr_fun(&apply_scgi), 2));
-  ADD_VARIABLE_BOOL("scgi_dont_route", false);
+  ADD_VARIABLE_BOOL    ("scgi_dont_route", false);
   ADD_COMMAND_STRING_UN("xmlrpc_dialect",       std::ptr_fun(&apply_xmlrpc_dialect));
+  ADD_COMMAND_VALUE_TRI("xmlrpc_size_limit",    std::ptr_fun(&rpc::XmlRpc::set_size_limit), rak::ptr_fun(&rpc::XmlRpc::size_limit));
 
   ADD_COMMAND_VALUE_TRI("hash_read_ahead",      std::ptr_fun(&apply_hash_read_ahead), rak::ptr_fun(torrent::hash_read_ahead));

trunk/rtorrent/src/rpc/xmlrpc.cc

@@ -134 +134 @@
 rpc::target_type
 xmlrpc_to_target(xmlrpc_env* env, xmlrpc_value* value) {
+  rpc::target_type target;
+
   switch (xmlrpc_value_type(value)) {
   case XMLRPC_TYPE_STRING:
@@ -142 +144 @@
       throw xmlrpc_error(env);
 
-    if (std::strlen(str) == 40) {
-      core::Download* download = xmlrpc.get_slot_find_download()(str);
-      ::free((void*)str);
-
-      if (download == NULL)
-        throw xmlrpc_error(XMLRPC_TYPE_ERROR, "Could not find info-hash.");
-
-      return rpc::make_target(download);
-
-    } else if (std::strlen(str) == 0) {
+    if (std::strlen(str) == 0) {
+      // When specifying void, we require a zero-length string.
       ::free((void*)str);
       return rpc::make_target();
+
+    } else if (std::strlen(str) < 40) {
+      ::free((void*)str);
+      throw xmlrpc_error(XMLRPC_TYPE_ERROR, "Unsupported target type found.");
+    }
+
+    core::Download* download = xmlrpc.get_slot_find_download()(str);
+
+    if (download == NULL) {
+      ::free((void*)str);
+      throw xmlrpc_error(XMLRPC_TYPE_ERROR, "Could not find info-hash.");
+    }
+
+    if (std::strlen(str) == 40) {
+      ::free((void*)str);
+      return rpc::make_target(download);
+    }
+
+    if (std::strlen(str) < 42 || str[40] != ':') {
+      ::free((void*)str);
+      throw xmlrpc_error(XMLRPC_TYPE_ERROR, "Unsupported target type found.");
+    }
+
+    // Files:    "<hash>:f<index>"
+    // Trackers: "<hash>:t<index>"
+
+    int index;
+    const char* end;
+
+    switch (str[41]) {
+    case 'f':
+      end = str + 42;
+      index = ::strtol(str + 42, (char**)&end, 0);
+
+      if (*str == '\0' || *end != '\0')
+        throw xmlrpc_error(XMLRPC_TYPE_ERROR, "Invalid index.");
+
+      target = rpc::make_target(XmlRpc::call_file, xmlrpc.get_slot_find_file()(download, index));
+      break;
+
+    case 't':
+      end = str + 42;
+      index = ::strtol(str + 42, (char**)&end, 0);
+
+      if (*str == '\0' || *end != '\0')
+        throw xmlrpc_error(XMLRPC_TYPE_ERROR, "Invalid index.");
+
+      target = rpc::make_target(XmlRpc::call_file, xmlrpc.get_slot_find_tracker()(download, index));
+      break;
+
+    default:
+      ::free((void*)str);
+      throw xmlrpc_error(XMLRPC_TYPE_ERROR, "Unsupported target type found.");
     }
 
     ::free((void*)str);
-    throw xmlrpc_error(XMLRPC_TYPE_ERROR, "Unsupported target type found.");
+
+    // Check if the target pointer is NULL.
+    if (target.second == NULL)
+      throw xmlrpc_error(XMLRPC_TYPE_ERROR, "Invalid index.");
+
+    return target;
 
   default:
@@ -462 +514 @@
 }
 
+int64_t
+XmlRpc::size_limit() {
+  return xmlrpc_limit_get(XMLRPC_XML_SIZE_LIMIT_ID);
+}
+
+void
+XmlRpc::set_size_limit(uint64_t size) {
+  if (size >= (64 << 20))
+    throw torrent::input_error("Invalid XMLRPC limit size.");
+
+  xmlrpc_limit_set(XMLRPC_XML_SIZE_LIMIT_ID, size);
+}
+
 #else
 
@@ -472 +537 @@
 bool XmlRpc::process(__UNUSED const char* inBuffer, __UNUSED uint32_t length, __UNUSED slot_write slotWrite) { return false; }
 
-#endif
-
-}
+int64_t XmlRpc::size_limit() { return 0; }
+void    XmlRpc::set_size_limit(int64_t size) {}
+
+#endif
+
+}

trunk/rtorrent/src/rpc/xmlrpc.h

@@ -95 +95 @@
   void                set_slot_find_tracker(slot_find_tracker::base_type* slot)   { m_slotFindTracker.set(slot); }
 
+  static int64_t      size_limit();
+  static void         set_size_limit(uint64_t size);
+
 private:
   void*               m_env;