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

remove residual mentions of mtu for interfaces

This commit is contained in:
arvidn 2017-08-20 11:11:55 +02:00 committed by Arvid Norberg
parent 66734e2e5b
commit d59d394d5b
2 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/enum_net.cpp
View File

@ -284,9 +284,10 @@ namespace {
#pragma clang diagnostic pop #pragma clang diagnostic pop
#endif #endif
if_indextoname(std::uint32_t(if_index), rt_info->name);
ifreq req = {}; ifreq req = {};
if_indextoname(std::uint32_t(if_index), req.ifr_name); if_indextoname(std::uint32_t(if_index), req.ifr_name);
static_assert(sizeof(rt_info->name) >= sizeof(req.ifr_name), "ip_route::name is too small");
std::memcpy(rt_info->name, req.ifr_name, sizeof(req.ifr_name));
ioctl(s, siocgifmtu, &req); ioctl(s, siocgifmtu, &req);
rt_info->mtu = req.ifr_mtu; rt_info->mtu = req.ifr_mtu;
// obviously this doesn't work correctly. How do you get the netmask for a route? // obviously this doesn't work correctly. How do you get the netmask for a route?
@ -381,7 +382,7 @@ namespace {
int _System __libsocket_sysctl(int* mib, u_int namelen, void *oldp, size_t *oldlenp, void *newp, size_t newlen); int _System __libsocket_sysctl(int* mib, u_int namelen, void *oldp, size_t *oldlenp, void *newp, size_t newlen);
#endif #endif
bool parse_route(int s, rt_msghdr* rtm, ip_route* rt_info) bool parse_route(int, rt_msghdr* rtm, ip_route* rt_info)
{ {
sockaddr* rti_info[RTAX_MAX]; sockaddr* rti_info[RTAX_MAX];
sockaddr* sa = reinterpret_cast<sockaddr*>(rtm + 1); sockaddr* sa = reinterpret_cast<sockaddr*>(rtm + 1);
@ -414,15 +415,6 @@ int _System __libsocket_sysctl(int* mib, u_int namelen, void *oldp, size_t *oldl
rt_info->netmask = sockaddr_to_address(rti_info[RTAX_NETMASK] rt_info->netmask = sockaddr_to_address(rti_info[RTAX_NETMASK]
, 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 = {};
if_indextoname(rtm->rtm_index, req.ifr_name);
// ignore errors here. This is best-effort
ioctl(s, siocgifmtu, &req);
rt_info->mtu = req.ifr_mtu;
return true; return true;
} }
#endif #endif
@ -615,15 +607,7 @@ int _System __libsocket_sysctl(int* mib, u_int namelen, void *oldp, size_t *oldl
{ {
ip_interface iface; ip_interface iface;
if (iface_from_ifaddrs(ifa, iface)) if (iface_from_ifaddrs(ifa, iface))
{
ifreq req = {};
// -1 to leave a 0-terminator
std::strncpy(req.ifr_name, iface.name, IF_NAMESIZE - 1);
// ignore errors here. This is best-effort
ioctl(s, siocgifmtu, &req);
ret.push_back(iface); ret.push_back(iface);
}
} }
} }
close(s); close(s);
@ -672,16 +656,6 @@ int _System __libsocket_sysctl(int* mib, u_int namelen, void *oldp, size_t *oldl
std::strcpy(iface.name, item.ifr_name); std::strcpy(iface.name, item.ifr_name);
ifreq req = {}; ifreq req = {};
// -1 to leave a 0-terminator
strncpy(req.ifr_name, item.ifr_name, IF_NAMESIZE - 1);
if (ioctl(s, siocgifmtu, &req) < 0)
{
ec = error_code(errno, system_category());
close(s);
return ret;
}
std::memset(&req, 0, sizeof(req));
std::strncpy(req.ifr_name, item.ifr_name, IF_NAMESIZE - 1); std::strncpy(req.ifr_name, item.ifr_name, IF_NAMESIZE - 1);
if (ioctl(s, SIOCGIFNETMASK, &req) < 0) if (ioctl(s, SIOCGIFNETMASK, &req) < 0)
{ {

4
test/enum_if.cpp
View File

@ -81,12 +81,12 @@ int main()
return 1; return 1;
} }
std::printf("%-30s%-45s%-20s%-8sflags\n", "address", "netmask", "name", "mtu"); std::printf("%-34s%-45s%-20sflags\n", "address", "netmask", "name");
for (std::vector<ip_interface>::const_iterator i = net.begin() for (std::vector<ip_interface>::const_iterator i = net.begin()
, end(net.end()); i != end; ++i) , end(net.end()); i != end; ++i)
{ {
std::printf("%-30s%-45s%-20s%s%s%s\n" std::printf("%-34s%-45s%-20s%s%s%s\n"
, i->interface_address.to_string(ec).c_str() , i->interface_address.to_string(ec).c_str()
, i->netmask.to_string(ec).c_str() , i->netmask.to_string(ec).c_str()
, i->name , i->name