diff options
Diffstat (limited to 'src/UDPTrackerClient.cc')
| -rw-r--r-- | src/UDPTrackerClient.cc | 378 |
1 files changed, 193 insertions, 185 deletions
diff --git a/src/UDPTrackerClient.cc b/src/UDPTrackerClient.cc index 11f39add..cffbf1c9 100644 --- a/src/UDPTrackerClient.cc +++ b/src/UDPTrackerClient.cc @@ -43,15 +43,13 @@ namespace aria2 { -UDPTrackerClient::UDPTrackerClient() - : numWatchers_(0) -{} +UDPTrackerClient::UDPTrackerClient() : numWatchers_(0) {} namespace { -template<typename InputIterator> +template <typename InputIterator> void failRequest(InputIterator first, InputIterator last, int error) { - for(; first != last; ++first) { + for (; first != last; ++first) { (*first)->state = UDPT_STA_COMPLETE; (*first)->error = error; } @@ -59,9 +57,12 @@ void failRequest(InputIterator first, InputIterator last, int error) } // namespace namespace { -int32_t generateTransactionId() +uint32_t generateTransactionId() { - return SimpleRandomizer::getInstance()->getRandomNumber(INT32_MAX); + uint32_t res; + SimpleRandomizer::getInstance()->getRandomBytes( + reinterpret_cast<unsigned char*>(&res), sizeof(res)); + return res; } } // namespace @@ -71,30 +72,31 @@ void logInvalidLength(const std::string& remoteAddr, uint16_t remotePort, { A2_LOG_INFO(fmt("UDPT received %s reply from %s:%u invalid length " "expected:%lu, actual:%lu", - getUDPTrackerActionStr(action), - remoteAddr.c_str(), remotePort, expected, actual)); + getUDPTrackerActionStr(action), remoteAddr.c_str(), + remotePort, expected, actual)); } } // namespace namespace { void logInvalidTransaction(const std::string& remoteAddr, uint16_t remotePort, - int action, int32_t transactionId) + int action, uint32_t transactionId) { - A2_LOG_INFO(fmt("UDPT received %s reply from %s:%u invalid transaction_id=%d", - getUDPTrackerActionStr(action), - remoteAddr.c_str(), remotePort, transactionId)); + A2_LOG_INFO( + fmt("UDPT received %s reply from %s:%u invalid transaction_id=%08x", + getUDPTrackerActionStr(action), remoteAddr.c_str(), remotePort, + transactionId)); } } // namespace namespace { void logTooShortLength(const std::string& remoteAddr, uint16_t remotePort, - int action, - unsigned long minLength, unsigned long actual) + int action, unsigned long minLength, + unsigned long actual) { A2_LOG_INFO(fmt("UDPT received %s reply from %s:%u length too short " "min:%lu, actual:%lu", - getUDPTrackerActionStr(action), - remoteAddr.c_str(), remotePort, minLength, actual)); + getUDPTrackerActionStr(action), remoteAddr.c_str(), + remotePort, minLength, actual)); } } // namespace @@ -111,69 +113,75 @@ namespace { struct CollectAddrPortMatch { bool operator()(const std::shared_ptr<UDPTrackerRequest>& req) const { - if(req->remoteAddr == remoteAddr && req->remotePort == remotePort) { + if (req->remoteAddr == remoteAddr && req->remotePort == remotePort) { dest.push_back(req); return true; - } else { + } + else { return false; } } - std::vector<std::shared_ptr<UDPTrackerRequest> >& dest; + std::vector<std::shared_ptr<UDPTrackerRequest>>& dest; std::string remoteAddr; uint16_t remotePort; - CollectAddrPortMatch(std::vector<std::shared_ptr<UDPTrackerRequest> >& dest, + CollectAddrPortMatch(std::vector<std::shared_ptr<UDPTrackerRequest>>& dest, std::string remoteAddr, uint16_t remotePort) - : dest(dest), remoteAddr(std::move(remoteAddr)), remotePort(remotePort) - {} + : dest(dest), remoteAddr(std::move(remoteAddr)), remotePort(remotePort) + { + } }; } // namespace -int UDPTrackerClient::receiveReply -(const unsigned char* data, size_t length, const std::string& remoteAddr, - uint16_t remotePort, const Timer& now) +int UDPTrackerClient::receiveReply(std::shared_ptr<UDPTrackerRequest>& recvReq, + const unsigned char* data, size_t length, + const std::string& remoteAddr, + uint16_t remotePort, const Timer& now) { int32_t action = bittorrent::getIntParam(data, 0); - switch(action) { + switch (action) { case UDPT_ACT_CONNECT: { - if(length != 16) { + if (length != 16) { logInvalidLength(remoteAddr, remotePort, action, 16, length); return -1; } - int32_t transactionId = bittorrent::getIntParam(data, 4); + auto transactionId = bittorrent::getIntParam(data, 4); std::shared_ptr<UDPTrackerRequest> req = - findInflightRequest(remoteAddr, remotePort, transactionId, true); - if(!req) { + findInflightRequest(remoteAddr, remotePort, transactionId, true); + if (!req) { logInvalidTransaction(remoteAddr, remotePort, action, transactionId); return -1; } req->state = UDPT_STA_COMPLETE; - int64_t connectionId = bittorrent::getLLIntParam(data, 8); - A2_LOG_INFO(fmt("UDPT received CONNECT reply from %s:%u transaction_id=%u," - "connection_id=%" PRId64, remoteAddr.c_str(), remotePort, - transactionId, connectionId)); + auto connectionId = bittorrent::getLLIntParam(data, 8); + A2_LOG_INFO( + fmt("UDPT received CONNECT reply from %s:%u transaction_id=%08x," + "connection_id=%016" PRIx64, + remoteAddr.c_str(), remotePort, transactionId, connectionId)); UDPTrackerConnection c(UDPT_CST_CONNECTED, connectionId, now); connectionIdCache_[std::make_pair(remoteAddr, remotePort)] = c; // Now we have connection ID, push requests which are waiting for // it. - std::vector<std::shared_ptr<UDPTrackerRequest> > reqs; - connectRequests_.erase(std::remove_if - (connectRequests_.begin(), connectRequests_.end(), - CollectAddrPortMatch(reqs, remoteAddr, remotePort)), - connectRequests_.end()); - pendingRequests_.insert(pendingRequests_.begin(), - reqs.begin(), reqs.end()); + std::vector<std::shared_ptr<UDPTrackerRequest>> reqs; + connectRequests_.erase( + std::remove_if(connectRequests_.begin(), connectRequests_.end(), + CollectAddrPortMatch(reqs, remoteAddr, remotePort)), + connectRequests_.end()); + pendingRequests_.insert(pendingRequests_.begin(), reqs.begin(), reqs.end()); + + recvReq = std::move(req); + break; } case UDPT_ACT_ANNOUNCE: { - if(length < 20) { + if (length < 20) { logTooShortLength(remoteAddr, remotePort, action, 20, length); - return - 1; + return -1; } - int32_t transactionId = bittorrent::getIntParam(data, 4); + auto transactionId = bittorrent::getIntParam(data, 4); std::shared_ptr<UDPTrackerRequest> req = - findInflightRequest(remoteAddr, remotePort, transactionId, true); - if(!req) { + findInflightRequest(remoteAddr, remotePort, transactionId, true); + if (!req) { logInvalidTransaction(remoteAddr, remotePort, action, transactionId); return -1; } @@ -187,52 +195,57 @@ int UDPTrackerClient::receiveReply req->reply->seeders = bittorrent::getIntParam(data, 16); int numPeers = 0; - for(size_t i = 20; i < length; i += 6) { + for (size_t i = 20; i < length; i += 6) { std::pair<std::string, uint16_t> hostport = - bittorrent::unpackcompact(data+i, AF_INET); - if(!hostport.first.empty()) { + bittorrent::unpackcompact(data + i, AF_INET); + if (!hostport.first.empty()) { req->reply->peers.push_back(hostport); ++numPeers; } } - A2_LOG_INFO(fmt("UDPT received ANNOUNCE reply from %s:%u transaction_id=%u," - "connection_id=%" PRId64 ", event=%s, infohash=%s, " - "interval=%d, leechers=%d, " - "seeders=%d, num_peers=%d", remoteAddr.c_str(), remotePort, - transactionId, req->connectionId, - getUDPTrackerEventStr(req->event), - util::toHex(req->infohash).c_str(), - req->reply->interval, req->reply->leechers, - req->reply->seeders, numPeers)); + A2_LOG_INFO( + fmt("UDPT received ANNOUNCE reply from %s:%u transaction_id=%08x," + "connection_id=%016" PRIx64 ", event=%s, infohash=%s, " + "interval=%d, leechers=%d, " + "seeders=%d, num_peers=%d", + remoteAddr.c_str(), remotePort, transactionId, req->connectionId, + getUDPTrackerEventStr(req->event), + util::toHex(req->infohash).c_str(), req->reply->interval, + req->reply->leechers, req->reply->seeders, numPeers)); + + recvReq = std::move(req); + break; } case UDPT_ACT_ERROR: { - if(length < 8) { + if (length < 8) { logTooShortLength(remoteAddr, remotePort, action, 8, length); return -1; } - int32_t transactionId = bittorrent::getIntParam(data, 4); + auto transactionId = bittorrent::getIntParam(data, 4); std::shared_ptr<UDPTrackerRequest> req = - findInflightRequest(remoteAddr, remotePort, transactionId, true); - if(!req) { + findInflightRequest(remoteAddr, remotePort, transactionId, true); + if (!req) { logInvalidTransaction(remoteAddr, remotePort, action, transactionId); return -1; } - std::string errorString(data+8, data+length); + std::string errorString(data + 8, data + length); errorString = util::encodeNonUtf8(errorString); req->state = UDPT_STA_COMPLETE; req->error = UDPT_ERR_TRACKER; - A2_LOG_INFO(fmt("UDPT received ERROR reply from %s:%u transaction_id=%u," - "connection_id=%" PRId64 ", action=%d, error_string=%s", - remoteAddr.c_str(), - remotePort, transactionId, req->connectionId, action, - errorString.c_str())); - if(req->action == UDPT_ACT_CONNECT) { + A2_LOG_INFO(fmt("UDPT received ERROR reply from %s:%u transaction_id=%08x," + "connection_id=%016" PRIx64 ", action=%d, error_string=%s", + remoteAddr.c_str(), remotePort, transactionId, + req->connectionId, action, errorString.c_str())); + if (req->action == UDPT_ACT_CONNECT) { failConnect(req->remoteAddr, req->remotePort, UDPT_ERR_TRACKER); } + + recvReq = std::move(req); + break; } case UDPT_ACT_SCRAPE: @@ -240,31 +253,30 @@ int UDPTrackerClient::receiveReply remoteAddr.c_str(), remotePort)); return -1; default: - A2_LOG_INFO(fmt("unknown action reply from %s:%u", - remoteAddr.c_str(), remotePort)); + A2_LOG_INFO( + fmt("unknown action reply from %s:%u", remoteAddr.c_str(), remotePort)); return -1; } return 0; } -ssize_t UDPTrackerClient::createRequest -(unsigned char* data, size_t length, std::string& remoteAddr, - uint16_t& remotePort, const Timer& now) +ssize_t UDPTrackerClient::createRequest(unsigned char* data, size_t length, + std::string& remoteAddr, + uint16_t& remotePort, const Timer& now) { - if(pendingRequests_.empty()) { + if (pendingRequests_.empty()) { return -1; } - while(!pendingRequests_.empty()) { + while (!pendingRequests_.empty()) { const std::shared_ptr<UDPTrackerRequest>& req = pendingRequests_.front(); - if(req->action == UDPT_ACT_CONNECT) { + if (req->action == UDPT_ACT_CONNECT) { ssize_t rv; rv = createUDPTrackerConnect(data, length, remoteAddr, remotePort, req); return rv; } - UDPTrackerConnection* c = getConnectionId(req->remoteAddr, - req->remotePort, - now); - if(!c) { + UDPTrackerConnection* c = + getConnectionId(req->remoteAddr, req->remotePort, now); + if (!c) { auto creq = std::make_shared<UDPTrackerRequest>(); creq->action = UDPT_ACT_CONNECT; creq->remoteAddr = req->remoteAddr; @@ -275,7 +287,7 @@ ssize_t UDPTrackerClient::createRequest rv = createUDPTrackerConnect(data, length, remoteAddr, remotePort, creq); return rv; } - if(c->state == UDPT_CST_CONNECTING) { + if (c->state == UDPT_CST_CONNECTING) { connectRequests_.push_back(req); pendingRequests_.pop_front(); continue; @@ -291,20 +303,20 @@ ssize_t UDPTrackerClient::createRequest void UDPTrackerClient::requestSent(const Timer& now) { - if(pendingRequests_.empty()) { + if (pendingRequests_.empty()) { A2_LOG_WARN("pendingRequests_ is empty"); return; } const std::shared_ptr<UDPTrackerRequest>& req = pendingRequests_.front(); - switch(req->action) { + switch (req->action) { 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->transactionId)); break; case UDPT_ACT_ANNOUNCE: - A2_LOG_INFO(fmt("UDPT sent ANNOUNCE to %s:%u transaction_id=%u, " - "connection_id=%" PRId64 ", event=%s, infohash=%s", + A2_LOG_INFO(fmt("UDPT sent ANNOUNCE to %s:%u transaction_id=%08x, " + "connection_id=%016" PRIx64 ", event=%s, infohash=%s", req->remoteAddr.c_str(), req->remotePort, req->transactionId, req->connectionId, getUDPTrackerEventStr(req->event), @@ -315,10 +327,10 @@ void UDPTrackerClient::requestSent(const Timer& now) assert(0); } req->dispatched = now; - switch(req->action) { + switch (req->action) { case UDPT_ACT_CONNECT: { - connectionIdCache_[std::make_pair(req->remoteAddr, req->remotePort)] - = UDPTrackerConnection(); + connectionIdCache_[std::make_pair(req->remoteAddr, req->remotePort)] = + UDPTrackerConnection(); break; } } @@ -328,21 +340,21 @@ void UDPTrackerClient::requestSent(const Timer& now) void UDPTrackerClient::requestFail(int error) { - if(pendingRequests_.empty()) { + if (pendingRequests_.empty()) { A2_LOG_WARN("pendingRequests_ is empty"); return; } const std::shared_ptr<UDPTrackerRequest>& req = pendingRequests_.front(); - switch(req->action) { + switch (req->action) { 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->transactionId)); failConnect(req->remoteAddr, req->remotePort, error); break; case UDPT_ACT_ANNOUNCE: - A2_LOG_INFO(fmt("UDPT fail ANNOUNCE to %s:%u transaction_id=%u, " - "connection_id=%" PRId64 ", event=%s, infohash=%s", + A2_LOG_INFO(fmt("UDPT fail ANNOUNCE to %s:%u transaction_id=%08x, " + "connection_id=%016" PRIx64 ", event=%s, infohash=%s", req->remoteAddr.c_str(), req->remotePort, req->transactionId, req->connectionId, getUDPTrackerEventStr(req->event), @@ -369,17 +381,17 @@ struct TimeoutCheck { bool operator()(const std::shared_ptr<UDPTrackerRequest>& req) const { auto t = req->dispatched.difference(now); - if(req->failCount == 0) { - if(t >= 15_s) { - switch(req->action) { + if (req->failCount == 0) { + if (t >= 5_s) { + switch (req->action) { 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->transactionId)); break; - case UDPT_ACT_ANNOUNCE: - A2_LOG_INFO(fmt("UDPT resend ANNOUNCE to %s:%u transaction_id=%u, " - "connection_id=%" PRId64 ", event=%s, infohash=%s", + case UDPT_ACT_ANNOUNCE: + A2_LOG_INFO(fmt("UDPT resend ANNOUNCE to %s:%u transaction_id=%08x, " + "connection_id=%016" PRIx64 ", event=%s, infohash=%s", req->remoteAddr.c_str(), req->remotePort, req->transactionId, req->connectionId, getUDPTrackerEventStr(req->event), @@ -392,22 +404,24 @@ struct TimeoutCheck { ++req->failCount; dest.push_back(req); return true; - } else { + } + else { return false; } - } else { - if(t >= 1_min) { - switch(req->action) { + } + else { + if (t >= 10_s) { + switch (req->action) { 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->transactionId)); client->failConnect(req->remoteAddr, req->remotePort, UDPT_ERR_TIMEOUT); break; case UDPT_ACT_ANNOUNCE: - A2_LOG_INFO(fmt("UDPT timeout ANNOUNCE to %s:%u transaction_id=%u, " - "connection_id=%" PRId64 ", event=%s, infohash=%s", + A2_LOG_INFO(fmt("UDPT timeout ANNOUNCE to %s:%u transaction_id=%08x, " + "connection_id=%016" PRIx64 ", event=%s, infohash=%s", req->remoteAddr.c_str(), req->remotePort, req->transactionId, req->connectionId, getUDPTrackerEventStr(req->event), @@ -421,25 +435,26 @@ struct TimeoutCheck { req->state = UDPT_STA_COMPLETE; req->error = UDPT_ERR_TIMEOUT; return true; - } else { + } + else { return false; } } } - std::vector<std::shared_ptr<UDPTrackerRequest> >& dest; + std::vector<std::shared_ptr<UDPTrackerRequest>>& dest; UDPTrackerClient* client; const Timer& now; - TimeoutCheck(std::vector<std::shared_ptr<UDPTrackerRequest> >& dest, - UDPTrackerClient* client, - const Timer& now) - : dest(dest), client(client), now(now) - {} + TimeoutCheck(std::vector<std::shared_ptr<UDPTrackerRequest>>& dest, + UDPTrackerClient* client, const Timer& now) + : dest(dest), client(client), now(now) + { + } }; } // namespace void UDPTrackerClient::handleTimeout(const Timer& now) { - std::vector<std::shared_ptr<UDPTrackerRequest> > dest; + std::vector<std::shared_ptr<UDPTrackerRequest>> dest; inflightRequests_.erase(std::remove_if(inflightRequests_.begin(), inflightRequests_.end(), TimeoutCheck(dest, this, now)), @@ -447,18 +462,18 @@ void UDPTrackerClient::handleTimeout(const Timer& now) pendingRequests_.insert(pendingRequests_.begin(), dest.begin(), dest.end()); } -std::shared_ptr<UDPTrackerRequest> UDPTrackerClient::findInflightRequest -(const std::string& remoteAddr, uint16_t remotePort, int32_t transactionId, - bool remove) +std::shared_ptr<UDPTrackerRequest> +UDPTrackerClient::findInflightRequest(const std::string& remoteAddr, + uint16_t remotePort, + uint32_t transactionId, bool remove) { std::shared_ptr<UDPTrackerRequest> res; - for(auto i = inflightRequests_.begin(), eoi = inflightRequests_.end(); - i != eoi; - ++i) { - if((*i)->remoteAddr == remoteAddr && (*i)->remotePort == remotePort && - (*i)->transactionId == transactionId) { + for (auto i = inflightRequests_.begin(), eoi = inflightRequests_.end(); + i != eoi; ++i) { + if ((*i)->remoteAddr == remoteAddr && (*i)->remotePort == remotePort && + (*i)->transactionId == transactionId) { res = *i; - if(remove) { + if (remove) { inflightRequests_.erase(i); } break; @@ -467,18 +482,20 @@ std::shared_ptr<UDPTrackerRequest> UDPTrackerClient::findInflightRequest return res; } -UDPTrackerConnection* UDPTrackerClient::getConnectionId -(const std::string& remoteAddr, uint16_t remotePort, const Timer& now) +UDPTrackerConnection* +UDPTrackerClient::getConnectionId(const std::string& remoteAddr, + uint16_t remotePort, const Timer& now) { auto i = connectionIdCache_.find(std::make_pair(remoteAddr, remotePort)); - if(i == connectionIdCache_.end()) { + if (i == connectionIdCache_.end()) { return nullptr; } - if((*i).second.state == UDPT_CST_CONNECTED && - (*i).second.lastUpdated.difference(now) > 1_min) { + if ((*i).second.state == UDPT_CST_CONNECTED && + (*i).second.lastUpdated.difference(now) > 1_min) { connectionIdCache_.erase(i); return nullptr; - } else { + } + else { return &(*i).second; } } @@ -487,24 +504,25 @@ namespace { struct FailConnectDelete { bool operator()(const std::shared_ptr<UDPTrackerRequest>& req) const { - if(req->action == UDPT_ACT_ANNOUNCE && - req->remoteAddr == remoteAddr && req->remotePort == remotePort) { - A2_LOG_INFO(fmt("Force fail infohash=%s", - util::toHex(req->infohash).c_str())); + if (req->action == UDPT_ACT_ANNOUNCE && req->remoteAddr == remoteAddr && + req->remotePort == remotePort) { + A2_LOG_INFO( + fmt("Force fail infohash=%s", util::toHex(req->infohash).c_str())); req->state = UDPT_STA_COMPLETE; req->error = error; return true; - } else { + } + else { return false; } } std::string remoteAddr; uint16_t remotePort; int error; - FailConnectDelete(std::string remoteAddr, uint16_t remotePort, - int error) - : remoteAddr(std::move(remoteAddr)), remotePort(remotePort), error(error) - {} + FailConnectDelete(std::string remoteAddr, uint16_t remotePort, int error) + : remoteAddr(std::move(remoteAddr)), remotePort(remotePort), error(error) + { + } }; } // namespace @@ -513,16 +531,14 @@ void UDPTrackerClient::failConnect(const std::string& remoteAddr, { connectionIdCache_.erase(std::make_pair(remoteAddr, remotePort)); // Fail all requests which are waiting for connection ID of the host. - connectRequests_.erase(std::remove_if(connectRequests_.begin(), - connectRequests_.end(), - FailConnectDelete - (remoteAddr, remotePort, error)), - connectRequests_.end()); - pendingRequests_.erase(std::remove_if(pendingRequests_.begin(), - pendingRequests_.end(), - FailConnectDelete - (remoteAddr, remotePort, error)), - pendingRequests_.end()); + connectRequests_.erase( + std::remove_if(connectRequests_.begin(), connectRequests_.end(), + FailConnectDelete(remoteAddr, remotePort, error)), + connectRequests_.end()); + pendingRequests_.erase( + std::remove_if(pendingRequests_.begin(), pendingRequests_.end(), + FailConnectDelete(remoteAddr, remotePort, error)), + pendingRequests_.end()); } void UDPTrackerClient::failAll() @@ -533,60 +549,52 @@ void UDPTrackerClient::failAll() failRequest(connectRequests_.begin(), connectRequests_.end(), error); } -void UDPTrackerClient::increaseWatchers() -{ - ++numWatchers_; -} +void UDPTrackerClient::increaseWatchers() { ++numWatchers_; } -void UDPTrackerClient::decreaseWatchers() -{ - --numWatchers_; -} +void UDPTrackerClient::decreaseWatchers() { --numWatchers_; } -ssize_t createUDPTrackerConnect -(unsigned char* data, size_t length, - std::string& remoteAddr, uint16_t& remotePort, - const std::shared_ptr<UDPTrackerRequest>& req) +ssize_t createUDPTrackerConnect(unsigned char* data, size_t length, + std::string& remoteAddr, uint16_t& remotePort, + const std::shared_ptr<UDPTrackerRequest>& req) { assert(length >= 16); remoteAddr = req->remoteAddr; remotePort = req->remotePort; bittorrent::setLLIntParam(data, UDPT_INITIAL_CONNECTION_ID); - bittorrent::setIntParam(data+8, req->action); - bittorrent::setIntParam(data+12, req->transactionId); + bittorrent::setIntParam(data + 8, req->action); + bittorrent::setIntParam(data + 12, req->transactionId); return 16; } -ssize_t createUDPTrackerAnnounce -(unsigned char* data, size_t length, - std::string& remoteAddr, uint16_t& remotePort, - const std::shared_ptr<UDPTrackerRequest>& req) +ssize_t createUDPTrackerAnnounce(unsigned char* data, size_t length, + std::string& remoteAddr, uint16_t& remotePort, + const std::shared_ptr<UDPTrackerRequest>& req) { assert(length >= 100); remoteAddr = req->remoteAddr; remotePort = req->remotePort; bittorrent::setLLIntParam(data, req->connectionId); - bittorrent::setIntParam(data+8, req->action); - bittorrent::setIntParam(data+12, req->transactionId); - memcpy(data+16, req->infohash.c_str(), req->infohash.size()); - memcpy(data+36, req->peerId.c_str(), req->peerId.size()); - bittorrent::setLLIntParam(data+56, req->downloaded); - bittorrent::setLLIntParam(data+64, req->left); - bittorrent::setLLIntParam(data+72, req->uploaded); - bittorrent::setIntParam(data+80, req->event); + bittorrent::setIntParam(data + 8, req->action); + bittorrent::setIntParam(data + 12, req->transactionId); + memcpy(data + 16, req->infohash.c_str(), req->infohash.size()); + memcpy(data + 36, req->peerId.c_str(), req->peerId.size()); + bittorrent::setLLIntParam(data + 56, req->downloaded); + bittorrent::setLLIntParam(data + 64, req->left); + bittorrent::setLLIntParam(data + 72, req->uploaded); + bittorrent::setIntParam(data + 80, req->event); // ip is already network-byte order - memcpy(data+84, &req->ip, sizeof(req->ip)); - bittorrent::setIntParam(data+88, req->key); - bittorrent::setIntParam(data+92, req->numWant); - bittorrent::setShortIntParam(data+96, req->port); + memcpy(data + 84, &req->ip, sizeof(req->ip)); + bittorrent::setIntParam(data + 88, req->key); + bittorrent::setIntParam(data + 92, req->numWant); + bittorrent::setShortIntParam(data + 96, req->port); // extensions is always 0 - bittorrent::setShortIntParam(data+98, 0); + bittorrent::setShortIntParam(data + 98, 0); return 100; } const char* getUDPTrackerActionStr(int action) { - switch(action) { + switch (action) { case UDPT_ACT_CONNECT: return "CONNECT"; case UDPT_ACT_ANNOUNCE: @@ -600,7 +608,7 @@ const char* getUDPTrackerActionStr(int action) const char* getUDPTrackerEventStr(int event) { - switch(event) { + switch (event) { case UDPT_EVT_NONE: return "NONE"; case UDPT_EVT_COMPLETED: |