github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

2009-05-13 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 

Removed unused option member from PeerConnection.
	* src/InitiatorMSEHandshakeCommand.cc
	* src/PeerConnection.cc
	* src/PeerConnection.h
	* src/PeerInteractionCommand.cc
	* src/PeerReceiveHandshakeCommand.cc
	* src/ReceiverMSEHandshakeCommand.cc
pull/1/head
Tatsuhiro Tsujikawa 2009-05-13 14:50:48 +00:00
parent d9fe4fb845
commit cdd65e8cca
7 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2009-05-13 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Removed unused option member from PeerConnection.
* src/InitiatorMSEHandshakeCommand.cc
* src/PeerConnection.cc
* src/PeerConnection.h
* src/PeerInteractionCommand.cc
* src/PeerReceiveHandshakeCommand.cc
* src/ReceiverMSEHandshakeCommand.cc
2009-05-13 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Added "seeder" key to getPeers response.

2
src/InitiatorMSEHandshakeCommand.cc
View File

@ -145,7 +145,7 @@ bool InitiatorMSEHandshakeCommand::executeInternal() {
case INITIATOR_RECEIVE_PAD_D: {
if(_mseHandshake->receivePad()) {
SharedHandle<PeerConnection> peerConnection
(new PeerConnection(cuid, socket, getOption().get()));
(new PeerConnection(cuid, socket));
if(_mseHandshake->getNegotiatedCryptoType() == MSEHandshake::CRYPTO_ARC4) {
peerConnection->enableEncryption(_mseHandshake->getEncryptor(),
_mseHandshake->getDecryptor());

14
src/PeerConnection.cc
View File

@ -33,6 +33,11 @@
*/
/* copyright --> */
#include "PeerConnection.h"
#include <cstring>
#include <cassert>
#include <algorithm>
#include "message.h"
#include "DlAbortEx.h"
#include "LogFactory.h"
@ -43,18 +48,13 @@
#include "ARC4Encryptor.h"
#include "ARC4Decryptor.h"
#include "StringFormat.h"
#include <cstring>
#include <cassert>
#include <algorithm>
namespace aria2 {
PeerConnection::PeerConnection(int32_t cuid,
const SocketHandle& socket,
const Option* op)
PeerConnection::PeerConnection(int32_t cuid, const SocketHandle& socket)
:cuid(cuid),
socket(socket),
option(op),
logger(LogFactory::getInstance()),
resbufLength(0),
currentPayloadLength(0),

4
src/PeerConnection.h
View File

@ -42,7 +42,6 @@
namespace aria2 {
class Option;
class Logger;
class SocketCore;
class ARC4Encryptor;
@ -56,7 +55,6 @@ class PeerConnection {
private:
int32_t cuid;
SharedHandle<SocketCore> socket;
const Option* option;
Logger* logger;
unsigned char resbuf[MAX_PAYLOAD_LEN];
@ -78,7 +76,7 @@ private:
ssize_t sendData(const unsigned char* data, size_t length, bool encryption);
public:
PeerConnection(int32_t cuid, const SharedHandle<SocketCore>& socket, const Option* op);
PeerConnection(int32_t cuid, const SharedHandle<SocketCore>& socket);
~PeerConnection();

2
src/PeerInteractionCommand.cc
View File

@ -123,7 +123,7 @@ PeerInteractionCommand::PeerInteractionCommand
PeerConnectionHandle peerConnection;
if(passedPeerConnection.isNull()) {
peerConnection.reset(new PeerConnection(cuid, socket, getOption().get()));
peerConnection.reset(new PeerConnection(cuid, socket));
} else {
peerConnection = passedPeerConnection;
}

3
src/PeerReceiveHandshakeCommand.cc
View File

@ -70,8 +70,7 @@ PeerReceiveHandshakeCommand::PeerReceiveHandshakeCommand
_peerConnection(peerConnection)
{
if(_peerConnection.isNull()) {
// TODO referring global option
_peerConnection.reset(new PeerConnection(cuid, socket, e->option));
_peerConnection.reset(new PeerConnection(cuid, socket));
}
}

4
src/ReceiverMSEHandshakeCommand.cc
View File

@ -98,7 +98,7 @@ bool ReceiverMSEHandshakeCommand::executeInternal()
throw DlAbortEx("The legacy BitTorrent handshake is not acceptable by the preference.");
}
SharedHandle<PeerConnection> peerConnection
(new PeerConnection(cuid, socket, e->option));
(new PeerConnection(cuid, socket));
peerConnection->presetBuffer(_mseHandshake->getBuffer(),
_mseHandshake->getBufferLength());
Command* c = new PeerReceiveHandshakeCommand(cuid, peer, e, socket,
@ -180,7 +180,7 @@ bool ReceiverMSEHandshakeCommand::executeInternal()
void ReceiverMSEHandshakeCommand::createCommand()
{
SharedHandle<PeerConnection> peerConnection
(new PeerConnection(cuid, socket, e->option));
(new PeerConnection(cuid, socket));
if(_mseHandshake->getNegotiatedCryptoType() == MSEHandshake::CRYPTO_ARC4) {
peerConnection->enableEncryption(_mseHandshake->getEncryptor(),
_mseHandshake->getDecryptor());