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

diff --git a/src/UTPexExtensionMessage.cc b/src/UTPexExtensionMessage.cc
new file mode 100644
index 00000000..c8395ed8
--- /dev/null
+++ b/src/UTPexExtensionMessage.cc
@@ -0,0 +1,149 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2006 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "UTPexExtensionMessage.h"
+#include "Peer.h"
+#include "BtContext.h"
+#include "Dictionary.h"
+#include "Data.h"
+#include "BencodeVisitor.h"
+#include "a2netcompat.h"
+#include "Util.h"
+#include "PeerMessageUtil.h"
+#include "BtRegistry.h"
+#include "CompactPeerListProcessor.h"
+#include "MetaFileUtil.h"
+#include "DlAbortEx.h"
+#include "message.h"
+
+const string UTPexExtensionMessage::EXTENSION_NAME = "ut_pex";
+
+UTPexExtensionMessage::UTPexExtensionMessage(uint8_t extensionMessageID):
+  _extensionMessageID(extensionMessageID),
+  _btContext(0) {}
+
+UTPexExtensionMessage::~UTPexExtensionMessage() {}
+
+string UTPexExtensionMessage::getBencodedData()
+{
+  SharedHandle<Dictionary> d = new Dictionary();
+  pair<string, string> freshPeerPair = createCompactPeerListAndFlag(_freshPeers);
+  pair<string, string> droppedPeerPair = createCompactPeerListAndFlag(_droppedPeers);
+  d->put("added", new Data(freshPeerPair.first));
+  d->put("added.f", new Data(freshPeerPair.second));
+  d->put("dropped", new Data(droppedPeerPair.first));
+
+  BencodeVisitor v;
+  d->accept(&v);
+  return v.getBencodedData();
+}
+
+pair<string, string> UTPexExtensionMessage::createCompactPeerListAndFlag(const Peers& peers)
+{
+  string addrstring;
+  string flagstring;
+  for(Peers::const_iterator itr = peers.begin(); itr != peers.end(); ++itr) {
+    char compact[6];
+    if(PeerMessageUtil::createcompact(compact, (*itr)->ipaddr, (*itr)->port)) {
+      addrstring.append(&compact[0], &compact[6]);
+      flagstring += (*itr)->isSeeder() ? "2" : "0";
+    }
+  }
+  return pair<string, string>(addrstring, flagstring);
+}
+
+string UTPexExtensionMessage::toString() const
+{
+  return "ut_pex added="+Util::uitos(_freshPeers.size())+", dropped="+
+    Util::uitos(_droppedPeers.size());
+}
+
+void UTPexExtensionMessage::doReceivedAction()
+{
+  PEER_STORAGE(_btContext)->addPeer(_freshPeers);
+}
+
+void UTPexExtensionMessage::addFreshPeer(const PeerHandle& peer)
+{
+  _freshPeers.push_back(peer);
+}
+
+const Peers& UTPexExtensionMessage::getFreshPeers() const
+{
+  return _freshPeers;
+}
+
+void UTPexExtensionMessage::addDroppedPeer(const PeerHandle& peer)
+{
+  _droppedPeers.push_back(peer);
+}
+
+const Peers& UTPexExtensionMessage::getDroppedPeers() const
+{
+  return _droppedPeers;
+}
+
+void UTPexExtensionMessage::setBtContext(const BtContextHandle& btContext)
+{
+  _btContext = btContext;
+}
+
+UTPexExtensionMessageHandle
+UTPexExtensionMessage::create(const BtContextHandle& btContext,
+			      const char* data, size_t len)
+{
+  if(len < 1) {
+    throw new DlAbortEx(MSG_TOO_SMALL_PAYLOAD_SIZE,
+			EXTENSION_NAME.c_str(), len);
+  }
+  UTPexExtensionMessageHandle msg = new UTPexExtensionMessage(*data);
+  SharedHandle<MetaEntry> root = MetaFileUtil::bdecoding(data+1, len-1);
+  if(root.isNull()) {
+    return msg;
+  }
+  const Dictionary* d = dynamic_cast<const Dictionary*>(root.get());
+  if(d) {
+    CompactPeerListProcessor proc(btContext->getPieceLength(),
+				  btContext->getTotalLength());
+    const Data* added = dynamic_cast<const Data*>(d->get("added"));
+    if(added) {
+      msg->_freshPeers = proc.extractPeer(added);
+    }
+    const Data* dropped = dynamic_cast<const Data*>(d->get("dropped"));
+    if(dropped) {
+      msg->_droppedPeers = proc.extractPeer(dropped);
+    }
+  }
+  return msg;
+}