2008-02-20 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

	IPv6 support for SocketCore class.
	TODO: In SocketCore::establishConnection(), this is insufficient 
to
	determin the failure of connect() here because the socket is
	non-blocking state. The next addresses should be tried after 
select().
	TODO: NameResolver still uses c-ares(<= 1.4) 
ares_gethostbyname().
	If c-ares 1.5 or newer is installed, ares_getaddrinfo() should 
be used
	instead which address family independent.
	TODO: DHTRoutingTable{Deserializer,Serializer} currently saves 
peer
	information in a compact peer format which is for IPv4 only.
	
	Some BitTorrent functions in PeerMessageUtil still depends on 
IPv4 but
	this is a spec of BitTorrent protocol.
	* src/SocketCore.{h, cc}
	* src/PeerMessageUtil.cc
	* test/SocketCoreTest.cc
	* test/PeerMessageUtilTest.cc
	* test/DHTConnectionImplTest.cc

	Handle IPv4-mapped addresses.
	* src/DHTNode.cc: Now identity is determined by node id.
	* src/DHTMessageTrackerEntry.cc

	Because now PeerMessageUtil::unpackcompact() could fail, the 
caller
	should handle it.
	* src/DHTRoutingTableDeserializer.cc
	* src/DHTMessageFactoryImpl.cc

1 files changed, 13 insertions, 2 deletions

diff --git a/src/DHTMessageTrackerEntry.cc b/src/DHTMessageTrackerEntry.cc
index dc7c0ecf..25204e17 100644
--- a/src/DHTMessageTrackerEntry.cc
+++ b/src/DHTMessageTrackerEntry.cc
@@ -37,6 +37,7 @@
 #include "DHTMessage.h"
 #include "DHTMessageCallback.h"
 #include "DHTConstants.h"
+#include "Util.h"
 
 namespace aria2 {
 
@@ -60,8 +61,18 @@ void DHTMessageTrackerEntry::extendTimeout()
 
 bool DHTMessageTrackerEntry::match(const std::string& transactionID, const std::string& ipaddr, uint16_t port) const
 {
-  return _transactionID == transactionID &&
-    _targetNode->getIPAddress() == ipaddr && _targetNode->getPort() == port;
+  if(_transactionID != transactionID || _targetNode->getPort() != port) {
+    return false;
+  }
+  if(_targetNode->getIPAddress() == ipaddr) {
+    return true;
+  }
+  if(Util::endsWith(_targetNode->getIPAddress(), ipaddr)) {
+    return _targetNode->getIPAddress() == "::ffff:"+ipaddr;
+  } else if(Util::endsWith(ipaddr, _targetNode->getIPAddress())) {
+    return ipaddr == "::ffff:"+_targetNode->getIPAddress();
+  }
+  return false;
 }
 
 SharedHandle<DHTMessageCallback> DHTMessageTrackerEntry::getCallback() const