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

Merge branch 'RC_1_1'

This commit is contained in:
arvidn 2016-06-22 00:41:02 -04:00
parent b4b6da79fc 916f8043c1
commit 3b2a527ffb
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -24,6 +24,7 @@
1.1.1 release 1.1.1 release
* fix bug in enum_net() for BSD and Mac
* fix bug in python binding of announce_entry * fix bug in python binding of announce_entry
* fixed bug related to flag_merge_resume_http_seeds flag in add_torrent_params * fixed bug related to flag_merge_resume_http_seeds flag in add_torrent_params
* fixed inverted priority of incoming piece suggestions * fixed inverted priority of incoming piece suggestions

6
src/enum_net.cpp
View File

@ -278,6 +278,7 @@ int _System __libsocket_sysctl(int* mib, u_int namelen, void *oldp, size_t *oldl
, rt_info->destination.is_v4() ? AF_INET : AF_INET6); , rt_info->destination.is_v4() ? AF_INET : AF_INET6);
if_indextoname(rtm->rtm_index, rt_info->name); if_indextoname(rtm->rtm_index, rt_info->name);
// TODO: get the MTU (and other interesting metrics) from the rt_msghdr instead
ifreq req; ifreq req;
memset(&req, 0, sizeof(req)); memset(&req, 0, sizeof(req));
if_indextoname(rtm->rtm_index, req.ifr_name); if_indextoname(rtm->rtm_index, req.ifr_name);
@ -887,8 +888,11 @@ namespace libtorrent
for (char* next = buf.get(); next < end; next += rtm->rtm_msglen) for (char* next = buf.get(); next < end; next += rtm->rtm_msglen)
{ {
rtm = reinterpret_cast<rt_msghdr*>(next); rtm = reinterpret_cast<rt_msghdr*>(next);
if (rtm->rtm_version != RTM_VERSION) if (rtm->rtm_version != RTM_VERSION
|| rtm->rtm_type != RTM_ADD)
{
continue; continue;
}
ip_route r; ip_route r;
if (parse_route(s, rtm, &r)) ret.push_back(r); if (parse_route(s, rtm, &r)) ret.push_back(r);