2006-12-24 06:25:21 +00:00
|
|
|
/* <!-- 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
|
2010-01-05 16:01:46 +00:00
|
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
2006-12-24 06:25:21 +00:00
|
|
|
*
|
|
|
|
* 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 --> */
|
2010-10-31 07:23:53 +00:00
|
|
|
#ifndef D_DEFAULT_BT_INTERACTIVE_H
|
|
|
|
#define D_DEFAULT_BT_INTERACTIVE_H
|
2006-12-24 06:25:21 +00:00
|
|
|
|
|
|
|
#include "BtInteractive.h"
|
2008-11-03 06:49:02 +00:00
|
|
|
|
2008-03-09 12:24:01 +00:00
|
|
|
#include <limits.h>
|
2008-02-08 15:53:45 +00:00
|
|
|
|
2010-04-11 08:28:22 +00:00
|
|
|
#include "TimerA2.h"
|
2010-03-20 14:30:36 +00:00
|
|
|
#include "Command.h"
|
2008-11-03 06:49:02 +00:00
|
|
|
|
2008-02-08 15:53:45 +00:00
|
|
|
namespace aria2 {
|
|
|
|
|
2009-06-28 10:37:15 +00:00
|
|
|
class DownloadContext;
|
2008-11-03 06:49:02 +00:00
|
|
|
class BtRuntime;
|
|
|
|
class PieceStorage;
|
|
|
|
class PeerStorage;
|
2008-02-08 15:53:45 +00:00
|
|
|
class Peer;
|
|
|
|
class BtMessage;
|
|
|
|
class BtMessageReceiver;
|
|
|
|
class BtMessageDispatcher;
|
|
|
|
class BtMessageFactory;
|
|
|
|
class BtRequestFactory;
|
2010-06-13 11:00:43 +00:00
|
|
|
class PeerConnection;
|
2008-11-03 06:49:02 +00:00
|
|
|
class ExtensionMessageFactory;
|
2009-04-25 10:48:00 +00:00
|
|
|
class ExtensionMessageRegistry;
|
2008-02-08 15:53:45 +00:00
|
|
|
class DHTNode;
|
2009-02-28 11:48:26 +00:00
|
|
|
class RequestGroupMan;
|
2009-11-23 13:17:48 +00:00
|
|
|
class UTMetadataRequestFactory;
|
|
|
|
class UTMetadataRequestTracker;
|
2006-12-24 06:25:21 +00:00
|
|
|
|
|
|
|
class FloodingStat {
|
|
|
|
private:
|
2011-12-08 12:38:00 +00:00
|
|
|
int chokeUnchokeCount;
|
|
|
|
int keepAliveCount;
|
2006-12-24 06:25:21 +00:00
|
|
|
public:
|
|
|
|
FloodingStat():chokeUnchokeCount(0), keepAliveCount(0) {}
|
2012-10-01 14:52:22 +00:00
|
|
|
|
2006-12-24 06:25:21 +00:00
|
|
|
void incChokeUnchokeCount() {
|
2011-12-08 12:38:00 +00:00
|
|
|
if(chokeUnchokeCount < INT_MAX) {
|
2006-12-24 06:25:21 +00:00
|
|
|
chokeUnchokeCount++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void incKeepAliveCount() {
|
2011-12-08 12:38:00 +00:00
|
|
|
if(keepAliveCount < INT_MAX) {
|
2006-12-24 06:25:21 +00:00
|
|
|
keepAliveCount++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-12-08 12:38:00 +00:00
|
|
|
int getChokeUnchokeCount() const {
|
2006-12-24 06:25:21 +00:00
|
|
|
return chokeUnchokeCount;
|
|
|
|
}
|
|
|
|
|
2011-12-08 12:38:00 +00:00
|
|
|
int getKeepAliveCount() const {
|
2006-12-24 06:25:21 +00:00
|
|
|
return keepAliveCount;
|
|
|
|
}
|
|
|
|
|
|
|
|
void reset() {
|
|
|
|
chokeUnchokeCount = 0;
|
|
|
|
keepAliveCount = 0;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2008-11-03 06:49:02 +00:00
|
|
|
class DefaultBtInteractive : public BtInteractive {
|
2006-12-24 06:25:21 +00:00
|
|
|
private:
|
2010-06-21 13:51:56 +00:00
|
|
|
cuid_t cuid_;
|
2008-11-03 06:49:02 +00:00
|
|
|
|
2010-06-21 13:51:56 +00:00
|
|
|
SharedHandle<DownloadContext> downloadContext_;
|
2008-11-03 06:49:02 +00:00
|
|
|
|
2010-06-21 13:51:56 +00:00
|
|
|
SharedHandle<BtRuntime> btRuntime_;
|
2008-11-03 06:49:02 +00:00
|
|
|
|
2010-06-21 13:51:56 +00:00
|
|
|
SharedHandle<PieceStorage> pieceStorage_;
|
2008-11-03 06:49:02 +00:00
|
|
|
|
2010-06-21 13:51:56 +00:00
|
|
|
SharedHandle<PeerStorage> peerStorage_;
|
2008-11-03 06:49:02 +00:00
|
|
|
|
2010-06-21 13:51:56 +00:00
|
|
|
SharedHandle<Peer> peer_;
|
2008-02-08 15:53:45 +00:00
|
|
|
|
2010-06-21 13:51:56 +00:00
|
|
|
SharedHandle<BtMessageReceiver> btMessageReceiver_;
|
|
|
|
SharedHandle<BtMessageDispatcher> dispatcher_;
|
|
|
|
SharedHandle<BtRequestFactory> btRequestFactory_;
|
|
|
|
// Although peerStorage_ is not used in this class, this object
|
|
|
|
// holds the reference so that peerConnection_ is not deleted.
|
|
|
|
SharedHandle<PeerConnection> peerConnection_;
|
|
|
|
SharedHandle<BtMessageFactory> messageFactory_;
|
|
|
|
SharedHandle<ExtensionMessageFactory> extensionMessageFactory_;
|
|
|
|
SharedHandle<ExtensionMessageRegistry> extensionMessageRegistry_;
|
|
|
|
SharedHandle<UTMetadataRequestFactory> utMetadataRequestFactory_;
|
|
|
|
SharedHandle<UTMetadataRequestTracker> utMetadataRequestTracker_;
|
2009-11-23 13:17:48 +00:00
|
|
|
|
2010-06-21 13:51:56 +00:00
|
|
|
bool metadataGetMode_;
|
2008-02-08 15:53:45 +00:00
|
|
|
|
2010-11-12 12:48:48 +00:00
|
|
|
DHTNode* localNode_;
|
2008-02-08 15:53:45 +00:00
|
|
|
|
2010-06-21 13:51:56 +00:00
|
|
|
size_t allowedFastSetSize_;
|
|
|
|
Timer haveTimer_;
|
|
|
|
Timer keepAliveTimer_;
|
|
|
|
Timer floodingTimer_;
|
|
|
|
FloodingStat floodingStat_;
|
|
|
|
Timer inactiveTimer_;
|
|
|
|
Timer pexTimer_;
|
|
|
|
Timer perSecTimer_;
|
|
|
|
time_t keepAliveInterval_;
|
|
|
|
bool utPexEnabled_;
|
|
|
|
bool dhtEnabled_;
|
2006-12-24 06:25:21 +00:00
|
|
|
|
2010-06-21 13:51:56 +00:00
|
|
|
size_t numReceivedMessage_;
|
2008-02-08 18:27:28 +00:00
|
|
|
|
2010-06-21 13:51:56 +00:00
|
|
|
size_t maxOutstandingRequest_;
|
2009-11-18 12:22:03 +00:00
|
|
|
|
2010-11-12 12:48:48 +00:00
|
|
|
RequestGroupMan* requestGroupMan_;
|
2009-02-28 11:48:26 +00:00
|
|
|
|
2011-07-21 14:42:41 +00:00
|
|
|
uint16_t tcpPort_;
|
|
|
|
|
2008-03-09 12:24:01 +00:00
|
|
|
static const time_t FLOODING_CHECK_INTERVAL = 5;
|
2006-12-24 06:25:21 +00:00
|
|
|
|
|
|
|
void addBitfieldMessageToQueue();
|
|
|
|
void addAllowedFastMessageToQueue();
|
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
2007-12-22 03:57:55 +00:00
|
|
|
void addHandshakeExtendedMessageToQueue();
|
2006-12-24 06:25:21 +00:00
|
|
|
void decideChoking();
|
|
|
|
void checkHave();
|
|
|
|
void sendKeepAlive();
|
|
|
|
void decideInterest();
|
2008-06-17 11:43:29 +00:00
|
|
|
void fillPiece(size_t maxMissingBlock);
|
2006-12-24 06:25:21 +00:00
|
|
|
void addRequests();
|
|
|
|
void detectMessageFlooding();
|
2007-06-20 14:43:34 +00:00
|
|
|
void checkActiveInteraction();
|
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
2007-12-22 03:57:55 +00:00
|
|
|
void addPeerExchangeMessage();
|
2008-02-01 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Added DHT functionality, compatible with mainline.
DHT is disabled by default. To enable it, give --enable-dht to
aria2c.
You may need to specify entry point to DHT network using
--dht-entry-point. DHT uses UDP port to listen incoming message.
Use --dht-listen-port to specify port number. Make sure that
your
firewall configuration can pass through UDP traffic to the port.
The routing table is saved in $HOME/.aria2/dht.dat.
* src/DHT*
* src/BNode.{h, cc}
* src/PeerInteractionCommand.cc: enable DHT functionality for a
particular torrent.
* src/Data.cc: Rewritten ctor.
* src/OptionHandlerFactory.cc: Added --enable-dht,
--dht-listen-port,
--dht-entry-point.
* src/DefaultBtInteractive.cc: Send port message if dht is
enabled.
* src/RequestGroup.cc: Initialize DHT functionality. When
download
ends, remove BtContext from DHTPeerAnnounceStorage.
* src/BtPortMessage.{h, cc}: Rewritten.
* src/message.h
* src/OptionHandlerImpl.cc
* src/option_processing.cc: Added --enable-dht,
--dht-listen-port,
--dht-entry-point.
* src/Dictionary.{h, cc} (remove): New function.
* src/prefs.h
* src/DefaultBtMessageFactory.h
* src/BtHandshakeMessage.cc
* src/ActivePeerConnectionCommand.cc
* src/SocketCore.{h, cc}: Added datagram socket support.
* src/DefaultBtMessageFactory.cc
* src/BtSetup.cc: Add BtContext to DHTPeerAnnounceStorage here.
Create DHT commands.
* src/BtMessageFactory.h
* src/PeerMessageUtil.{h, cc}
2008-02-01 17:36:33 +00:00
|
|
|
void addPortMessageToQueue();
|
2007-06-20 14:43:34 +00:00
|
|
|
|
2006-12-24 06:25:21 +00:00
|
|
|
public:
|
2009-06-28 10:37:15 +00:00
|
|
|
DefaultBtInteractive(const SharedHandle<DownloadContext>& downloadContext,
|
2010-01-05 16:01:46 +00:00
|
|
|
const SharedHandle<Peer>& peer);
|
2008-02-08 15:53:45 +00:00
|
|
|
|
|
|
|
virtual ~DefaultBtInteractive();
|
2006-12-24 06:25:21 +00:00
|
|
|
|
|
|
|
virtual void initiateHandshake();
|
|
|
|
|
2008-02-08 15:53:45 +00:00
|
|
|
virtual SharedHandle<BtMessage> receiveHandshake(bool quickReply = false);
|
2006-12-24 06:25:21 +00:00
|
|
|
|
2008-02-08 15:53:45 +00:00
|
|
|
virtual SharedHandle<BtMessage> receiveAndSendHandshake();
|
2006-12-24 06:25:21 +00:00
|
|
|
|
|
|
|
virtual void doPostHandshakeProcessing();
|
|
|
|
|
|
|
|
virtual void doInteractionProcessing();
|
|
|
|
|
|
|
|
virtual void cancelAllPiece();
|
|
|
|
|
|
|
|
virtual void sendPendingMessage();
|
|
|
|
|
2008-02-08 18:27:28 +00:00
|
|
|
size_t receiveMessages();
|
2006-12-24 06:25:21 +00:00
|
|
|
|
2008-03-09 12:24:01 +00:00
|
|
|
virtual size_t countPendingMessage();
|
2012-10-01 14:52:22 +00:00
|
|
|
|
2008-02-08 15:53:45 +00:00
|
|
|
virtual bool isSendingMessageInProgress();
|
2006-12-24 06:25:21 +00:00
|
|
|
|
2008-02-08 18:27:28 +00:00
|
|
|
virtual size_t countReceivedMessageInIteration() const;
|
|
|
|
|
2008-02-28 14:27:00 +00:00
|
|
|
virtual size_t countOutstandingRequest();
|
|
|
|
|
2010-03-20 14:30:36 +00:00
|
|
|
void setCuid(cuid_t cuid)
|
|
|
|
{
|
2010-06-21 13:51:56 +00:00
|
|
|
cuid_ = cuid;
|
2006-12-24 06:25:21 +00:00
|
|
|
}
|
|
|
|
|
2008-11-03 06:49:02 +00:00
|
|
|
void setBtRuntime(const SharedHandle<BtRuntime>& btRuntime);
|
|
|
|
|
|
|
|
void setPieceStorage(const SharedHandle<PieceStorage>& pieceStorage);
|
|
|
|
|
|
|
|
void setPeerStorage(const SharedHandle<PeerStorage>& peerStorage);
|
|
|
|
|
2008-02-08 15:53:45 +00:00
|
|
|
void setPeer(const SharedHandle<Peer>& peer);
|
2006-12-24 06:25:21 +00:00
|
|
|
|
2008-11-03 06:49:02 +00:00
|
|
|
void setBtMessageReceiver(const SharedHandle<BtMessageReceiver>& receiver);
|
|
|
|
|
|
|
|
void setDispatcher(const SharedHandle<BtMessageDispatcher>& dispatcher);
|
2006-12-24 06:25:21 +00:00
|
|
|
|
2008-11-03 06:49:02 +00:00
|
|
|
void setBtRequestFactory(const SharedHandle<BtRequestFactory>& factory);
|
2006-12-24 06:25:21 +00:00
|
|
|
|
2010-06-13 11:00:43 +00:00
|
|
|
void setPeerConnection(const SharedHandle<PeerConnection>& peerConnection);
|
|
|
|
|
2008-11-03 06:49:02 +00:00
|
|
|
void setBtMessageFactory(const SharedHandle<BtMessageFactory>& factory);
|
2006-12-24 06:25:21 +00:00
|
|
|
|
2008-11-03 06:49:02 +00:00
|
|
|
void setExtensionMessageFactory
|
|
|
|
(const SharedHandle<ExtensionMessageFactory>& factory);
|
2006-12-24 06:25:21 +00:00
|
|
|
|
2009-04-25 10:48:00 +00:00
|
|
|
void setExtensionMessageRegistry
|
|
|
|
(const SharedHandle<ExtensionMessageRegistry>& registry)
|
|
|
|
{
|
2010-06-21 13:51:56 +00:00
|
|
|
extensionMessageRegistry_ = registry;
|
2009-04-25 10:48:00 +00:00
|
|
|
}
|
|
|
|
|
2008-03-09 12:24:01 +00:00
|
|
|
void setKeepAliveInterval(time_t keepAliveInterval) {
|
2010-06-21 13:51:56 +00:00
|
|
|
keepAliveInterval_ = keepAliveInterval;
|
2007-01-16 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
To decrease CPU usage in bittorrent download, calculation
results in
BitfieldMan were cached and realtime fetching PeerObject was
removed
with WeakHandle introduced. Option values are set to the objects
by setter before download begins.
* src/DefaultBtRequestFactory.cc: Use messageFactory member.
* src/DefaultBtRequestFactory.h
(dispatcher): BtMessageDispatcherHandle ->
BtMessageDispatcherWeakHandle.
(messageFactory): New variable.
(setBtMessageDispatcher): BtMessageDispatcherHandle ->
BtMessageDispatcherWeakHandle.
(setBtMessageFactory): New function.
* src/DefaultBtMessageDispatcher.cc:
(sendMessages): Use maxUploadSpeedLimit instead of fetching the
value
from Option.
(checkRequestSlotAndDoNecessaryThing): Use requestTimeout
instead of
feating the value from Option.
Use messageFactory member.
* src/PeerInteractionCommand.cc
(PeerInteractionCommand): Added maxDownloadSpeedLimit.
Add reverse dependencies to factory object.
Set maxUploadSpeedLimit and requestTimeout and messageFactory to
dispatcher.
Set messageFactory to receiver.
Set keepAliveInterval and maxDownloadSpeedLimit and
messageFactory to
btInteractive.
Set receiver to peerObject.
Set maxDownloadSpeedLimit to this.
(executeInternal): Use maxDownloadSpeedLimit member.
* src/BtChokeMessage.cc
(doReceivedAction): Use dispatcher, requestFactory member.
(onSendComplete): Use dispatcher member.
* src/PeerInteractionCommand.h
(maxDownloadSpeedLimit): New variable.
* src/DefaultBtMessageReceiver.h
(peerConnection): PeerConnectionHandle ->
PeerConnectionWeakHandle
(dispatcher):
BtMessageDispatcherHandle -> BtMessageDispatcherWeakHandle
(messageFactory): New variable.
(setPeerConnection): PeerConnectionHandle ->
PeerConnectionWeakHandle
(getPeerConnection): PeerConnectionHandle ->
PeerConnectionWeakHandle
(setDispatcher):
BtMessageDispatcherHandle -> BtMessageDispatcherWeakHandle
(setBtMessageFactory): New function.
* src/DefaultBtInteractive.cc
(initiateHandshake): Use messageFactory member.
(addBitfieldMessageToQueue): Use messageFactory member.
(addAllowedFastMessageToQueue): Use messageFactory member.
(decideChoking): Use messageFactory member.
(checkHave): Use messageFactory member.
(sendKeepAlive): Use keepAliveInterval, messageFactory member.
(receiveMessages): Use maxDownloadSpeedLimit member.
(decideInterest): Use messageFactory member.
* src/BtRequestMessage.cc
(doReceivedAction): Use messageFactory, dispatcher member.
(onQueued): Use dispatcher member.
* src/BtPieceMessage.cc
(doReceivedAction): Use dispatcher member.
(send): Use peerConnection member.
(onWrongPiece): Use requestFactory member.
(handleChokingEvent): Use messageFactory, dispatcher member.
(handleCancelSendingPieceEvent): Use messageFactory, dispatcher
member.
* src/BtMessageDispatcher.h
(BtMessageDispatcherWeakHandle): New type definition.
* src/SimpleBtMessage.cc
(send): Use peerConnection member.
* src/BtRejectMessage.cc
(doReceivedAction): Use dispatcher member.
* src/DefaultBtMessageDispatcher.h
(Option.h): Removed include.
(messageFactory): New variable.
(option): Removed.
(maxUploadSpeedLimit): New variable.
(requestTimeout): New variable.
(DefaultBtMessageDispatcher): Removed option.
Added maxUploadSpeedLimit, requestTimeout.
(setOption): Removed.
(getOption): Removed.
(setMaxUploadSpeedLimit): New function.
(setRequestTimeout): New function.
(setBtMessageFactory): New function.
* src/DefaultBtInteractive.h
(btMessageReceiver):
BtMessageReceiverHandle -> BtMessageReceiverWeakHandle
(dispatcher):
BtMessageDispatcherHandle -> BtMessageReceiverWeakHandle
(btRequestFactory):
BtRequestFactoryHandle -> BtRequestFactoryWeakHandle
(peerConnection):
PeerConnectionHandle -> PeerConnectionWeakHandle
(messageFactory): New variable.
(option): Removed.
(keepAliveInterval): New variable.
(maxDownloadSpeedLimit): New variable.
(DefaultBtInteractive): Added keepAliveInterval,
maxDownloadSpeedLimit.
(setBtMessageReceiver):
BtMessageReceiverHandle -> BtMessageReceiverWeakHandle
(setDispatcher):
BtMessageDispatcherHandle -> BtMessageReceiverWeakHandle
(setBtRequestFactory):
BtRequestFactoryHandle -> BtRequestFactoryWeakHandle
(setPeerConnection):
PeerConnectionHandle -> PeerConnectionWeakHandle
(setOption): Removed.
(setKeepAliveInterval): New function.
(setMaxDownloadSpeedLimit): New function.
(setBtMessageFactory): New function.
* src/BitfieldMan.h
(cachedNumMissingBlock): New variable.
(cachedNumFilteredBlock): New variable.
(cachedCompletedLength): New variable.
(cachedFilteredComletedLength): New variable.
(cachedFilteredTotalLength): New variable.
(countMissingBlockNow): New function.
(countFilteredBlockNow): New function.
(getFilteredTotalLengthNow): New function.
(getCompletedLengthNow): New function.
(getFilteredCompletedLengthNow): New function.
(updateCache): New function.
* src/AbstractBtMessage.h
(BtMessageDispatcher.h): New include.
(PeerConnection.h): New include.
(BtRequestFactory.h): New include
(BtMessageFactory.h): New include.
(dispatcher): New variable.
(messageFactory): New variable.
(peerConnection: New variable.
(setBtMessageDispatcher): New function.
(setPeerConnection): New function.
(setBtMessageFactory): New function.
(setBtRequestFactory): New function.
* src/DefaultBtMessageFactory.cc
(setCommonProperty): Set dispatcher, requestFactory, this,
peerConnection to msg.
* src/BtRegistry.h
(BT_MESSAGE_RECEIVER): New macro.
* src/PeerConnection.h
(PeerConnectionWeakHandle): New type definition.
* src/BtMessageFactory.h
(BtMessageFactoryWeakHandle): New type definition.
* src/BitfieldMan.cc
(BitfieldMan): Added cachedNumMissingBlock,
cachedNumFilteredBlock,
cachedCompletedLength, cachedFilteredComletedLength,
cachedFilteredTotalLength.
Call updateCache().
(countMissingBlock): Return cachedNumMissingBlock.
(countMissingBlockNow): New function.
(countBlock): Return cachedNumFilteredBlock if filterEnabled is
true.
(countFilteredBlockNow): New function.
(setBit): Call updateCache().
(unsetBit): Call updateCache().
(setBitfield): Call updateCache().
(clearAllBit): Call updateCache().
(setAllBit): Use setBitInternal instead of setBit.
Call updateCache().
(addFilter): Call updateCache().
(enableFilter): Call updateCache().
(disableFilter): Call updateCache().
(clearFilter): Call updateCache().
(getFilteredTotalLength): Return cachedFilteredTotalLength.
(getFilteredTotalLengthNow): New function.
(getCompletedLength): Return cachedCompletedLength.
(getCompletedLengthNow): New function.
(getFilteredCompletedLength): Return
cachedFilteredComletedLength.
(getFilteredCompletedLengthNow): New function.
(updateCache): New function.
* src/BtMessageReceiver.h
(BtMessageReceiverWeakHandle): New type definition.
* src/DefaultBtMessageReceiver.cc
(receiveHandshake): Use messageFactory member.
(sendHandshake): Use messageFactory member.
(receiveMessage): Use messageFactory member.
* src/DefaultBtMessageFactory.h
(dispatcher): New variable.
(requestFactory): New variable.
(peerConnection): New variablle.
(setBtMessageDispatcher): New function.
(setBtRequestFactory): New function.
(setPeerConnection): New function.
* src/SharedHandle.h
(RefCount): New class.
(WeakHandle): New class.
* src/PeerObject.h
(BtMessageReceiver.h): New include.
(PeerObject): Added btMessageReceiver.
(btMessageReceiver): New variable.
* src/Util.cc
(countBit): Simplified.
* src/BtCancelMessage.cc
(doReceivedAction): Use dispatcher member.
* src/BtRequestFactory.h
(BtRequestFactoryWeakHandle): New type definition.
* src/PeerStorage.h
(downloadSpeed): int -> uint32_t
(uploadSpeed): int -> uint32_t
(sessionDownloadLength): long long int -> uint64_t
(sessionUploadLength): long long int -> uint64_t
2007-01-16 15:20:26 +00:00
|
|
|
}
|
|
|
|
|
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
2007-12-22 03:57:55 +00:00
|
|
|
void setUTPexEnabled(bool f)
|
|
|
|
{
|
2010-06-21 13:51:56 +00:00
|
|
|
utPexEnabled_ = f;
|
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
2007-12-22 03:57:55 +00:00
|
|
|
}
|
2008-02-01 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Added DHT functionality, compatible with mainline.
DHT is disabled by default. To enable it, give --enable-dht to
aria2c.
You may need to specify entry point to DHT network using
--dht-entry-point. DHT uses UDP port to listen incoming message.
Use --dht-listen-port to specify port number. Make sure that
your
firewall configuration can pass through UDP traffic to the port.
The routing table is saved in $HOME/.aria2/dht.dat.
* src/DHT*
* src/BNode.{h, cc}
* src/PeerInteractionCommand.cc: enable DHT functionality for a
particular torrent.
* src/Data.cc: Rewritten ctor.
* src/OptionHandlerFactory.cc: Added --enable-dht,
--dht-listen-port,
--dht-entry-point.
* src/DefaultBtInteractive.cc: Send port message if dht is
enabled.
* src/RequestGroup.cc: Initialize DHT functionality. When
download
ends, remove BtContext from DHTPeerAnnounceStorage.
* src/BtPortMessage.{h, cc}: Rewritten.
* src/message.h
* src/OptionHandlerImpl.cc
* src/option_processing.cc: Added --enable-dht,
--dht-listen-port,
--dht-entry-point.
* src/Dictionary.{h, cc} (remove): New function.
* src/prefs.h
* src/DefaultBtMessageFactory.h
* src/BtHandshakeMessage.cc
* src/ActivePeerConnectionCommand.cc
* src/SocketCore.{h, cc}: Added datagram socket support.
* src/DefaultBtMessageFactory.cc
* src/BtSetup.cc: Add BtContext to DHTPeerAnnounceStorage here.
Create DHT commands.
* src/BtMessageFactory.h
* src/PeerMessageUtil.{h, cc}
2008-02-01 17:36:33 +00:00
|
|
|
|
2010-11-12 12:48:48 +00:00
|
|
|
void setLocalNode(DHTNode* node);
|
2008-02-01 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Added DHT functionality, compatible with mainline.
DHT is disabled by default. To enable it, give --enable-dht to
aria2c.
You may need to specify entry point to DHT network using
--dht-entry-point. DHT uses UDP port to listen incoming message.
Use --dht-listen-port to specify port number. Make sure that
your
firewall configuration can pass through UDP traffic to the port.
The routing table is saved in $HOME/.aria2/dht.dat.
* src/DHT*
* src/BNode.{h, cc}
* src/PeerInteractionCommand.cc: enable DHT functionality for a
particular torrent.
* src/Data.cc: Rewritten ctor.
* src/OptionHandlerFactory.cc: Added --enable-dht,
--dht-listen-port,
--dht-entry-point.
* src/DefaultBtInteractive.cc: Send port message if dht is
enabled.
* src/RequestGroup.cc: Initialize DHT functionality. When
download
ends, remove BtContext from DHTPeerAnnounceStorage.
* src/BtPortMessage.{h, cc}: Rewritten.
* src/message.h
* src/OptionHandlerImpl.cc
* src/option_processing.cc: Added --enable-dht,
--dht-listen-port,
--dht-entry-point.
* src/Dictionary.{h, cc} (remove): New function.
* src/prefs.h
* src/DefaultBtMessageFactory.h
* src/BtHandshakeMessage.cc
* src/ActivePeerConnectionCommand.cc
* src/SocketCore.{h, cc}: Added datagram socket support.
* src/DefaultBtMessageFactory.cc
* src/BtSetup.cc: Add BtContext to DHTPeerAnnounceStorage here.
Create DHT commands.
* src/BtMessageFactory.h
* src/PeerMessageUtil.{h, cc}
2008-02-01 17:36:33 +00:00
|
|
|
|
|
|
|
void setDHTEnabled(bool f)
|
|
|
|
{
|
2010-06-21 13:51:56 +00:00
|
|
|
dhtEnabled_ = f;
|
2008-02-01 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Added DHT functionality, compatible with mainline.
DHT is disabled by default. To enable it, give --enable-dht to
aria2c.
You may need to specify entry point to DHT network using
--dht-entry-point. DHT uses UDP port to listen incoming message.
Use --dht-listen-port to specify port number. Make sure that
your
firewall configuration can pass through UDP traffic to the port.
The routing table is saved in $HOME/.aria2/dht.dat.
* src/DHT*
* src/BNode.{h, cc}
* src/PeerInteractionCommand.cc: enable DHT functionality for a
particular torrent.
* src/Data.cc: Rewritten ctor.
* src/OptionHandlerFactory.cc: Added --enable-dht,
--dht-listen-port,
--dht-entry-point.
* src/DefaultBtInteractive.cc: Send port message if dht is
enabled.
* src/RequestGroup.cc: Initialize DHT functionality. When
download
ends, remove BtContext from DHTPeerAnnounceStorage.
* src/BtPortMessage.{h, cc}: Rewritten.
* src/message.h
* src/OptionHandlerImpl.cc
* src/option_processing.cc: Added --enable-dht,
--dht-listen-port,
--dht-entry-point.
* src/Dictionary.{h, cc} (remove): New function.
* src/prefs.h
* src/DefaultBtMessageFactory.h
* src/BtHandshakeMessage.cc
* src/ActivePeerConnectionCommand.cc
* src/SocketCore.{h, cc}: Added datagram socket support.
* src/DefaultBtMessageFactory.cc
* src/BtSetup.cc: Add BtContext to DHTPeerAnnounceStorage here.
Create DHT commands.
* src/BtMessageFactory.h
* src/PeerMessageUtil.{h, cc}
2008-02-01 17:36:33 +00:00
|
|
|
}
|
2009-02-28 11:48:26 +00:00
|
|
|
|
2010-11-12 12:48:48 +00:00
|
|
|
void setRequestGroupMan(RequestGroupMan* rgman);
|
2009-11-23 13:17:48 +00:00
|
|
|
|
|
|
|
void setUTMetadataRequestTracker
|
|
|
|
(const SharedHandle<UTMetadataRequestTracker>& tracker)
|
|
|
|
{
|
2010-06-21 13:51:56 +00:00
|
|
|
utMetadataRequestTracker_ = tracker;
|
2009-11-23 13:17:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void setUTMetadataRequestFactory
|
|
|
|
(const SharedHandle<UTMetadataRequestFactory>& factory)
|
|
|
|
{
|
2010-06-21 13:51:56 +00:00
|
|
|
utMetadataRequestFactory_ = factory;
|
2009-11-23 13:17:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void enableMetadataGetMode()
|
|
|
|
{
|
2010-06-21 13:51:56 +00:00
|
|
|
metadataGetMode_ = true;
|
2009-11-23 13:17:48 +00:00
|
|
|
}
|
2011-07-21 14:42:41 +00:00
|
|
|
|
|
|
|
void setTcpPort(uint16_t port)
|
|
|
|
{
|
|
|
|
tcpPort_ = port;
|
|
|
|
}
|
2006-12-24 06:25:21 +00:00
|
|
|
};
|
|
|
|
|
2008-02-08 15:53:45 +00:00
|
|
|
} // namespace aria2
|
|
|
|
|
2010-10-31 07:23:53 +00:00
|
|
|
#endif // D_DEFAULT_BT_INTERACTIVE_H
|