premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

improve type-safety a bit in the hole-punch code

This commit is contained in:
arvidn 2018-11-16 09:32:45 +01:00 committed by Arvid Norberg
parent e3c5b6c13c
commit 3126e8f39e
3 changed files with 49 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/libtorrent/bt_peer_connection.hpp
View File

@ -148,18 +148,22 @@ namespace libtorrent {
num_supported_messages
};
enum hp_message_t
enum class hp_message : std::uint8_t
{
// msg_types
hp_rendezvous = 0,
hp_connect = 1,
hp_failed = 2,
rendezvous = 0,
connect = 1,
failed = 2
};
enum class hp_error
{
// error codes
hp_no_such_peer = 1,
hp_not_connected = 2,
hp_no_support = 3,
hp_no_self = 4
no_error = 0,
no_such_peer = 1,
not_connected = 2,
no_support = 3,
no_self = 4
};
// called from the main loop when this connection has any
@ -241,7 +245,8 @@ namespace libtorrent {
void write_upload_only(bool enabled) override;
void write_extensions();
void write_share_mode();
void write_holepunch_msg(int type, tcp::endpoint const& ep, int error);
void write_holepunch_msg(hp_message type, tcp::endpoint const& ep
, hp_error error = hp_error::no_error);
// DHT extension
void write_dht_port(int listen_port);

60
src/bt_peer_connection.cpp
View File

@ -1336,7 +1336,7 @@ namespace {
// ignore invalid messages
if (int(recv_buffer.size()) < 2) return;
int const msg_type = detail::read_uint8(ptr);
auto const msg_type = static_cast<hp_message>(detail::read_uint8(ptr));
int const addr_type = detail::read_uint8(ptr);
tcp::endpoint ep;
@ -1361,7 +1361,9 @@ namespace {
static const char* hp_msg_name[] = {"rendezvous", "connect", "failed"};
peer_log(peer_log_alert::incoming_message, "HOLEPUNCH"
, "msg: %s from %s to: unknown address type"
, (msg_type >= 0 && msg_type < 3 ? hp_msg_name[msg_type] : "unknown message type")
, (static_cast<int>(msg_type) < 3
? hp_msg_name[static_cast<int>(msg_type)]
: "unknown message type")
, print_address(remote().address()).c_str());
}
#endif
@ -1369,12 +1371,26 @@ namespace {
return; // unknown address type
}
#ifndef TORRENT_DISABLE_LOGGING
if (msg_type > hp_message::failed)
{
if (should_log(peer_log_alert::incoming_message))
{
peer_log(peer_log_alert::incoming_message, "HOLEPUNCH"
, "msg: unknown message type (%d) to: %s"
, static_cast<int>(msg_type)
, print_address(ep.address()).c_str());
}
return;
}
#endif
std::shared_ptr<torrent> t = associated_torrent().lock();
if (!t) return;
switch (msg_type)
{
case hp_rendezvous: // rendezvous
case hp_message::rendezvous: // rendezvous
{
#ifndef TORRENT_DISABLE_LOGGING
if (should_log(peer_log_alert::incoming_message))
@ -1390,24 +1406,24 @@ namespace {
if (p == nullptr)
{
// we're not connected to this peer
write_holepunch_msg(hp_failed, ep, hp_not_connected);
write_holepunch_msg(hp_message::failed, ep, hp_error::not_connected);
break;
}
if (!p->supports_holepunch())
{
write_holepunch_msg(hp_failed, ep, hp_no_support);
write_holepunch_msg(hp_message::failed, ep, hp_error::no_support);
break;
}
if (p == this)
{
write_holepunch_msg(hp_failed, ep, hp_no_self);
write_holepunch_msg(hp_message::failed, ep, hp_error::no_self);
break;
}
write_holepunch_msg(hp_connect, ep, 0);
p->write_holepunch_msg(hp_connect, remote(), 0);
write_holepunch_msg(hp_message::connect, ep);
p->write_holepunch_msg(hp_message::connect, remote());
} break;
case hp_connect:
case hp_message::connect:
{
// add or find the peer with this endpoint
torrent_peer* p = t->add_peer(ep, peer_info::pex);
@ -1457,7 +1473,7 @@ namespace {
}
#endif
} break;
case hp_failed:
case hp_message::failed:
{
std::uint32_t error = detail::read_uint32(ptr);
#ifndef TORRENT_DISABLE_LOGGING
@ -1472,21 +1488,11 @@ namespace {
// #error deal with holepunch errors
(void)error;
} break;
#ifndef TORRENT_DISABLE_LOGGING
default:
{
if (should_log(peer_log_alert::incoming_message))
{
peer_log(peer_log_alert::incoming_message, "HOLEPUNCH"
, "msg: unknown message type (%d) to: %s"
, msg_type, print_address(ep.address()).c_str());
}
}
#endif
}
}
void bt_peer_connection::write_holepunch_msg(int const type, tcp::endpoint const& ep, int const error)
void bt_peer_connection::write_holepunch_msg(hp_message const type
, tcp::endpoint const& ep, hp_error const error)
{
char buf[35];
char* ptr = buf + 6;
@ -1502,14 +1508,16 @@ namespace {
static const char* hp_error_string[] = {"", "no such peer", "not connected", "no support", "no self"};
peer_log(peer_log_alert::outgoing_message, "HOLEPUNCH"
, "msg: %s to: %s error: %s"
, (type >= 0 && type < 3 ? hp_msg_name[type] : "unknown message type")
, (static_cast<std::uint8_t>(type) < 3
? hp_msg_name[static_cast<std::uint8_t>(type)]
: "unknown message type")
, print_address(ep.address()).c_str()
, hp_error_string[error]);
, hp_error_string[static_cast<int>(error)]);
}
#endif
if (type == hp_failed)
if (type == hp_message::failed)
{
detail::write_uint32(error, ptr);
detail::write_uint32(static_cast<int>(error), ptr);
}
// write the packet length and type

2
src/peer_connection.cpp
View File

@ -4123,7 +4123,7 @@ namespace libtorrent {
// see if we can try a holepunch
bt_peer_connection* p = t->find_introducer(remote());
if (p)
p->write_holepunch_msg(bt_peer_connection::hp_rendezvous, remote(), 0);
p->write_holepunch_msg(bt_peer_connection::hp_message::rendezvous, remote());
}
#endif