wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

fixed extended handshake error handling to be more robust and fix extension message precedence over plugins

This commit is contained in:
Arvid Norberg 2011-02-19 21:20:03 +00:00
parent 3a89bcf6ff
commit 10a00fc62b
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/bt_peer_connection.cpp
View File

@ -1578,6 +1578,7 @@ namespace libtorrent
, ((error >= 0 && error < 4)?err_msg[error]:"unknown message id")); , ((error >= 0 && error < 4)?err_msg[error]:"unknown message id"));
#endif #endif
// #error deal with holepunch errors // #error deal with holepunch errors
(void)error;
} break; } break;
#if defined TORRENT_VERBOSE_LOGGING #if defined TORRENT_VERBOSE_LOGGING
default: default:
@ -1672,9 +1673,23 @@ namespace libtorrent
return; return;
} }
if (extended_id == share_mode_msg)
{
if (!packet_finished()) return;
bool sm = detail::read_uint8(recv_buffer.begin);
#ifdef TORRENT_VERBOSE_LOGGING
peer_log("<== SHARE_MODE [ %s ]", (sm?"true":"false"));
#endif
set_share_mode(sm);
return;
}
if (extended_id == holepunch_msg) if (extended_id == holepunch_msg)
{ {
if (!packet_finished()) return; if (!packet_finished()) return;
#ifdef TORRENT_VERBOSE_LOGGING
peer_log("<== HOLEPUNCH");
#endif
on_holepunch(); on_holepunch();
return; return;
} }
@ -1695,20 +1710,6 @@ namespace libtorrent
} }
#endif #endif
if (extended_id == upload_only_msg)
{
if (!packet_finished()) return;
set_upload_only(detail::read_uint8(recv_buffer.begin));
return;
}
if (extended_id == share_mode_msg)
{
if (!packet_finished()) return;
set_share_mode(detail::read_uint8(recv_buffer.begin));
return;
}
disconnect(errors::invalid_message, 2); disconnect(errors::invalid_message, 2);
return; return;
} }
@ -1725,8 +1726,8 @@ namespace libtorrent
lazy_entry root; lazy_entry root;
error_code ec; error_code ec;
int pos; int pos;
lazy_bdecode(recv_buffer.begin + 2, recv_buffer.end, root, ec, &pos); int ret = lazy_bdecode(recv_buffer.begin + 2, recv_buffer.end, root, ec, &pos);
if (root.type() != lazy_entry::dict_t) if (ret != 0 || ec || root.type() != lazy_entry::dict_t)
{ {
#ifdef TORRENT_VERBOSE_LOGGING #ifdef TORRENT_VERBOSE_LOGGING
peer_log("*** invalid extended handshake: %s pos: %d" peer_log("*** invalid extended handshake: %s pos: %d"