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

UDP tracker: Log transaction ID and connection ID in hex string

pull/538/head
Tatsuhiro Tsujikawa 2016-01-19 00:24:21 +09:00
parent dd678b7c65
commit e6b6aa324b
1 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/UDPTrackerClient.cc
View File

@ -81,9 +81,10 @@ namespace {
void logInvalidTransaction(const std::string& remoteAddr, uint16_t remotePort, void logInvalidTransaction(const std::string& remoteAddr, uint16_t remotePort,
int action, uint32_t transactionId) int action, uint32_t transactionId)
{ {
A2_LOG_INFO(fmt("UDPT received %s reply from %s:%u invalid transaction_id=%u", A2_LOG_INFO(
getUDPTrackerActionStr(action), remoteAddr.c_str(), fmt("UDPT received %s reply from %s:%u invalid transaction_id=%08x",
remotePort, transactionId)); getUDPTrackerActionStr(action), remoteAddr.c_str(), remotePort,
transactionId));
} }
} // namespace } // namespace
@ -152,10 +153,10 @@ int UDPTrackerClient::receiveReply(const unsigned char* data, size_t length,
req->state = UDPT_STA_COMPLETE; req->state = UDPT_STA_COMPLETE;
auto connectionId = bittorrent::getLLIntParam(data, 8); auto connectionId = bittorrent::getLLIntParam(data, 8);
A2_LOG_INFO(fmt("UDPT received CONNECT reply from %s:%u transaction_id=%u," A2_LOG_INFO(
"connection_id=%" PRIu64, fmt("UDPT received CONNECT reply from %s:%u transaction_id=%08x,"
remoteAddr.c_str(), remotePort, transactionId, "connection_id=%016" PRIx64,
connectionId)); remoteAddr.c_str(), remotePort, transactionId, connectionId));
UDPTrackerConnection c(UDPT_CST_CONNECTED, connectionId, now); UDPTrackerConnection c(UDPT_CST_CONNECTED, connectionId, now);
connectionIdCache_[std::make_pair(remoteAddr, remotePort)] = c; connectionIdCache_[std::make_pair(remoteAddr, remotePort)] = c;
// Now we have connection ID, push requests which are waiting for // Now we have connection ID, push requests which are waiting for
@ -199,14 +200,15 @@ int UDPTrackerClient::receiveReply(const unsigned char* data, size_t length,
} }
} }
A2_LOG_INFO(fmt("UDPT received ANNOUNCE reply from %s:%u transaction_id=%u," A2_LOG_INFO(
"connection_id=%" PRIu64 ", event=%s, infohash=%s, " fmt("UDPT received ANNOUNCE reply from %s:%u transaction_id=%08x,"
"interval=%d, leechers=%d, " "connection_id=%016" PRIx64 ", event=%s, infohash=%s, "
"seeders=%d, num_peers=%d", "interval=%d, leechers=%d, "
remoteAddr.c_str(), remotePort, transactionId, "seeders=%d, num_peers=%d",
req->connectionId, getUDPTrackerEventStr(req->event), remoteAddr.c_str(), remotePort, transactionId, req->connectionId,
util::toHex(req->infohash).c_str(), req->reply->interval, getUDPTrackerEventStr(req->event),
req->reply->leechers, req->reply->seeders, numPeers)); util::toHex(req->infohash).c_str(), req->reply->interval,
req->reply->leechers, req->reply->seeders, numPeers));
break; break;
} }
case UDPT_ACT_ERROR: { case UDPT_ACT_ERROR: {
@ -227,8 +229,8 @@ int UDPTrackerClient::receiveReply(const unsigned char* data, size_t length,
req->state = UDPT_STA_COMPLETE; req->state = UDPT_STA_COMPLETE;
req->error = UDPT_ERR_TRACKER; req->error = UDPT_ERR_TRACKER;
A2_LOG_INFO(fmt("UDPT received ERROR reply from %s:%u transaction_id=%u," A2_LOG_INFO(fmt("UDPT received ERROR reply from %s:%u transaction_id=%08x,"
"connection_id=%" PRIu64 ", action=%d, error_string=%s", "connection_id=%016" PRIx64 ", action=%d, error_string=%s",
remoteAddr.c_str(), remotePort, transactionId, remoteAddr.c_str(), remotePort, transactionId,
req->connectionId, action, errorString.c_str())); req->connectionId, action, errorString.c_str()));
if (req->action == UDPT_ACT_CONNECT) { if (req->action == UDPT_ACT_CONNECT) {
@ -298,13 +300,13 @@ void UDPTrackerClient::requestSent(const Timer& now)
const std::shared_ptr<UDPTrackerRequest>& req = pendingRequests_.front(); const std::shared_ptr<UDPTrackerRequest>& req = pendingRequests_.front();
switch (req->action) { switch (req->action) {
case UDPT_ACT_CONNECT: case UDPT_ACT_CONNECT:
A2_LOG_INFO(fmt("UDPT sent CONNECT to %s:%u transaction_id=%u", A2_LOG_INFO(fmt("UDPT sent CONNECT to %s:%u transaction_id=%08x",
req->remoteAddr.c_str(), req->remotePort, req->remoteAddr.c_str(), req->remotePort,
req->transactionId)); req->transactionId));
break; break;
case UDPT_ACT_ANNOUNCE: case UDPT_ACT_ANNOUNCE:
A2_LOG_INFO(fmt("UDPT sent ANNOUNCE to %s:%u transaction_id=%u, " A2_LOG_INFO(fmt("UDPT sent ANNOUNCE to %s:%u transaction_id=%08x, "
"connection_id=%" PRIu64 ", event=%s, infohash=%s", "connection_id=%016" PRIx64 ", event=%s, infohash=%s",
req->remoteAddr.c_str(), req->remotePort, req->remoteAddr.c_str(), req->remotePort,
req->transactionId, req->connectionId, req->transactionId, req->connectionId,
getUDPTrackerEventStr(req->event), getUDPTrackerEventStr(req->event),
@ -335,14 +337,14 @@ void UDPTrackerClient::requestFail(int error)
const std::shared_ptr<UDPTrackerRequest>& req = pendingRequests_.front(); const std::shared_ptr<UDPTrackerRequest>& req = pendingRequests_.front();
switch (req->action) { switch (req->action) {
case UDPT_ACT_CONNECT: case UDPT_ACT_CONNECT:
A2_LOG_INFO(fmt("UDPT fail CONNECT to %s:%u transaction_id=%u", A2_LOG_INFO(fmt("UDPT fail CONNECT to %s:%u transaction_id=%08x",
req->remoteAddr.c_str(), req->remotePort, req->remoteAddr.c_str(), req->remotePort,
req->transactionId)); req->transactionId));
failConnect(req->remoteAddr, req->remotePort, error); failConnect(req->remoteAddr, req->remotePort, error);
break; break;
case UDPT_ACT_ANNOUNCE: case UDPT_ACT_ANNOUNCE:
A2_LOG_INFO(fmt("UDPT fail ANNOUNCE to %s:%u transaction_id=%u, " A2_LOG_INFO(fmt("UDPT fail ANNOUNCE to %s:%u transaction_id=%08x, "
"connection_id=%" PRIu64 ", event=%s, infohash=%s", "connection_id=%016" PRIx64 ", event=%s, infohash=%s",
req->remoteAddr.c_str(), req->remotePort, req->remoteAddr.c_str(), req->remotePort,
req->transactionId, req->connectionId, req->transactionId, req->connectionId,
getUDPTrackerEventStr(req->event), getUDPTrackerEventStr(req->event),
@ -373,13 +375,13 @@ struct TimeoutCheck {
if (t >= 5_s) { if (t >= 5_s) {
switch (req->action) { switch (req->action) {
case UDPT_ACT_CONNECT: case UDPT_ACT_CONNECT:
A2_LOG_INFO(fmt("UDPT resend CONNECT to %s:%u transaction_id=%u", A2_LOG_INFO(fmt("UDPT resend CONNECT to %s:%u transaction_id=%08x",
req->remoteAddr.c_str(), req->remotePort, req->remoteAddr.c_str(), req->remotePort,
req->transactionId)); req->transactionId));
break; break;
case UDPT_ACT_ANNOUNCE: case UDPT_ACT_ANNOUNCE:
A2_LOG_INFO(fmt("UDPT resend ANNOUNCE to %s:%u transaction_id=%u, " A2_LOG_INFO(fmt("UDPT resend ANNOUNCE to %s:%u transaction_id=%08x, "
"connection_id=%" PRIu64 ", event=%s, infohash=%s", "connection_id=%016" PRIx64 ", event=%s, infohash=%s",
req->remoteAddr.c_str(), req->remotePort, req->remoteAddr.c_str(), req->remotePort,
req->transactionId, req->connectionId, req->transactionId, req->connectionId,
getUDPTrackerEventStr(req->event), getUDPTrackerEventStr(req->event),
@ -401,15 +403,15 @@ struct TimeoutCheck {
if (t >= 10_s) { if (t >= 10_s) {
switch (req->action) { switch (req->action) {
case UDPT_ACT_CONNECT: case UDPT_ACT_CONNECT:
A2_LOG_INFO(fmt("UDPT timeout CONNECT to %s:%u transaction_id=%u", A2_LOG_INFO(fmt("UDPT timeout CONNECT to %s:%u transaction_id=%08x",
req->remoteAddr.c_str(), req->remotePort, req->remoteAddr.c_str(), req->remotePort,
req->transactionId)); req->transactionId));
client->failConnect(req->remoteAddr, req->remotePort, client->failConnect(req->remoteAddr, req->remotePort,
UDPT_ERR_TIMEOUT); UDPT_ERR_TIMEOUT);
break; break;
case UDPT_ACT_ANNOUNCE: case UDPT_ACT_ANNOUNCE:
A2_LOG_INFO(fmt("UDPT timeout ANNOUNCE to %s:%u transaction_id=%u, " A2_LOG_INFO(fmt("UDPT timeout ANNOUNCE to %s:%u transaction_id=%08x, "
"connection_id=%" PRIu64 ", event=%s, infohash=%s", "connection_id=%016" PRIx64 ", event=%s, infohash=%s",
req->remoteAddr.c_str(), req->remotePort, req->remoteAddr.c_str(), req->remotePort,
req->transactionId, req->connectionId, req->transactionId, req->connectionId,
getUDPTrackerEventStr(req->event), getUDPTrackerEventStr(req->event),