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

refactor: use BufferReader, BufferWriter as function args (#5518)

Browse Source
This commit is contained in:
Charles Kerr
2023-05-12 18:10:08 -05:00
committed by GitHub
parent b08e17beef
commit c2d48a7d11
6 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libtransmission/announcer-udp.cc
View File

@@ -49,6 +49,8 @@ using namespace std::literals;
using tau_connection_t = uint64_t;
using tau_transaction_t = uint32_t;
using InBuf = libtransmission::BufferReader<std::byte>;
constexpr auto TauConnectionTtlSecs = time_t{ 45 };
auto tau_transaction_new()
@@ -114,7 +116,7 @@ struct tau_scrape_request
requestFinished();
}
void onResponse(tau_action_t action, libtransmission::Buffer& buf)
void onResponse(tau_action_t action, InBuf& buf)
{
response.did_connect = true;
response.did_timeout = false;
@@ -214,7 +216,7 @@ struct tau_announce_request
this->requestFinished();
}
void onResponse(tau_action_t action, libtransmission::Buffer& buf)
void onResponse(tau_action_t action, InBuf& buf)
{
auto const buflen = std::size(buf);
@@ -309,7 +311,7 @@ struct tau_tracker
mediator_.sendto(buf, buflen, reinterpret_cast<sockaddr const*>(&ss), sslen);
}
void on_connection_response(tau_action_t action, libtransmission::Buffer& buf)
void on_connection_response(tau_action_t action, InBuf& buf)
{
this->connecting_at = 0;
this->connection_transaction_id = 0;

44
libtransmission/peer-msgs.cc
View File

@@ -46,7 +46,8 @@
#endif
using namespace std::literals;
using Buffer = libtransmission::Buffer;
using PeerMessageBuffer = libtransmission::Buffer;
using PeerMessageReader = libtransmission::BufferReader<std::byte>;
namespace
{
@@ -217,7 +218,7 @@ struct tr_incoming
{
std::optional<uint32_t> length; // the full message payload length. Includes the +1 for id length
std::optional<uint8_t> id; // the protocol message, e.g. BtPeerMsgs::Piece
Buffer payload;
PeerMessageBuffer payload;
struct incoming_piece_data
{
@@ -653,8 +654,8 @@ public:
tr_bitfield have_;
private:
friend ReadResult process_peer_message(tr_peerMsgsImpl* msgs, uint8_t id, libtransmission::Buffer& payload);
friend void parseLtepHandshake(tr_peerMsgsImpl* msgs, libtransmission::Buffer& payload);
friend ReadResult process_peer_message(tr_peerMsgsImpl* msgs, uint8_t id, PeerMessageReader& payload);
friend void parseLtepHandshake(tr_peerMsgsImpl* msgs, PeerMessageReader& payload);
tr_peer_callback const callback_;
void* const callback_data_;
@@ -733,23 +734,26 @@ template<typename T>
// ---
void add_param(Buffer& buffer, uint8_t param) noexcept
template<typename BufferWriter>
void add_param(BufferWriter& buffer, uint8_t param) noexcept
{
buffer.add_uint8(param);
}
void add_param(Buffer& buffer, uint16_t param) noexcept
template<typename BufferWriter>
void add_param(BufferWriter& buffer, uint16_t param) noexcept
{
buffer.add_uint16(param);
}
void add_param(Buffer& buffer, uint32_t param) noexcept
template<typename BufferWriter>
void add_param(BufferWriter& buffer, uint32_t param) noexcept
{
buffer.add_uint32(param);
}
template<typename T>
void add_param(Buffer& buffer, T const& param) noexcept
template<typename BufferWriter, typename T>
void add_param(BufferWriter& buffer, T const& param) noexcept
{
buffer.add(param);
}
@@ -786,8 +790,8 @@ template<typename... Args>
}
} // namespace
template<typename... Args>
void build_peer_message(tr_peerMsgsImpl const* const msgs, Buffer& out, uint8_t type, Args const&... args)
template<typename BufferWriter, typename... Args>
void build_peer_message(tr_peerMsgsImpl const* const msgs, BufferWriter& out, uint8_t type, Args const&... args)
{
logtrace(msgs, build_log_message(type, args...));
@@ -806,7 +810,7 @@ size_t protocol_send_message(tr_peerMsgsImpl const* const msgs, uint8_t type, Ar
{
using namespace protocol_send_message_helpers;
auto out = Buffer{};
auto out = PeerMessageBuffer{};
build_peer_message(msgs, out, type, args...);
auto const n_bytes_added = std::size(out);
msgs->io->write(out, type == BtPeerMsgs::Piece);
@@ -817,7 +821,7 @@ size_t protocol_send_keepalive(tr_peerMsgsImpl* msgs)
{
logtrace(msgs, "sending 'keepalive'");
auto out = Buffer{};
auto out = libtransmission::Buffer{};
out.add_uint32(0);
auto const n_bytes_added = std::size(out);
@@ -1008,7 +1012,7 @@ void sendLtepHandshake(tr_peerMsgsImpl* msgs)
tr_variantClear(&val);
}
void parseLtepHandshake(tr_peerMsgsImpl* msgs, libtransmission::Buffer& payload)
void parseLtepHandshake(tr_peerMsgsImpl* msgs, PeerMessageReader& payload)
{
msgs->peerSentLtepHandshake = true;
@@ -1118,7 +1122,7 @@ void parseLtepHandshake(tr_peerMsgsImpl* msgs, libtransmission::Buffer& payload)
tr_variantClear(&val);
}
void parseUtMetadata(tr_peerMsgsImpl* msgs, libtransmission::Buffer& payload_in)
void parseUtMetadata(tr_peerMsgsImpl* msgs, PeerMessageReader& payload_in)
{
int64_t msg_type = -1;
int64_t piece = -1;
@@ -1173,7 +1177,7 @@ void parseUtMetadata(tr_peerMsgsImpl* msgs, libtransmission::Buffer& payload_in)
}
}
void parseUtPex(tr_peerMsgsImpl* msgs, libtransmission::Buffer& payload)
void parseUtPex(tr_peerMsgsImpl* msgs, PeerMessageReader& payload)
{
auto* const tor = msgs->torrent;
if (!tor->allows_pex())
@@ -1221,7 +1225,7 @@ void parseUtPex(tr_peerMsgsImpl* msgs, libtransmission::Buffer& payload)
}
}
void parseLtep(tr_peerMsgsImpl* msgs, libtransmission::Buffer& payload)
void parseLtep(tr_peerMsgsImpl* msgs, PeerMessageReader& payload)
{
TR_ASSERT(!std::empty(payload));
@@ -1256,7 +1260,7 @@ void parseLtep(tr_peerMsgsImpl* msgs, libtransmission::Buffer& payload)
}
}
ReadResult process_peer_message(tr_peerMsgsImpl* msgs, uint8_t id, libtransmission::Buffer& payload);
ReadResult process_peer_message(tr_peerMsgsImpl* msgs, uint8_t id, PeerMessageReader& payload);
void prefetchPieces(tr_peerMsgsImpl* msgs)
{
@@ -1321,7 +1325,7 @@ void peerMadeRequest(tr_peerMsgsImpl* msgs, struct peer_request const* req)
int clientGotBlock(tr_peerMsgsImpl* msgs, std::unique_ptr<std::vector<uint8_t>> block_data, tr_block_index_t block);
ReadResult read_piece_data(tr_peerMsgsImpl* msgs, libtransmission::Buffer& payload)
ReadResult read_piece_data(tr_peerMsgsImpl* msgs, PeerMessageReader& payload)
{
// <index><begin><block>
auto const piece = payload.to_uint32();
@@ -1364,7 +1368,7 @@ ReadResult read_piece_data(tr_peerMsgsImpl* msgs, libtransmission::Buffer& paylo
return { ok ? READ_NOW : READ_ERR, len };
}
ReadResult process_peer_message(tr_peerMsgsImpl* msgs, uint8_t id, libtransmission::Buffer& payload)
ReadResult process_peer_message(tr_peerMsgsImpl* msgs, uint8_t id, PeerMessageReader& payload)
{
bool const fext = msgs->io->supports_fext();

2
libtransmission/peer-socket.cc
View File

@@ -70,7 +70,7 @@ void tr_peer_socket::close()
handle = {};
}
size_t tr_peer_socket::try_write(Buffer& buf, size_t max, tr_error** error) const
size_t tr_peer_socket::try_write(OutBuf& buf, size_t max, tr_error** error) const
{
if (max == size_t{})
{

3
libtransmission/peer-socket.h
View File

@@ -28,6 +28,7 @@ class tr_peer_socket
{
public:
using Buffer = libtransmission::Buffer;
using OutBuf = libtransmission::BufferReader<std::byte>;
tr_peer_socket() = default;
tr_peer_socket(tr_session const* session, tr_address const& address, tr_port port, tr_socket_t sock);
@@ -56,8 +57,8 @@ public:
}
void close();
size_t try_write(Buffer& buf, size_t max, tr_error** error) const;
size_t try_read(Buffer& buf, size_t max, tr_error** error) const;
size_t try_write(OutBuf& buf, size_t max, tr_error** error) const;
[[nodiscard]] constexpr std::pair<tr_address, tr_port> socketAddress() const noexcept
{

3
libtransmission/variant-json.cc
View File

@@ -36,7 +36,6 @@
#include "libtransmission/variant.h"
using namespace std::literals;
using Buffer = libtransmission::Buffer;
namespace
{
@@ -443,7 +442,7 @@ struct JsonWalk
}
std::deque<ParentState> parents;
Buffer out;
libtransmission::Buffer out;
bool doIndent;
};

3
libtransmission/variant.cc
View File

@@ -683,7 +683,8 @@ protected:
size_t idx = {};
};
void sort(std::vector<ByKey>& sortbuf)
template<typename ByKeyContainer>
void sort(ByKeyContainer& sortbuf)
{
if (!tr_variantIsDict(&v))
{