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

merged changes from RC_1_0

This commit is contained in:
Arvid Norberg 2014-08-28 07:11:34 +00:00
parent 695589c6ef
commit 48e4cf9478
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/broadcast_socket.cpp
View File

@ -258,7 +258,10 @@ namespace libtorrent
if (!loopback && is_loopback(i->interface_address)) continue; if (!loopback && is_loopback(i->interface_address)) continue;
ec = error_code(); ec = error_code();
#if TORRENT_USE_IPV6
// if_nametoindex was introduced in vista
#if TORRENT_USE_IPV6 \
&& (!defined TORRENT_WINDOWS || _WIN32_WINNT >= _WIN32_WINNT_VISTA)
if (i->interface_address.is_v6() && if (i->interface_address.is_v6() &&
i->interface_address.to_v6().is_link_local()) { i->interface_address.to_v6().is_link_local()) {
address_v6 addr6 = i->interface_address.to_v6(); address_v6 addr6 = i->interface_address.to_v6();

8
test/test_dht.cpp
View File

@ -1367,14 +1367,6 @@ int test_main()
// test traversal algorithms // test traversal algorithms
dht::key_desc_t ping_desc[] = {
{"y", lazy_entry::string_t, 1, 0},
{"t", lazy_entry::string_t, 2, 0},
{"q", lazy_entry::string_t, 4, 0},
{"a", lazy_entry::dict_t, 0, key_desc_t::parse_children},
{"id", lazy_entry::string_t, 20, key_desc_t::last_child},
};
dht::key_desc_t find_node_desc[] = { dht::key_desc_t find_node_desc[] = {
{"y", lazy_entry::string_t, 1, 0}, {"y", lazy_entry::string_t, 1, 0},
{"t", lazy_entry::string_t, 2, 0}, {"t", lazy_entry::string_t, 2, 0},