Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-20 02:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: clarify DhtPort specific usage (#6963)

Browse Source
This commit is contained in:
T Reardon
2024-07-10 18:42:47 -06:00
committed by GitHub
parent 415c0a8aa3
commit 7f79cb16ee
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libtransmission/peer-msgs.cc
View File

@@ -81,7 +81,7 @@ auto constexpr Piece = uint8_t{ 7 };
auto constexpr Cancel = uint8_t{ 8 }; auto constexpr Cancel = uint8_t{ 8 };
// https://www.bittorrent.org/beps/bep_0005.html#bittorrent-protocol-extension // https://www.bittorrent.org/beps/bep_0005.html#bittorrent-protocol-extension
auto constexpr Port = uint8_t{ 9 }; auto constexpr DhtPort = uint8_t{ 9 };
// https://www.bittorrent.org/beps/bep_0006.html // https://www.bittorrent.org/beps/bep_0006.html
auto constexpr FextSuggest = uint8_t{ 13 }; auto constexpr FextSuggest = uint8_t{ 13 };
@@ -124,8 +124,8 @@ auto constexpr Ltep = uint8_t{ 20 };
return "not-interested"sv; return "not-interested"sv;
case Piece: case Piece:
return "piece"sv; return "piece"sv;
case Port: case DhtPort:
return "port"sv; return "dht-port"sv;
case Request: case Request:
return "request"sv; return "request"sv;
case Unchoke: case Unchoke:
@@ -332,7 +332,7 @@ public:
if (session->allowsDHT() && io_->supports_dht()) if (session->allowsDHT() && io_->supports_dht())
{ {
protocol_send_port(session->udpPort()); protocol_send_dht_port(session->udpPort());
} }
io_->set_callbacks(can_read, did_write, got_error, this); io_->set_callbacks(can_read, did_write, got_error, this);
@@ -630,9 +630,9 @@ private:
return protocol_send_message(BtPeerMsgs::Request, req.index, req.offset, req.length); return protocol_send_message(BtPeerMsgs::Request, req.index, req.offset, req.length);
} }
size_t protocol_send_port(tr_port const port) const size_t protocol_send_dht_port(tr_port const port) const
{ {
return protocol_send_message(BtPeerMsgs::Port, port.host()); return protocol_send_message(BtPeerMsgs::DhtPort, port.host());
} }
size_t protocol_send_have(tr_piece_index_t const index) const size_t protocol_send_have(tr_piece_index_t const index) const
@@ -746,7 +746,7 @@ private:
len -= sizeof(id) + sizeof(uint32_t /*piece*/) + sizeof(uint32_t /*offset*/); len -= sizeof(id) + sizeof(uint32_t /*piece*/) + sizeof(uint32_t /*offset*/);
return len <= tr_block_info::BlockSize; return len <= tr_block_info::BlockSize;
case BtPeerMsgs::Port: case BtPeerMsgs::DhtPort:
return len == 3U; return len == 3U;
case BtPeerMsgs::Ltep: case BtPeerMsgs::Ltep:
@@ -1468,7 +1468,7 @@ ReadResult tr_peerMsgsImpl::process_peer_message(uint8_t id, MessageReader& payl
case BtPeerMsgs::Piece: case BtPeerMsgs::Piece:
return read_piece_data(payload); return read_piece_data(payload);
case BtPeerMsgs::Port: case BtPeerMsgs::DhtPort:
// https://www.bittorrent.org/beps/bep_0005.html // https://www.bittorrent.org/beps/bep_0005.html
// Peers supporting the DHT set the last bit of the 8-byte reserved flags // Peers supporting the DHT set the last bit of the 8-byte reserved flags
// exchanged in the BitTorrent protocol handshake. Peer receiving a handshake // exchanged in the BitTorrent protocol handshake. Peer receiving a handshake
@@ -1476,7 +1476,7 @@ ReadResult tr_peerMsgsImpl::process_peer_message(uint8_t id, MessageReader& payl
// It begins with byte 0x09 and has a two byte payload containing the UDP // It begins with byte 0x09 and has a two byte payload containing the UDP
// port of the DHT node in network byte order. // port of the DHT node in network byte order.
{ {
logtrace(this, "Got a BtPeerMsgs::Port"); logtrace(this, "Got a BtPeerMsgs::DhtPort");
auto const hport = payload.to_uint16(); auto const hport = payload.to_uint16();
if (auto const dht_port = tr_port::from_host(hport); !std::empty(dht_port)) if (auto const dht_port = tr_port::from_host(hport); !std::empty(dht_port))