go
/
gvisor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Take addresses as const 

PiperOrigin-RevId: 288767927
This commit is contained in:
Tamir Duberstein 2020-01-08 13:52:56 -08:00 committed by gVisor bot
parent bb96f52576
commit d01240d871
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/syscalls/linux/ip_socket_test_util.cc
View File

@ -187,24 +187,24 @@ PosixErrorOr<int> IfAddrHelper::GetIndex(std::string name) {
return InterfaceIndex(name);
}
std::string GetAddr4Str(in_addr* a) {
std::string GetAddr4Str(const in_addr* a) {
char str[INET_ADDRSTRLEN];
inet_ntop(AF_INET, a, str, sizeof(str));
return std::string(str);
}
std::string GetAddr6Str(in6_addr* a) {
std::string GetAddr6Str(const in6_addr* a) {
char str[INET6_ADDRSTRLEN];
inet_ntop(AF_INET6, a, str, sizeof(str));
return std::string(str);
}
std::string GetAddrStr(sockaddr* a) {
std::string GetAddrStr(const sockaddr* a) {
if (a->sa_family == AF_INET) {
auto src = &(reinterpret_cast<sockaddr_in*>(a)->sin_addr);
auto src = &(reinterpret_cast<const sockaddr_in*>(a)->sin_addr);
return GetAddr4Str(src);
} else if (a->sa_family == AF_INET6) {
auto src = &(reinterpret_cast<sockaddr_in6*>(a)->sin6_addr);
auto src = &(reinterpret_cast<const sockaddr_in6*>(a)->sin6_addr);
return GetAddr6Str(src);
}
return std::string("<invalid>");

6
test/syscalls/linux/ip_socket_test_util.h
View File

@ -105,14 +105,14 @@ class IfAddrHelper {
};
// GetAddr4Str returns the given IPv4 network address structure as a string.
std::string GetAddr4Str(in_addr* a);
std::string GetAddr4Str(const in_addr* a);
// GetAddr6Str returns the given IPv6 network address structure as a string.
std::string GetAddr6Str(in6_addr* a);
std::string GetAddr6Str(const in6_addr* a);
// GetAddrStr returns the given IPv4 or IPv6 network address structure as a
// string.
std::string GetAddrStr(sockaddr* a);
std::string GetAddrStr(const sockaddr* a);
} // namespace testing
} // namespace gvisor