Changeset 1027

Timestamp:

01/12/08 13:39:19 (4 years ago)

Author:

rakshasa

Message:

* Fixed a race condition in the handshake read/write code. Patch by
Josef Drexler.

* Fixed the --with-xmlrpc-c autoconf check so that you can pass an
alternative path to an xmlrpc-c-config script.

Location:

trunk

Files:

• libtorrent/scripts/checks.m4 (modified) (1 diff)
• libtorrent/src/protocol/handshake.cc (modified) (5 diffs)
• rtorrent/scripts/checks.m4 (modified) (2 diffs)

trunk/libtorrent/scripts/checks.m4

@@ -370 +370 @@
 
     else
-      if eval xmlrpc-c-config --version 2>/dev/null >/dev/null; then
-        CXXFLAGS="$CXXFLAGS `xmlrpc-c-config --cflags server-util`"
-        LIBS="$LIBS `xmlrpc-c-config server-util --libs`"
+      if test "$withval" = "yes"; then
+        xmlrpc_cc_prg="xmlrpc-c-config"
+      else
+        xmlrpc_cc_prg="$withval"
+      fi
+      
+      if eval $xmlrpc_cc_prg --version 2>/dev/null >/dev/null; then
+        CXXFLAGS="$CXXFLAGS `$xmlrpc_cc_prg --cflags server-util`"
+        LIBS="$LIBS `$xmlrpc_cc_prg server-util --libs`"
 
         AC_TRY_LINK(

trunk/libtorrent/src/protocol/handshake.cc

@@ -526 +526 @@
 
   // The download is just starting so we're not sending any
-  // bitfield.
+  // bitfield. Pretend we wrote it already.
   if (m_download->file_list()->bitfield()->is_all_unset())
-    prepare_post_handshake(true);
+    m_writePos = m_download->file_list()->bitfield()->size_bytes();
   else
     prepare_bitfield();
@@ -618 +618 @@
   }
 
+  // Should've started to write post handshake data already, but we were
+  // still reading the bitfield/extension and postponed it. If we had no
+  // bitfield to send, we need to send a keep-alive now.
+  if (m_writePos == m_download->file_list()->bitfield()->size_bytes())
+    prepare_post_handshake(m_download->file_list()->bitfield()->is_all_unset());
+
   if (m_writeDone)
     throw handshake_succeeded();
@@ -1021 +1027 @@
 void
 Handshake::prepare_post_handshake(bool must_write) {
+  if (m_writePos != m_download->file_list()->bitfield()->size_bytes())
+    throw internal_error("Handshake::prepare_post_handshake called while bitfield not written completely.");
+
   m_state = POST_HANDSHAKE;
 
@@ -1042 +1051 @@
   if (!m_writeBuffer.remaining())
     write_done();
-
-  // Skip writting the bitfield.
-  m_writePos = m_download->file_list()->bitfield()->size_bytes();
 }
 
@@ -1122 +1128 @@
   }
 
-  if (m_writePos == bitfield->size_bytes())
-    prepare_post_handshake(false);
+  // We can't call prepare_post_handshake until the read code is done reading
+  // the bitfield, so if we get here before then, postpone the post handshake
+  // data until reading is done. Since we're done writing, remove us from the
+  // poll in that case.
+  if (m_writePos == bitfield->size_bytes()) {
+    if (!m_readDone)
+      manager->poll()->remove_write(this);
+    else
+      prepare_post_handshake(false);
+  }
 }
 

trunk/rtorrent/scripts/checks.m4

@@ -292 +292 @@
 ])
 
+AC_DEFUN([TORRENT_CHECK_TR1], [
+  AC_LANG_PUSH(C++)
+  AC_MSG_CHECKING(for TR1 support)
+
+  AC_COMPILE_IFELSE(
+    [[#include <tr1/unordered_map>
+      class Foo;
+      typedef std::tr1::unordered_map<Foo*, int> Bar;
+    ]],
+    [
+      AC_MSG_RESULT(yes)
+      AC_DEFINE(HAVE_TR1, 1, Define to 1 if your C++ library supports the extensions from Technical Report 1)
+    ],
+    [
+      AC_MSG_RESULT(no)
+    ]
+  )
+
+  AC_LANG_POP(C++)
+])
 
 AC_DEFUN([TORRENT_WITH_FASTCGI], [
@@ -350 +370 @@
 
     else
-      if eval xmlrpc-c-config --version 2>/dev/null >/dev/null; then
-        CXXFLAGS="$CXXFLAGS `xmlrpc-c-config --cflags server-util`"
-        LIBS="$LIBS `xmlrpc-c-config server-util --libs`"
+      if test "$withval" = "yes"; then
+        xmlrpc_cc_prg="xmlrpc-c-config"
+      else
+        xmlrpc_cc_prg="$withval"
+      fi
+      
+      if eval $xmlrpc_cc_prg --version 2>/dev/null >/dev/null; then
+        CXXFLAGS="$CXXFLAGS `$xmlrpc_cc_prg --cflags server-util`"
+        LIBS="$LIBS `$xmlrpc_cc_prg server-util --libs`"
 
         AC_TRY_LINK(