2010-08-03 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Added bittorrent::packcompact() which replaces
	bittorrent::createcompact() and supports IPv6 addresses. Rewritten
	bittorrent::unpackcompact() and bittorrent::extractPeer() to
	support IPv6 addresses. Fixed added.f flags in ut_pex.
	* src/BtConstants.h
	* src/DHTFindNodeReplyMessage.cc
	* src/DHTGetPeersReplyMessage.cc
	* src/DHTMessageFactoryImpl.cc
	* src/DHTRoutingTableDeserializer.cc
	* src/DHTRoutingTableSerializer.cc
	* src/DHTTokenTracker.cc
	* src/DefaultBtAnnounce.cc
	* src/UTPexExtensionMessage.cc
	* src/bittorrent_helper.cc
	* src/bittorrent_helper.h
	* test/BittorrentHelperTest.cc
	* test/DHTFindNodeReplyMessageTest.cc
	* test/DHTGetPeersReplyMessageTest.cc
	* test/DHTMessageFactoryImplTest.cc
	* test/DHTRoutingTableSerializerTest.cc
	* test/DefaultExtensionMessageFactoryTest.cc
	* test/UTPexExtensionMessageTest.cc

1 files changed, 12 insertions, 12 deletions

diff --git a/test/DHTMessageFactoryImplTest.cc b/test/DHTMessageFactoryImplTest.cc
index 272c2d14..6210c27a 100644
--- a/test/DHTMessageFactoryImplTest.cc
+++ b/test/DHTMessageFactoryImplTest.cc
@@ -168,12 +168,12 @@ void DHTMessageFactoryImplTest::testCreateFindNodeReplyMessage()
       nodes[i]->setIPAddress("192.168.0."+util::uitos(i+1));
       nodes[i]->setPort(6881+i);
 
-      unsigned char buf[6];
-      CPPUNIT_ASSERT(bittorrent::createcompact
-                     (buf, nodes[i]->getIPAddress(), nodes[i]->getPort()));
+      unsigned char buf[COMPACT_LEN_IPV6];
+      bittorrent::packcompact
+        (buf, nodes[i]->getIPAddress(), nodes[i]->getPort());
       compactNodeInfo +=
         std::string(&nodes[i]->getID()[0], &nodes[i]->getID()[DHT_ID_LENGTH])+
-        std::string(&buf[0], &buf[sizeof(buf)]);
+        std::string(&buf[0], &buf[COMPACT_LEN_IPV4]);
     }
     rDict->put("nodes", compactNodeInfo);
     dict.put("r", rDict);
@@ -243,12 +243,12 @@ void DHTMessageFactoryImplTest::testCreateGetPeersReplyMessage_nodes()
       nodes[i]->setIPAddress("192.168.0."+util::uitos(i+1));
       nodes[i]->setPort(6881+i);
 
-      unsigned char buf[6];
-      CPPUNIT_ASSERT(bittorrent::createcompact
-                     (buf, nodes[i]->getIPAddress(), nodes[i]->getPort()));
+      unsigned char buf[COMPACT_LEN_IPV6];
+      bittorrent::packcompact
+        (buf, nodes[i]->getIPAddress(), nodes[i]->getPort());
       compactNodeInfo +=
         std::string(&nodes[i]->getID()[0], &nodes[i]->getID()[DHT_ID_LENGTH])+
-        std::string(&buf[0], &buf[sizeof(buf)]);
+        std::string(&buf[0], &buf[COMPACT_LEN_IPV4]);
     }
     rDict->put("nodes", compactNodeInfo);
     rDict->put("token", "token");
@@ -290,10 +290,10 @@ void DHTMessageFactoryImplTest::testCreateGetPeersReplyMessage_values()
     SharedHandle<List> valuesList = List::g();
     for(size_t i = 0; i < 4; ++i) {
       SharedHandle<Peer> peer(new Peer("192.168.0."+util::uitos(i+1), 6881+i));
-      unsigned char buffer[6];
-      CPPUNIT_ASSERT(bittorrent::createcompact
-                     (buffer, peer->getIPAddress(), peer->getPort()));
-      valuesList->append(String::g(buffer, sizeof(buffer)));
+      unsigned char buffer[COMPACT_LEN_IPV6];
+      bittorrent::packcompact
+        (buffer, peer->getIPAddress(), peer->getPort());
+      valuesList->append(String::g(buffer, COMPACT_LEN_IPV4));
       peers.push_back(peer);
     }
     rDict->put("values", valuesList);