added friendly_name and description to ip_interface (#2799)
This commit is contained in:
parent
6e5177beaf
commit
421709f67f
|
@ -59,6 +59,8 @@ namespace libtorrent {
|
||||||
address interface_address;
|
address interface_address;
|
||||||
address netmask;
|
address netmask;
|
||||||
char name[64];
|
char name[64];
|
||||||
|
char friendly_name[128];
|
||||||
|
char description[128];
|
||||||
// an interface is preferred if its address is
|
// an interface is preferred if its address is
|
||||||
// not tentative/duplicate/deprecated
|
// not tentative/duplicate/deprecated
|
||||||
bool preferred = true;
|
bool preferred = true;
|
||||||
|
|
|
@ -438,6 +438,8 @@ int _System __libsocket_sysctl(int* mib, u_int namelen, void *oldp, size_t *oldl
|
||||||
|
|
||||||
std::strncpy(rv.name, ifa->ifa_name, sizeof(rv.name));
|
std::strncpy(rv.name, ifa->ifa_name, sizeof(rv.name));
|
||||||
rv.name[sizeof(rv.name) - 1] = 0;
|
rv.name[sizeof(rv.name) - 1] = 0;
|
||||||
|
rv.friendly_name[0] = 0;
|
||||||
|
rv.description[0] = 0;
|
||||||
|
|
||||||
// determine address
|
// determine address
|
||||||
rv.interface_address = sockaddr_to_address(ifa->ifa_addr);
|
rv.interface_address = sockaddr_to_address(ifa->ifa_addr);
|
||||||
|
@ -555,6 +557,8 @@ int _System __libsocket_sysctl(int* mib, u_int namelen, void *oldp, size_t *oldl
|
||||||
wan.interface_address = ip;
|
wan.interface_address = ip;
|
||||||
wan.netmask = address_v4::from_string("255.255.255.255");
|
wan.netmask = address_v4::from_string("255.255.255.255");
|
||||||
std::strcpy(wan.name, "eth0");
|
std::strcpy(wan.name, "eth0");
|
||||||
|
std::strcpy(wan.friendly_name, "Ethernet");
|
||||||
|
std::strcpy(wan.description, "Simulator Ethernet Adapter");
|
||||||
ret.push_back(wan);
|
ret.push_back(wan);
|
||||||
}
|
}
|
||||||
#elif TORRENT_USE_NETLINK
|
#elif TORRENT_USE_NETLINK
|
||||||
|
@ -662,7 +666,10 @@ int _System __libsocket_sysctl(int* mib, u_int namelen, void *oldp, size_t *oldl
|
||||||
{
|
{
|
||||||
ip_interface iface;
|
ip_interface iface;
|
||||||
iface.interface_address = sockaddr_to_address(&item.ifr_addr);
|
iface.interface_address = sockaddr_to_address(&item.ifr_addr);
|
||||||
std::strcpy(iface.name, item.ifr_name);
|
std::strncpy(iface.name, item.ifr_name, sizeof(iface.name));
|
||||||
|
iface.name[sizeof(iface.name) - 1] = 0;
|
||||||
|
iface.friendly_name[0] = 0;
|
||||||
|
iface.description[0] = 0;
|
||||||
|
|
||||||
ifreq req = {};
|
ifreq req = {};
|
||||||
std::strncpy(req.ifr_name, item.ifr_name, IF_NAMESIZE - 1);
|
std::strncpy(req.ifr_name, item.ifr_name, IF_NAMESIZE - 1);
|
||||||
|
@ -729,7 +736,11 @@ int _System __libsocket_sysctl(int* mib, u_int namelen, void *oldp, size_t *oldl
|
||||||
{
|
{
|
||||||
ip_interface r;
|
ip_interface r;
|
||||||
std::strncpy(r.name, adapter->AdapterName, sizeof(r.name));
|
std::strncpy(r.name, adapter->AdapterName, sizeof(r.name));
|
||||||
r.name[sizeof(r.name)-1] = 0;
|
r.name[sizeof(r.name) - 1] = 0;
|
||||||
|
wcstombs(r.friendly_name, adapter->FriendlyName, sizeof(r.friendly_name));
|
||||||
|
r.friendly_name[sizeof(r.friendly_name) - 1] = 0;
|
||||||
|
wcstombs(r.description, adapter->Description, sizeof(r.description));
|
||||||
|
r.description[sizeof(r.description) - 1] = 0;
|
||||||
for (IP_ADAPTER_UNICAST_ADDRESS* unicast = adapter->FirstUnicastAddress;
|
for (IP_ADAPTER_UNICAST_ADDRESS* unicast = adapter->FirstUnicastAddress;
|
||||||
unicast; unicast = unicast->Next)
|
unicast; unicast = unicast->Next)
|
||||||
{
|
{
|
||||||
|
@ -774,6 +785,8 @@ int _System __libsocket_sysctl(int* mib, u_int namelen, void *oldp, size_t *oldl
|
||||||
iface.netmask = sockaddr_to_address(&buffer[i].iiNetmask.Address
|
iface.netmask = sockaddr_to_address(&buffer[i].iiNetmask.Address
|
||||||
, iface.interface_address.is_v4() ? AF_INET : AF_INET6);
|
, iface.interface_address.is_v4() ? AF_INET : AF_INET6);
|
||||||
iface.name[0] = 0;
|
iface.name[0] = 0;
|
||||||
|
iface.friendly_name[0] = 0;
|
||||||
|
iface.description[0] = 0;
|
||||||
ret.push_back(iface);
|
ret.push_back(iface);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -793,7 +806,9 @@ int _System __libsocket_sysctl(int* mib, u_int namelen, void *oldp, size_t *oldl
|
||||||
for (;i != udp::resolver::iterator(); ++i)
|
for (;i != udp::resolver::iterator(); ++i)
|
||||||
{
|
{
|
||||||
iface.interface_address = i->endpoint().address();
|
iface.interface_address = i->endpoint().address();
|
||||||
iface.name[0] = '\0';
|
iface.name[0] = 0;
|
||||||
|
iface.friendly_name[0] = 0;
|
||||||
|
iface.description[0] = 0;
|
||||||
if (iface.interface_address.is_v4())
|
if (iface.interface_address.is_v4())
|
||||||
iface.netmask = address_v4::netmask(iface.interface_address.to_v4());
|
iface.netmask = address_v4::netmask(iface.interface_address.to_v4());
|
||||||
ret.push_back(iface);
|
ret.push_back(iface);
|
||||||
|
@ -1094,6 +1109,7 @@ int _System __libsocket_sysctl(int* mib, u_int namelen, void *oldp, size_t *oldl
|
||||||
if (GetIfEntry(&ifentry) == NO_ERROR)
|
if (GetIfEntry(&ifentry) == NO_ERROR)
|
||||||
{
|
{
|
||||||
wcstombs(r.name, ifentry.wszName, sizeof(r.name));
|
wcstombs(r.name, ifentry.wszName, sizeof(r.name));
|
||||||
|
r.name[sizeof(r.name) - 1] = 0;
|
||||||
r.mtu = ifentry.dwMtu;
|
r.mtu = ifentry.dwMtu;
|
||||||
ret.push_back(r);
|
ret.push_back(r);
|
||||||
}
|
}
|
||||||
|
@ -1142,7 +1158,7 @@ int _System __libsocket_sysctl(int* mib, u_int namelen, void *oldp, size_t *oldl
|
||||||
if (GetIfEntry(&ifentry) == NO_ERROR)
|
if (GetIfEntry(&ifentry) == NO_ERROR)
|
||||||
{
|
{
|
||||||
wcstombs(r.name, ifentry.wszName, sizeof(r.name));
|
wcstombs(r.name, ifentry.wszName, sizeof(r.name));
|
||||||
r.name[sizeof(r.name)-1] = 0;
|
r.name[sizeof(r.name) - 1] = 0;
|
||||||
r.mtu = ifentry.dwMtu;
|
r.mtu = ifentry.dwMtu;
|
||||||
ret.push_back(r);
|
ret.push_back(r);
|
||||||
}
|
}
|
||||||
|
|
|
@ -52,7 +52,7 @@ int main()
|
||||||
std::printf("Default gateway: %s\n", def_gw.to_string(ec).c_str());
|
std::printf("Default gateway: %s\n", def_gw.to_string(ec).c_str());
|
||||||
|
|
||||||
std::printf("=========== Routes ===========\n");
|
std::printf("=========== Routes ===========\n");
|
||||||
std::vector<ip_route> routes = enum_routes(ios, ec);
|
auto const routes = enum_routes(ios, ec);
|
||||||
if (ec)
|
if (ec)
|
||||||
{
|
{
|
||||||
std::printf("%s\n", ec.message().c_str());
|
std::printf("%s\n", ec.message().c_str());
|
||||||
|
@ -61,37 +61,36 @@ int main()
|
||||||
|
|
||||||
std::printf("%-18s%-18s%-35s%-7sinterface\n", "destination", "network", "gateway", "mtu");
|
std::printf("%-18s%-18s%-35s%-7sinterface\n", "destination", "network", "gateway", "mtu");
|
||||||
|
|
||||||
for (std::vector<ip_route>::const_iterator i = routes.begin()
|
for (auto const& r : routes)
|
||||||
, end(routes.end()); i != end; ++i)
|
|
||||||
{
|
{
|
||||||
std::printf("%-18s%-18s%-35s%-7d%s\n"
|
std::printf("%-18s%-18s%-35s%-7d%s\n"
|
||||||
, i->destination.to_string(ec).c_str()
|
, r.destination.to_string(ec).c_str()
|
||||||
, i->netmask.to_string(ec).c_str()
|
, r.netmask.to_string(ec).c_str()
|
||||||
, i->gateway.to_string(ec).c_str()
|
, r.gateway.to_string(ec).c_str()
|
||||||
, i->mtu
|
, r.mtu
|
||||||
, i->name);
|
, r.name);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::printf("========= Interfaces =========\n");
|
std::printf("========= Interfaces =========\n");
|
||||||
|
|
||||||
std::vector<ip_interface> const& net = enum_net_interfaces(ios, ec);
|
auto const net = enum_net_interfaces(ios, ec);
|
||||||
if (ec)
|
if (ec)
|
||||||
{
|
{
|
||||||
std::printf("%s\n", ec.message().c_str());
|
std::printf("%s\n", ec.message().c_str());
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::printf("%-34s%-45s%-20sflags\n", "address", "netmask", "name");
|
std::printf("%-34s%-45s%-20s%-20sdescription\n", "address", "netmask", "name", "flags");
|
||||||
|
|
||||||
for (std::vector<ip_interface>::const_iterator i = net.begin()
|
for (auto const& i : net)
|
||||||
, end(net.end()); i != end; ++i)
|
|
||||||
{
|
{
|
||||||
std::printf("%-34s%-45s%-20s%s%s%s\n"
|
std::printf("%-34s%-45s%-20s%s%s%-20s%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
|
||||||
, (i->interface_address.is_multicast()?"multicast ":"")
|
, (i.interface_address.is_multicast()?"multicast ":"")
|
||||||
, (is_local(i->interface_address)?"local ":"")
|
, (is_local(i.interface_address)?"local ":"")
|
||||||
, (is_loopback(i->interface_address)?"loopback ":""));
|
, (is_loopback(i.interface_address)?"loopback ":"")
|
||||||
|
, i.friendly_name, i.description);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue