diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2008-02-17 15:56:47 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2008-02-17 15:56:47 +0000 |
| commit | c0d2223c778ae9719fd13d1fde6dc2fbf4faa82b (patch) | |
| tree | 1d7a2ca2f7d99ebe7aa24cf0be364aa0453afc89 /src/PeerInitiateConnectionCommand.h | |
| parent | 13021233680e3fb3650075e2a71c1f234acb1803 (diff) | |
2008-02-16 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Added Message Stream Encryption(MSE) support.
Currently, aria2 accepts incoming connections with Obfuscation Header
and legacy BitTorrent Header and establishes connections with
Obfuscation Header first and if failed then retry with legacy
BitTorrent header. If plain text and ARC4 is provided, aria2 always
choose ARC4. The new option to change the default behavior is planned.
For tracker extension, "supportcrypto=1" is added statically.
* src/PeerInitiateConnectionCommand.{h, cc}
* src/PeerConnection.{h, cc}
* src/HandleRegistry.h
* src/SocketCore.h
* src/PeerReceiveHandshakeCommand.{h, cc}
* src/BtRegistry.{h, cc}
* src/PeerListenCommand.cc
* src/InitiatorMSEHandshakeCommand.{h, cc}
* src/ReceiverMSEHandshakeCommand.{h, cc}
* src/MSEHandshake.{h, cc}
* src/ARC4Encryptor.h
* src/ARC4Decryptor.h
* src/LibgcryptARC4Encryptor.h
* src/LibgcryptARC4Decryptor.h
* src/LibgcryptARC4Context.h
* src/LibsslARC4Encryptor.h
* src/LibsslARC4Decryptor.h
* src/LibsslARC4Context.h
* src/DHKeyExchange.h
* src/LibgcryptDHKeyExchange.h
* src/LibsslDHKeyExchange.h
* src/DefaultBtAnnounce.cc: Just added "supportcrypto=1" parameter.
* test/DefaultBtAnnounceTest.cc
* test/ARC4Test.cc
* test/DHKeyExchangeTest.cc
Removed prepareForRetry() because it is not used.
* src/PeerAbstractCommand.{h, cc}
* src/PeerInteractionCommand.{h, cc}
* src/PeerInitiateConnectionCommand.{h, cc}
Diffstat (limited to 'src/PeerInitiateConnectionCommand.h')
| -rw-r--r-- | src/PeerInitiateConnectionCommand.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/PeerInitiateConnectionCommand.h b/src/PeerInitiateConnectionCommand.h index a3e22ecc..413d2273 100644 --- a/src/PeerInitiateConnectionCommand.h +++ b/src/PeerInitiateConnectionCommand.h @@ -45,9 +45,10 @@ class PeerInitiateConnectionCommand : public PeerAbstractCommand, public BtContextAwareCommand, public RequestGroupAware { +private: + bool _mseHandshakeEnabled; protected: virtual bool executeInternal(); - virtual bool prepareForRetry(int wait); virtual bool prepareForNextPeer(int wait); virtual void onAbort(Exception* ex); virtual bool exitBeforeExecute(); @@ -57,7 +58,8 @@ public: RequestGroup* requestGroup, const SharedHandle<Peer>& peer, DownloadEngine* e, - const SharedHandle<BtContext>& btContext); + const SharedHandle<BtContext>& btContext, + bool mseHandshakeEnabled = true); virtual ~PeerInitiateConnectionCommand(); }; |