Changeset 1094

Timestamp:

06/10/09 12:25:38 (9 months ago)

Author:

rakshasa

Message:

* Added flag to bencode when unordered bencoded strings are read.

Location:

trunk/libtorrent/src

Files:

• download/download_constructor.cc (modified) (1 diff)
• torrent/object.h (modified) (2 diffs)
• torrent/object_stream.cc (modified) (3 diffs)
• torrent/poll_kqueue.cc (modified) (2 diffs)

trunk/libtorrent/src/download/download_constructor.cc

@@ -133 +133 @@
     throw internal_error("parse_info received an already initialized Content object.");
 
+  if (b.flags() & Object::flag_unordered)
+    throw input_error("Download has unordered info dictionary.");
+
   uint32_t chunkSize = b.get_key_value("piece length");
 

trunk/libtorrent/src/torrent/object.h

@@ -76 +76 @@
   static const uint32_t mask_public   = ~mask_internal;
 
+  static const uint32_t flag_unordered = 0x100;    // bencode dictionary was not sorted
+
   enum type_type {
     TYPE_NONE,
@@ -109 +111 @@
   void                set_flags(uint32_t f)                   { m_flags |= f & mask_public; }
   void                unset_flags(uint32_t f)                 { m_flags &= ~(f & mask_public); }
+
+  void                set_internal_flags(uint32_t f)          { m_flags |= f & (mask_internal & ~mask_type); }
+  void                unset_internal_flags(uint32_t f)        { m_flags &= ~(f & (mask_internal & ~mask_type)); }
 
   // Add functions for setting/clearing the public flags.

trunk/libtorrent/src/torrent/object_stream.cc

@@ -97 +97 @@
       Object::list_iterator itr = object->as_list().insert(object->as_list().end(), Object());
       object_read_bencode(input, &*itr, depth);
+
+      if (itr->flags() & Object::flag_unordered)
+        object->set_internal_flags(Object::flag_unordered);
     }
 
@@ -108 +111 @@
       break;
 
-    //    Object::string_type last;
+    Object::string_type last;
 
     while (input->good()) {
@@ -121 +124 @@
         break;
 
-      //      if (last >= str)
-      //        break;
-
-      object_read_bencode(input, &object->as_map()[str], depth);
-
-      //      str.swap(last);
+      if (last >= str)
+        object->set_internal_flags(Object::flag_unordered);
+
+      Object* value = &object->as_map()[str];
+      object_read_bencode(input, value, depth);
+
+      if (value->flags() & Object::flag_unordered)
+        object->set_internal_flags(Object::flag_unordered);
+
+      str.swap(last);
     }
 

trunk/libtorrent/src/torrent/poll_kqueue.cc

@@ -55 +55 @@
 #endif
 
+#include <assert.h>
+
 namespace torrent {
 
@@ -89 +91 @@
 PollKQueue::modify(Event* event, unsigned short op, short mask) {
   // Flush the changed filters to the kernel if the buffer is full.
-  if (m_changedEvents == m_table.size())
-    flush_events();
-
   if (m_changedEvents == m_maxEvents) {
     if (kevent(m_fd, m_changes, m_changedEvents, NULL, 0, NULL) == -1)