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, 155 insertions, 0 deletions

diff --git a/test/HandshakeExtensionMessageTest.cc b/test/HandshakeExtensionMessageTest.cc
new file mode 100644
index 00000000..6cecd611
--- /dev/null
+++ b/test/HandshakeExtensionMessageTest.cc
@@ -0,0 +1,155 @@
+#include "HandshakeExtensionMessage.h"
+#include "Peer.h"
+#include "MockBtContext.h"
+#include "MockPeerStorage.h"
+#include "BtRegistry.h"
+#include <cppunit/extensions/HelperMacros.h>
+
+class HandshakeExtensionMessageTest:public CppUnit::TestFixture {
+
+  CPPUNIT_TEST_SUITE(HandshakeExtensionMessageTest);
+  CPPUNIT_TEST(testGetExtensionMessageID);
+  CPPUNIT_TEST(testGetExtensionName);
+  CPPUNIT_TEST(testGetBencodedData);
+  CPPUNIT_TEST(testToString);
+  CPPUNIT_TEST(testDoReceivedAction);
+  CPPUNIT_TEST(testCreate);
+  CPPUNIT_TEST(testCreate_stringnum);
+  CPPUNIT_TEST_SUITE_END();
+private:
+  BtContextHandle _btContext;
+public:
+  HandshakeExtensionMessageTest():_btContext(0) {}
+
+  void setUp()
+  {
+    BtRegistry::unregisterAll();
+    MockBtContextHandle btContext = new MockBtContext();
+    unsigned char infohash[20];
+    memset(infohash, 0, sizeof(infohash));
+    btContext->setInfoHash(infohash);
+    _btContext = btContext;
+    MockPeerStorageHandle peerStorage = new MockPeerStorage();
+    BtRegistry::registerPeerStorage(_btContext->getInfoHashAsString(),
+				    peerStorage);
+  }
+
+  void tearDown()
+  {
+    BtRegistry::unregisterAll();
+  }
+
+  void testGetExtensionMessageID();
+  void testGetExtensionName();
+  void testGetBencodedData();
+  void testToString();
+  void testDoReceivedAction();
+  void testCreate();
+  void testCreate_stringnum();
+};
+
+
+CPPUNIT_TEST_SUITE_REGISTRATION(HandshakeExtensionMessageTest);
+
+void HandshakeExtensionMessageTest::testGetExtensionMessageID()
+{
+  HandshakeExtensionMessage msg;
+  CPPUNIT_ASSERT_EQUAL((uint8_t)0, msg.getExtensionMessageID());
+}
+
+void HandshakeExtensionMessageTest::testGetExtensionName()
+{
+  HandshakeExtensionMessage msg;
+  CPPUNIT_ASSERT_EQUAL(string("handshake"), msg.getExtensionName());
+}
+
+void HandshakeExtensionMessageTest::testGetBencodedData()
+{
+  HandshakeExtensionMessage msg;
+  msg.setClientVersion("aria2");
+  msg.setTCPPort(6889);
+  msg.setExtension("ut_pex", 1);
+  msg.setExtension("a2_dht", 2);
+  CPPUNIT_ASSERT_EQUAL(string("d1:v5:aria21:pi6889e1:md6:a2_dhti2e6:ut_pexi1eee"), msg.getBencodedData());
+}
+
+void HandshakeExtensionMessageTest::testToString()
+{
+  HandshakeExtensionMessage msg;
+  msg.setClientVersion("aria2");
+  msg.setTCPPort(6889);
+  msg.setExtension("ut_pex", 1);
+  msg.setExtension("a2_dht", 2);
+  CPPUNIT_ASSERT_EQUAL(string("handshake client=aria2, tcpPort=6889, a2_dht=2, ut_pex=1"), msg.toString());
+}
+
+void HandshakeExtensionMessageTest::testDoReceivedAction()
+{
+  PeerHandle peer = new Peer("192.168.0.1", 0, 1, 1);
+  HandshakeExtensionMessage msg;
+  msg.setClientVersion("aria2");
+  msg.setTCPPort(6889);
+  msg.setExtension("ut_pex", 1);
+  msg.setExtension("a2_dht", 2);
+  msg.setPeer(peer);
+  msg.setBtContext(_btContext);
+
+  msg.doReceivedAction();
+
+  CPPUNIT_ASSERT_EQUAL((uint16_t)6889, peer->port);
+  CPPUNIT_ASSERT_EQUAL((uint8_t)1, peer->getExtensionMessageID("ut_pex"));
+  CPPUNIT_ASSERT_EQUAL((uint8_t)2, peer->getExtensionMessageID("a2_dht"));
+
+  CPPUNIT_ASSERT_EQUAL((size_t)1, PEER_STORAGE(_btContext)->getPeers().size());
+  PeerHandle p1 = PEER_STORAGE(_btContext)->getPeers().front();
+  CPPUNIT_ASSERT_EQUAL(string("192.168.0.1"), p1->ipaddr);
+  CPPUNIT_ASSERT_EQUAL((uint16_t)6889, p1->port);
+}
+
+void HandshakeExtensionMessageTest::testCreate()
+{
+  string in = "0d1:pi6881e1:v5:aria21:md6:ut_pexi1eee";
+  HandshakeExtensionMessageHandle m =
+    HandshakeExtensionMessage::create(in.c_str(), in.size());
+  CPPUNIT_ASSERT_EQUAL(string("aria2"), m->getClientVersion());
+  CPPUNIT_ASSERT_EQUAL((uint16_t)6881, m->getTCPPort());
+  CPPUNIT_ASSERT_EQUAL((uint8_t)1, m->getExtensionMessageID("ut_pex"));
+
+  try {
+    // bad payload format
+    string in = "011:hello world";
+    HandshakeExtensionMessage::create(in.c_str(), in.size());
+    CPPUNIT_FAIL("exception must be thrown.");
+  } catch(Exception* e) {
+    cerr << *e << endl;
+    delete e;
+  }
+  try {
+    // malformed dencoded message
+    string in = "011:hello";
+    HandshakeExtensionMessage::create(in.c_str(), in.size());
+    CPPUNIT_FAIL("exception must be thrown.");
+  } catch(Exception* e) {
+    cerr << *e << endl;
+    delete e;
+  }
+  try {
+    // 0 length data
+    string in = "";
+    HandshakeExtensionMessage::create(in.c_str(), in.size());
+    CPPUNIT_FAIL("exception must be thrown.");
+  } catch(Exception* e) {
+    cerr << *e << endl;
+    delete e;
+  }    
+}
+
+void HandshakeExtensionMessageTest::testCreate_stringnum()
+{
+  string in = "0d1:p4:68811:v5:aria21:md6:ut_pex1:1ee";
+  HandshakeExtensionMessageHandle m =
+    HandshakeExtensionMessage::create(in.c_str(), in.size());
+  CPPUNIT_ASSERT_EQUAL(string("aria2"), m->getClientVersion());
+  CPPUNIT_ASSERT_EQUAL((uint16_t)6881, m->getTCPPort());
+  CPPUNIT_ASSERT_EQUAL((uint8_t)1, m->getExtensionMessageID("ut_pex"));
+}