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

fix netmask of routes on Windows 

The build_netmask function was incorrectly dividing the size of the bytes_type
by 8. Also use b.size() instead of sizeof for consistency.

I'm not 100% certain what the difference between DestinationPrefix.PrefixLength
and SitePrefixLength is. It looks like SitePrefixLength is something specific to
site-local addresses. Emperically I found DestinationPrefix.PrefixLength
contains reasonable values while SitePrefixLength is always zero.
This commit is contained in:
Steven Siloti 2018-05-19 21:29:07 -07:00
parent e88339378c
commit 603e206f36
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/enum_net.cpp
View File

@ -517,7 +517,7 @@ int _System __libsocket_sysctl(int* mib, u_int namelen, void *oldp, size_t *oldl
using bytes_t = boost::asio::ip::address_v4::bytes_type; using bytes_t = boost::asio::ip::address_v4::bytes_type;
bytes_t b; bytes_t b;
std::memset(&b[0], 0xff, b.size()); std::memset(&b[0], 0xff, b.size());
for (int i = int(sizeof(bytes_t)) / 8 - 1; i > 0; --i) for (int i = int(b.size()) - 1; i > 0; --i)
{ {
if (bits < 8) if (bits < 8)
{ {
@ -535,7 +535,7 @@ int _System __libsocket_sysctl(int* mib, u_int namelen, void *oldp, size_t *oldl
using bytes_t = boost::asio::ip::address_v6::bytes_type; using bytes_t = boost::asio::ip::address_v6::bytes_type;
bytes_t b; bytes_t b;
std::memset(&b[0], 0xff, b.size()); std::memset(&b[0], 0xff, b.size());
for (int i = int(sizeof(bytes_t)) / 8 - 1; i > 0; --i) for (int i = int(b.size()) - 1; i > 0; --i)
{ {
if (bits < 8) if (bits < 8)
{ {
@ -1116,7 +1116,7 @@ int _System __libsocket_sysctl(int* mib, u_int namelen, void *oldp, size_t *oldl
r.gateway = sockaddr_to_address((const sockaddr*)&routes->Table[i].NextHop); r.gateway = sockaddr_to_address((const sockaddr*)&routes->Table[i].NextHop);
r.destination = sockaddr_to_address( r.destination = sockaddr_to_address(
(const sockaddr*)&routes->Table[i].DestinationPrefix.Prefix); (const sockaddr*)&routes->Table[i].DestinationPrefix.Prefix);
r.netmask = build_netmask(routes->Table[i].SitePrefixLength r.netmask = build_netmask(routes->Table[i].DestinationPrefix.PrefixLength
, routes->Table[i].DestinationPrefix.Prefix.si_family); , routes->Table[i].DestinationPrefix.Prefix.si_family);
MIB_IFROW ifentry; MIB_IFROW ifentry;
ifentry.dwIndex = routes->Table[i].InterfaceIndex; ifentry.dwIndex = routes->Table[i].InterfaceIndex;