summaryrefslogtreecommitdiff
path: root/src/HandshakeExtensionMessage.cc
diff options
context:
space:
mode:
authorTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2009-04-27 11:45:22 +0000
committerTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2009-04-27 11:45:22 +0000
commit49b4cfbfcdf615dc01d748179c6b67e78bd5362e (patch)
tree607214c9048ae8ba51e38a6c5daa1b99e376d218 /src/HandshakeExtensionMessage.cc
parentd58742ad21407362db34d508ceef8b7b21088bb1 (diff)
2009-04-27 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Put BDE in aria2 namespace. BDE will also be used to store xml-rpc request. * src/AnnounceList.cc * src/AnnounceList.h * src/BDE.cc: Added * src/BDE.h: Added * src/DHTAbstractMessage.cc * src/DHTAbstractMessage.h * src/DHTAnnouncePeerMessage.cc * src/DHTAnnouncePeerMessage.h * src/DHTAnnouncePeerReplyMessage.cc * src/DHTAnnouncePeerReplyMessage.h * src/DHTFindNodeMessage.cc * src/DHTFindNodeMessage.h * src/DHTFindNodeReplyMessage.cc * src/DHTFindNodeReplyMessage.h * src/DHTGetPeersMessage.cc * src/DHTGetPeersMessage.h * src/DHTGetPeersReplyMessage.cc * src/DHTGetPeersReplyMessage.h * src/DHTMessageFactory.h * src/DHTMessageFactoryImpl.cc * src/DHTMessageFactoryImpl.h * src/DHTMessageReceiver.cc * src/DHTMessageTracker.cc * src/DHTMessageTracker.h * src/DHTPingMessage.cc * src/DHTPingMessage.h * src/DHTPingReplyMessage.cc * src/DHTPingReplyMessage.h * src/DHTQueryMessage.cc * src/DHTQueryMessage.h * src/DHTResponseMessage.cc * src/DHTResponseMessage.h * src/DefaultBtAnnounce.cc * src/DefaultBtContext.cc * src/DefaultBtContext.h * src/HandshakeExtensionMessage.cc * src/Makefile.am * src/PeerListProcessor.h * src/UTPexExtensionMessage.cc * src/bencode.cc * src/bencode.h * test/AnnounceListTest.cc * test/BDETest.cc: Added * test/BencodeTest.cc * test/DHTAnnouncePeerMessageTest.cc * test/DHTAnnouncePeerReplyMessageTest.cc * test/DHTFindNodeMessageTest.cc * test/DHTFindNodeReplyMessageTest.cc * test/DHTGetPeersMessageTest.cc * test/DHTGetPeersReplyMessageTest.cc * test/DHTMessageFactoryImplTest.cc * test/DHTMessageTrackerTest.cc * test/DHTPingMessageTest.cc * test/DHTPingReplyMessageTest.cc * test/Makefile.am * test/MockDHTMessageFactory.h * test/PeerListProcessorTest.cc
Diffstat (limited to 'src/HandshakeExtensionMessage.cc')
-rw-r--r--src/HandshakeExtensionMessage.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/HandshakeExtensionMessage.cc b/src/HandshakeExtensionMessage.cc
index 6344d2ea..3d107e95 100644
--- a/src/HandshakeExtensionMessage.cc
+++ b/src/HandshakeExtensionMessage.cc
@@ -55,14 +55,14 @@ HandshakeExtensionMessage::~HandshakeExtensionMessage() {}
std::string HandshakeExtensionMessage::getBencodedData()
{
- bencode::BDE dict = bencode::BDE::dict();
+ BDE dict = BDE::dict();
if(!_clientVersion.empty()) {
dict["v"] = _clientVersion;
}
if(_tcpPort > 0) {
dict["p"] = _tcpPort;
}
- bencode::BDE extDict = bencode::BDE::dict();
+ BDE extDict = BDE::dict();
for(std::map<std::string, uint8_t>::const_iterator itr = _extensions.begin();
itr != _extensions.end(); ++itr) {
const std::map<std::string, uint8_t>::value_type& vt = *itr;
@@ -133,21 +133,21 @@ HandshakeExtensionMessage::create(const unsigned char* data, size_t length)
HandshakeExtensionMessageHandle msg(new HandshakeExtensionMessage());
msg->_logger->debug("Creating HandshakeExtensionMessage from %s",
Util::urlencode(data, length).c_str());
- const bencode::BDE dict = bencode::decode(data+1, length-1);
+ const BDE dict = bencode::decode(data+1, length-1);
if(!dict.isDict()) {
throw DlAbortEx("Unexpected payload format for extended message handshake");
}
- const bencode::BDE& port = dict["p"];
+ const BDE& port = dict["p"];
if(port.isInteger() && 0 < port.i() && port.i() < 65536) {
msg->_tcpPort = port.i();
}
- const bencode::BDE& version = dict["v"];
+ const BDE& version = dict["v"];
if(version.isString()) {
msg->_clientVersion = version.s();
}
- const bencode::BDE& extDict = dict["m"];
+ const BDE& extDict = dict["m"];
if(extDict.isDict()) {
- for(bencode::BDE::Dict::const_iterator i = extDict.dictBegin();
+ for(BDE::Dict::const_iterator i = extDict.dictBegin();
i != extDict.dictEnd(); ++i) {
if((*i).second.isInteger()) {
msg->_extensions[(*i).first] = (*i).second.i();