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

set scope id when enumerating IPv6 addresses 

This is necessary to be able to correctly match enumerated addresses
with those stored in listen_socket_t::local_endpoint when there is a
non-default zone id.
This commit is contained in:
Steven Siloti 2016-11-11 20:16:58 -08:00 committed by Arvid Norberg
parent 86251adb1b
commit 07650c8558
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/enum_net.cpp
View File

@ -103,7 +103,7 @@ namespace libtorrent { namespace
{
#if !defined TORRENT_BUILD_SIMULATOR
address inaddr_to_address(in_addr const* ina, int len = 4)
address_v4 inaddr_to_address(in_addr const* ina, int len = 4)
{
typedef boost::asio::ip::address_v4::bytes_type bytes_t;
bytes_t b;
@ -113,7 +113,7 @@ namespace libtorrent { namespace
}
#if TORRENT_USE_IPV6
address inaddr6_to_address(in6_addr const* ina6, int len = 16)
address_v6 inaddr6_to_address(in6_addr const* ina6, int len = 16)
{
typedef boost::asio::ip::address_v6::bytes_type bytes_t;
bytes_t b;
@ -139,8 +139,13 @@ namespace libtorrent { namespace
, sockaddr_len(sin) - offsetof(sockaddr, sa_data));
#if TORRENT_USE_IPV6
else if (sin->sa_family == AF_INET6 || assume_family == AF_INET6)
return inaddr6_to_address(&reinterpret_cast<sockaddr_in6 const*>(sin)->sin6_addr
{
auto saddr = reinterpret_cast<sockaddr_in6 const*>(sin);
auto ret = inaddr6_to_address(&saddr->sin6_addr
, sockaddr_len(sin) - offsetof(sockaddr, sa_data));
ret.scope_id(saddr->sin6_scope_id);
return ret;
}
#endif
return address();
}