mirrors/aria2
1
0
Fork 0
mirror of https://github.com/aria2/aria2.git synced 2025-04-06 14:07:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Rewritten LpdMessageReceiver::receiveMessage()

Browse source
This commit is contained in:
Tatsuhiro Tsujikawa 2012-09-26 23:45:58 +09:00
parent 3a917ff695
commit b9f972665b
3 changed files with 29 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/LpdMessageReceiver.cc
View file

@ -80,21 +80,37 @@ bool LpdMessageReceiver::init(const std::string& localAddr)
SharedHandle<LpdMessage> LpdMessageReceiver::receiveMessage() SharedHandle<LpdMessage> LpdMessageReceiver::receiveMessage()
{ {
SharedHandle<LpdMessage> msg; SharedHandle<LpdMessage> msg;
try { while(1) {
unsigned char buf[200]; unsigned char buf[200];
std::pair<std::string, uint16_t> peerAddr; std::pair<std::string, uint16_t> peerAddr;
ssize_t length = socket_->readDataFrom(buf, sizeof(buf), peerAddr); ssize_t length;
if(length == 0) { try {
length = socket_->readDataFrom(buf, sizeof(buf), peerAddr);
if(length == 0) {
return msg;
}
} catch(RecoverableException& e) {
A2_LOG_INFO_EX("Failed to receive LPD message.", e);
return msg; return msg;
} }
HttpHeaderProcessor proc(HttpHeaderProcessor::SERVER_PARSER); HttpHeaderProcessor proc(HttpHeaderProcessor::SERVER_PARSER);
if(!proc.parse(buf, length)) { try {
msg.reset(new LpdMessage()); if(!proc.parse(buf, length)) {
return msg; // UDP packet must contain whole HTTP header block.
continue;
}
} catch(RecoverableException& e) {
A2_LOG_INFO_EX("Failed to parse LPD message.", e);
continue;
} }
const SharedHandle<HttpHeader>& header = proc.getResult(); const SharedHandle<HttpHeader>& header = proc.getResult();
const std::string& infoHashString = header->find(HttpHeader::INFOHASH); const std::string& infoHashString = header->find(HttpHeader::INFOHASH);
uint16_t port = header->findAsInt(HttpHeader::PORT); uint32_t port = 0;
if(!util::parseUIntNoThrow(port, header->find(HttpHeader::PORT)) ||
port > UINT16_MAX || port == 0) {
A2_LOG_INFO(fmt("Bad LPD port=%u", port));
continue;
}
A2_LOG_INFO(fmt("LPD message received infohash=%s, port=%u from %s", A2_LOG_INFO(fmt("LPD message received infohash=%s, port=%u from %s",
infoHashString.c_str(), infoHashString.c_str(),
port, port,
@ -102,11 +118,10 @@ SharedHandle<LpdMessage> LpdMessageReceiver::receiveMessage()
std::string infoHash; std::string infoHash;
if(infoHashString.size() != 40 || if(infoHashString.size() != 40 ||
(infoHash = util::fromHex(infoHashString.begin(), (infoHash = util::fromHex(infoHashString.begin(),
infoHashString.end())).empty() || infoHashString.end())).empty()) {
port == 0) { A2_LOG_INFO(fmt("LPD bad request. infohash=%s",
A2_LOG_INFO(fmt("LPD bad request. infohash=%s", infoHashString.c_str())); infoHashString.c_str()));
msg.reset(new LpdMessage()); continue;
return msg;
} }
SharedHandle<Peer> peer(new Peer(peerAddr.first, port, false)); SharedHandle<Peer> peer(new Peer(peerAddr.first, port, false));
if(util::inPrivateAddress(peerAddr.first)) { if(util::inPrivateAddress(peerAddr.first)) {
@ -114,10 +129,6 @@ SharedHandle<LpdMessage> LpdMessageReceiver::receiveMessage()
} }
msg.reset(new LpdMessage(peer, infoHash)); msg.reset(new LpdMessage(peer, infoHash));
return msg; return msg;
} catch(RecoverableException& e) {
A2_LOG_INFO_EX("Failed to receive LPD message.", e);
msg.reset(new LpdMessage());
return msg;
} }
} }

4
src/LpdReceiveMessageCommand.cc
View file

@ -77,10 +77,6 @@ bool LpdReceiveMessageCommand::execute()
if(!m) { if(!m) {
break; break;
} }
if(!m->peer) {
// bad message
continue;
}
SharedHandle<BtRegistry> reg = e_->getBtRegistry(); SharedHandle<BtRegistry> reg = e_->getBtRegistry();
SharedHandle<DownloadContext> dctx = reg->getDownloadContext(m->infoHash); SharedHandle<DownloadContext> dctx = reg->getDownloadContext(m->infoHash);
if(!dctx) { if(!dctx) {

8
test/LpdMessageReceiverTest.cc
View file

@ -67,9 +67,7 @@ void LpdMessageReceiverTest::testReceiveMessage()
rcv.getSocket()->isReadable(5); rcv.getSocket()->isReadable(5);
msg = rcv.receiveMessage(); msg = rcv.receiveMessage();
CPPUNIT_ASSERT(msg); CPPUNIT_ASSERT(!msg);
CPPUNIT_ASSERT(!msg->peer);
CPPUNIT_ASSERT(msg->infoHash.empty());
// Bad port // Bad port
request = request =
@ -81,9 +79,7 @@ void LpdMessageReceiverTest::testReceiveMessage()
rcv.getSocket()->isReadable(5); rcv.getSocket()->isReadable(5);
msg = rcv.receiveMessage(); msg = rcv.receiveMessage();
CPPUNIT_ASSERT(msg); CPPUNIT_ASSERT(!msg);
CPPUNIT_ASSERT(!msg->peer);
CPPUNIT_ASSERT(msg->infoHash.empty());
// No data available // No data available
msg = rcv.receiveMessage(); msg = rcv.receiveMessage();