Changeset 1040 for trunk/rtorrent/src/rpc/xmlrpc.cc

Timestamp:

02/28/08 14:54:36 (4 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.

Files:

• trunk/rtorrent/src/rpc/xmlrpc.cc (modified) (4 diffs)

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
+
+}