From 3a99213c0b465ceca17f3cf6c5c0c71129b9e142 Mon Sep 17 00:00:00 2001 From: Matias Fontanini Date: Wed, 2 Mar 2016 21:34:21 -0800 Subject: [PATCH] Rename IPv6AddressPrefix to IPv6Prefix --- examples/interfaces_info.cpp | 2 +- include/tins/network_interface.h | 4 ++-- src/network_interface.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/interfaces_info.cpp b/examples/interfaces_info.cpp index 3bcc326..9c6746d 100644 --- a/examples/interfaces_info.cpp +++ b/examples/interfaces_info.cpp @@ -68,7 +68,7 @@ int main() { else { ostringstream oss; for (size_t i = 0; i < info.ipv6_addrs.size(); ++i) { - const NetworkInterface::IPv6AddressPrefix& prefix = info.ipv6_addrs[i]; + const NetworkInterface::IPv6Prefix& prefix = info.ipv6_addrs[i]; if (i > 0) { oss << ", "; } diff --git a/include/tins/network_interface.h b/include/tins/network_interface.h index 606760f..3705703 100644 --- a/include/tins/network_interface.h +++ b/include/tins/network_interface.h @@ -59,7 +59,7 @@ public: /** * */ - struct IPv6AddressPrefix { + struct IPv6Prefix { IPv6Address address; uint32_t prefix_length; }; @@ -69,7 +69,7 @@ public: */ struct Info { IPv4Address ip_addr, netmask, bcast_addr; - std::vector ipv6_addrs; + std::vector ipv6_addrs; address_type hw_addr; bool is_up; }; diff --git a/src/network_interface.cpp b/src/network_interface.cpp index 3ec8904..3fb5449 100644 --- a/src/network_interface.cpp +++ b/src/network_interface.cpp @@ -110,7 +110,7 @@ struct InterfaceInfoCollector { found_ip = true; } else if (addr->ifa_addr->sa_family == AF_INET6) { - Tins::NetworkInterface::IPv6AddressPrefix prefix; + Tins::NetworkInterface::IPv6Prefix prefix; prefix.address = ((struct sockaddr_in6 *)addr->ifa_addr)->sin6_addr.s6_addr; Tins::IPv6Address mask = ((struct sockaddr_in6 *)addr->ifa_netmask)->sin6_addr.s6_addr; prefix.prefix_length = 0; @@ -152,7 +152,7 @@ struct InterfaceInfoCollector { found_ip = true; } else if (family == AF_INET6) { - Tins::NetworkInterface::IPv6AddressPrefix prefix; + Tins::NetworkInterface::IPv6Prefix prefix; prefix.address = ((const struct sockaddr_in6 *)unicast->Address.lpSockaddr)->sin6_addr.s6_addr; prefix.prefix_length = unicast->OnLinkPrefixLength; info->ipv6_addrs.push_back(prefix);