2007-12-22 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

	Added uTorrent compatible Peer Exchange.
	* src/BencodeVisitor.{h, cc}
	* test/BencodeVisitorTest.cc
	* src/BtConstants.h
	* src/BtContext.h: Added 'private' flag.
	* src/BtExtendedMessage.{h, cc}
	* test/BtExtendedMessageTest.cc
	* src/BtHandshakeMessage.{h, cc}: Set extended messaging bit in
	reserved field.
	* test/BtHandshakeMessageTest.cc
	* src/BtMessageFactory.h
	* src/BtRegistry.h
	* src/BtRuntime.h: This class holds default extension message 
IDs for
	aria2. By default, aria2 uses ID 8 for ut_pex.
	* src/DefaultBtContext.cc
	* src/DefaultBtInteractive.{h, cc}: This class holds 
_utPexEnabled.
	When it is true, aria2 enables ut_pex. This value is set by
	PeerInteractionCommand.
	* src/DefaultBtMessageFactory.{h, cc}
	* test/DefaultBtMessageFactoryTest.cc
	* src/DefaultBtMessageReceiver.cc: Moved the code of fast 
extension
	handling to DefaultBtInteractive class.
	* src/DefaultExtensionMessageFactory.{h, cc}
	* test/DefaultExtensionMessageFactoryTest.cc
	* src/DefaultPeerStorage.cc: Returns false if a peer is already 
in
	the container(peers and incomingPeers. The equality is 
determined by
	Peer::id).
	* test/DefaultPeerStorageTest.cc
	* src/ExtensionMessage.h
	* test/MockExtensionMessage.h
	* src/ExtensionMessageFactory.h
	* test/MockExtensionMessageFactory.h
	* src/HandshakeExtensionMessage.{h, cc}
	* test/HandshakeExtensionMessageTest.cc
	* src/MetaEntry.h
	* src/Peer.{h, cc}
	* src/PeerInteractionCommand.cc
	* src/PeerReceiveHandshakeCommand.cc: Evaluate the return value 
of
	addIncomingPeer.
	* src/PeerMessageUtil.{h, cc}
	* src/PeerObject.h
	* src/UTPexExtensionMessage.{h, cc}
	* test/UTPexExtensionMessageTest.cc
	* src/message.h
	* src/prefs.h

	Fixed the bug that returns incomplete data when it contains null
	character. A convenient constructor was also added.
	* src/Data.{h, cc}

	Rewritten.
	* src/CompactPeerListProcessor.cc

	Fixed typos.
	* src/message.h
	* src/MetaFileUtil.cc

1 files changed, 70 insertions, 0 deletions

diff --git a/test/BencodeVisitorTest.cc b/test/BencodeVisitorTest.cc
new file mode 100644
index 00000000..3af7e0b4
--- /dev/null
+++ b/test/BencodeVisitorTest.cc
@@ -0,0 +1,70 @@
+#include "BencodeVisitor.h"
+#include "Data.h"
+#include "List.h"
+#include "Dictionary.h"
+#include <cppunit/extensions/HelperMacros.h>
+
+class BencodeVisitorTest:public CppUnit::TestFixture {
+
+  CPPUNIT_TEST_SUITE(BencodeVisitorTest);
+  CPPUNIT_TEST(testVisit_data);
+  CPPUNIT_TEST(testVisit_list);
+  CPPUNIT_TEST(testVisit_dictionary);
+  CPPUNIT_TEST_SUITE_END();
+private:
+
+public:
+  void setUp() {
+  }
+
+  void testVisit_data();
+  void testVisit_list();
+  void testVisit_dictionary();
+};
+
+
+CPPUNIT_TEST_SUITE_REGISTRATION( BencodeVisitorTest );
+
+void BencodeVisitorTest::testVisit_data()
+{
+  {
+    BencodeVisitor v;
+    string str = "apple";
+    MetaEntryHandle m = new Data(str.c_str(), str.size());
+    m->accept(&v);
+    CPPUNIT_ASSERT_EQUAL(string("5:apple"), v.getBencodedData());
+  }
+  {
+    BencodeVisitor v;
+    string str = "123";
+    MetaEntryHandle m = new Data(str.c_str(), str.size(), true);
+    m->accept(&v);
+    CPPUNIT_ASSERT_EQUAL(string("i123e"), v.getBencodedData());
+  }
+}
+
+void BencodeVisitorTest::testVisit_list()
+{
+  BencodeVisitor v;
+  List l;
+  string s1 = "alpha";
+  l.add(new Data(s1.c_str(), s1.size()));
+  string s2 = "bravo";
+  l.add(new Data(s2.c_str(), s2.size()));
+  string s3 = "123";
+  l.add(new Data(s3.c_str(), s3.size(), true));
+  l.accept(&v);
+  CPPUNIT_ASSERT_EQUAL(string("l5:alpha5:bravoi123ee"), v.getBencodedData());
+}
+
+void BencodeVisitorTest::testVisit_dictionary()
+{
+  BencodeVisitor v;
+  Dictionary d;
+  string s1 = "alpha";
+  d.put("team", new Data(s1.c_str(), s1.size()));
+  string s2 = "123";
+  d.put("score", new Data(s2.c_str(), s2.size(), true));
+  d.accept(&v);
+  CPPUNIT_ASSERT_EQUAL(string("d4:team5:alpha5:scorei123ee"), v.getBencodedData());
+}