forked from premiere/premiere-libtorrent
minor code cleanup, more use of const
This commit is contained in:
parent
26b0487f0b
commit
8da635d1f5
|
@ -35,8 +35,6 @@ POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
#include <libtorrent/kademlia/traversal_algorithm.hpp>
|
#include <libtorrent/kademlia/traversal_algorithm.hpp>
|
||||||
#include <libtorrent/kademlia/node_id.hpp>
|
#include <libtorrent/kademlia/node_id.hpp>
|
||||||
#include <libtorrent/kademlia/routing_table.hpp>
|
|
||||||
#include <libtorrent/kademlia/rpc_manager.hpp>
|
|
||||||
#include <libtorrent/kademlia/observer.hpp>
|
#include <libtorrent/kademlia/observer.hpp>
|
||||||
#include <libtorrent/kademlia/msg.hpp>
|
#include <libtorrent/kademlia/msg.hpp>
|
||||||
|
|
||||||
|
|
|
@ -283,7 +283,7 @@ static_assert(int(job_action_name.size()) == static_cast<int>(job_action_t::num_
|
||||||
, int(pe->outstanding_flush), int(pe->piece), int(pe->num_dirty)
|
, int(pe->outstanding_flush), int(pe->piece), int(pe->num_dirty)
|
||||||
, int(pe->num_blocks), int(pe->blocks_in_piece), int(pe->hashing_done)
|
, int(pe->num_blocks), int(pe->blocks_in_piece), int(pe->hashing_done)
|
||||||
, int(pe->marked_for_eviction), int(pe->need_readback), pe->hash_passes
|
, int(pe->marked_for_eviction), int(pe->need_readback), pe->hash_passes
|
||||||
, int(pe->read_jobs.size()), int(pe->jobs.size()));
|
, pe->read_jobs.size(), pe->jobs.size());
|
||||||
bool first = true;
|
bool first = true;
|
||||||
for (auto const& log : pe->piece_log)
|
for (auto const& log : pe->piece_log)
|
||||||
{
|
{
|
||||||
|
|
|
@ -2405,7 +2405,7 @@ namespace {
|
||||||
TORRENT_ASSERT(m_statistics.last_protocol_downloaded() - cur_protocol_dl >= 0);
|
TORRENT_ASSERT(m_statistics.last_protocol_downloaded() - cur_protocol_dl >= 0);
|
||||||
std::int64_t const stats_diff = m_statistics.last_payload_downloaded() - cur_payload_dl +
|
std::int64_t const stats_diff = m_statistics.last_payload_downloaded() - cur_payload_dl +
|
||||||
m_statistics.last_protocol_downloaded() - cur_protocol_dl;
|
m_statistics.last_protocol_downloaded() - cur_protocol_dl;
|
||||||
TORRENT_ASSERT(stats_diff == int(sub_transferred));
|
TORRENT_ASSERT(stats_diff == sub_transferred);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (m_disconnecting) return;
|
if (m_disconnecting) return;
|
||||||
|
@ -2665,7 +2665,7 @@ namespace {
|
||||||
rc4_decrypt({m_sync_vc.get(), 8});
|
rc4_decrypt({m_sync_vc.get(), 8});
|
||||||
}
|
}
|
||||||
|
|
||||||
TORRENT_ASSERT(m_sync_vc.get());
|
TORRENT_ASSERT(m_sync_vc);
|
||||||
int const syncoffset = search({m_sync_vc.get(), 8}, recv_buffer);
|
int const syncoffset = search({m_sync_vc.get(), 8}, recv_buffer);
|
||||||
|
|
||||||
// No sync
|
// No sync
|
||||||
|
@ -2791,7 +2791,7 @@ namespace {
|
||||||
m_rc4_encrypted = true;
|
m_rc4_encrypted = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
int len_pad = aux::read_int16(recv_buffer);
|
int const len_pad = aux::read_int16(recv_buffer);
|
||||||
if (len_pad < 0 || len_pad > 512)
|
if (len_pad < 0 || len_pad > 512)
|
||||||
{
|
{
|
||||||
disconnect(errors::invalid_pad_size, operation_t::encryption, 2);
|
disconnect(errors::invalid_pad_size, operation_t::encryption, 2);
|
||||||
|
@ -2835,7 +2835,7 @@ namespace {
|
||||||
if (!is_outgoing())
|
if (!is_outgoing())
|
||||||
{
|
{
|
||||||
recv_buffer = recv_buffer.subspan(aux::numeric_cast<std::size_t>(pad_size));
|
recv_buffer = recv_buffer.subspan(aux::numeric_cast<std::size_t>(pad_size));
|
||||||
int len_ia = aux::read_int16(recv_buffer);
|
int const len_ia = aux::read_int16(recv_buffer);
|
||||||
|
|
||||||
if (len_ia < 0)
|
if (len_ia < 0)
|
||||||
{
|
{
|
||||||
|
@ -2958,7 +2958,7 @@ namespace {
|
||||||
static const char protocol_string[] = "\x13" "BitTorrent protocol";
|
static const char protocol_string[] = "\x13" "BitTorrent protocol";
|
||||||
|
|
||||||
if (packet_size != 19 ||
|
if (packet_size != 19 ||
|
||||||
memcmp(recv_buffer.begin(), protocol_string, 20) != 0)
|
std::memcmp(recv_buffer.begin(), protocol_string, 20) != 0)
|
||||||
{
|
{
|
||||||
#if !defined(TORRENT_DISABLE_ENCRYPTION) && !defined(TORRENT_DISABLE_EXTENSIONS)
|
#if !defined(TORRENT_DISABLE_ENCRYPTION) && !defined(TORRENT_DISABLE_EXTENSIONS)
|
||||||
#ifndef TORRENT_DISABLE_LOGGING
|
#ifndef TORRENT_DISABLE_LOGGING
|
||||||
|
@ -3280,7 +3280,7 @@ namespace {
|
||||||
TORRENT_ASSERT(bytes_transferred <= 1);
|
TORRENT_ASSERT(bytes_transferred <= 1);
|
||||||
|
|
||||||
const char* ptr = recv_buffer.begin();
|
const char* ptr = recv_buffer.begin();
|
||||||
int packet_size = detail::read_int32(ptr);
|
int const packet_size = detail::read_int32(ptr);
|
||||||
|
|
||||||
// don't accept packets larger than 1 MB
|
// don't accept packets larger than 1 MB
|
||||||
if (packet_size > 1024 * 1024 || packet_size < 0)
|
if (packet_size > 1024 * 1024 || packet_size < 0)
|
||||||
|
|
Loading…
Reference in New Issue