Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "syscall: add getifaddrs to os syscalls (#18513)" #18566

Merged
merged 1 commit into from
Oct 11, 2021
Merged

Revert "syscall: add getifaddrs to os syscalls (#18513)" #18566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions envoy/api/os_sys_calls.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,21 +190,6 @@ class OsSysCalls {
* @see man TCP_INFO. Get the tcp info for the socket.
*/
virtual SysCallBoolResult socketTcpInfo(os_fd_t sockfd, EnvoyTcpInfo* tcp_info) PURE;

/**
* return true if the OS supports getifaddrs.
*/
virtual bool supportsGetifaddrs() const PURE;

/**
* @see man getifaddrs
*/
virtual SysCallIntResult getifaddrs(ifaddrs** ifap) PURE;

/**
* @see man getifaddrs
*/
virtual void freeifaddrs(ifaddrs* ifp) PURE;
};

using OsSysCallsPtr = std::unique_ptr<OsSysCalls>;
Expand Down
22 changes: 10 additions & 12 deletions envoy/common/platform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,20 +293,18 @@ struct mmsghdr {
};
#endif

// https://android.googlesource.com/platform/prebuilts/ndk/+/dev/platform/sysroot/usr/include/ifaddrs.h
#if defined(WIN32) || (defined(__ANDROID_API__) && __ANDROID_API__ < 24)
// Posix structure necessary for getifaddrs definition.
struct ifaddrs {
struct ifaddrs* ifa_next;
char* ifa_name;
unsigned int ifa_flags;
struct sockaddr* ifa_addr;
struct sockaddr* ifa_netmask;
struct sockaddr* ifa_dstaddr;
void* ifa_data;
};
#define SUPPORTS_GETIFADDRS
#ifdef WIN32
#undef SUPPORTS_GETIFADDRS
#endif

// https://android.googlesource.com/platform/prebuilts/ndk/+/dev/platform/sysroot/usr/include/ifaddrs.h
#ifdef __ANDROID_API__
#if __ANDROID_API__ < 24
#undef SUPPORTS_GETIFADDRS
#endif // __ANDROID_API__ < 24
#endif // ifdef __ANDROID_API__

// TODO: Remove once bazel supports NDKs > 21
#define SUPPORTS_CPP_17_CONTIGUOUS_ITERATOR
#ifdef __ANDROID_API__
Expand Down
15 changes: 0 additions & 15 deletions source/common/api/posix/os_sys_calls_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,20 +282,5 @@ SysCallBoolResult OsSysCallsImpl::socketTcpInfo([[maybe_unused]] os_fd_t sockfd,
return {false, EOPNOTSUPP};
}

bool OsSysCallsImpl::supportsGetifaddrs() const {
// https://android.googlesource.com/platform/prebuilts/ndk/+/dev/platform/sysroot/usr/include/ifaddrs.h
#if defined(__ANDROID_API__) && __ANDROID_API__ < 24
return false;
#endif
return true;
}

SysCallIntResult OsSysCallsImpl::getifaddrs(struct ifaddrs** ifap) {
const int rc = ::getifaddrs(ifap);
return {rc, rc != -1 ? 0 : errno};
}

void OsSysCallsImpl::freeifaddrs(struct ifaddrs* ifp) { ::freeifaddrs(ifp); }

} // namespace Api
} // namespace Envoy
3 changes: 0 additions & 3 deletions source/common/api/posix/os_sys_calls_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,6 @@ class OsSysCallsImpl : public OsSysCalls {
SysCallSocketResult duplicate(os_fd_t oldfd) override;
SysCallSocketResult accept(os_fd_t socket, sockaddr* addr, socklen_t* addrlen) override;
SysCallBoolResult socketTcpInfo(os_fd_t sockfd, EnvoyTcpInfo* tcp_info) override;
bool supportsGetifaddrs() const override;
SysCallIntResult getifaddrs(struct ifaddrs** ifap) override;
void freeifaddrs(struct ifaddrs* ifp) override;
};

using OsSysCallsSingleton = ThreadSafeSingleton<OsSysCallsImpl>;
Expand Down
4 changes: 0 additions & 4 deletions source/common/api/win32/os_sys_calls_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,9 +404,5 @@ SysCallBoolResult OsSysCallsImpl::socketTcpInfo([[maybe_unused]] os_fd_t sockfd,
return {false, WSAEOPNOTSUPP};
}

SysCallIntResult OsSysCallsImpl::getifaddrs(struct ifaddrs**) { NOT_IMPLEMENTED_GCOVR_EXCL_LINE; }

void OsSysCallsImpl::freeifaddrs(struct ifaddrs*) { NOT_IMPLEMENTED_GCOVR_EXCL_LINE; }

} // namespace Api
} // namespace Envoy
3 changes: 0 additions & 3 deletions source/common/api/win32/os_sys_calls_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@ class OsSysCallsImpl : public OsSysCalls {
SysCallSocketResult duplicate(os_fd_t oldfd) override;
SysCallSocketResult accept(os_fd_t socket, sockaddr* addr, socklen_t* addrlen) override;
SysCallBoolResult socketTcpInfo(os_fd_t sockfd, EnvoyTcpInfo* tcp_info) override;
bool supportsGetifaddrs() const override { return false; }
SysCallIntResult getifaddrs(struct ifaddrs** ifap) override;
void freeifaddrs(struct ifaddrs* ifp) override;
};

using OsSysCallsSingleton = ThreadSafeSingleton<OsSysCallsImpl>;
Expand Down
45 changes: 22 additions & 23 deletions source/common/network/utility.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,36 +239,35 @@ void Utility::throwWithMalformedIp(absl::string_view ip_address) {
// need to be updated in the future. Discussion can be found at Github issue #939.
Address::InstanceConstSharedPtr Utility::getLocalAddress(const Address::IpVersion version) {
Address::InstanceConstSharedPtr ret;
if (Api::OsSysCallsSingleton::get().supportsGetifaddrs()) {
struct ifaddrs* ifaddr;
struct ifaddrs* ifa;
#ifdef SUPPORTS_GETIFADDRS
struct ifaddrs* ifaddr;
struct ifaddrs* ifa;

const Api::SysCallIntResult rc = Api::OsSysCallsSingleton::get().getifaddrs(&ifaddr);
RELEASE_ASSERT(!rc.return_value_, fmt::format("getiffaddrs error: {}", rc.errno_));
const int rc = getifaddrs(&ifaddr);
RELEASE_ASSERT(!rc, "");

// man getifaddrs(3)
for (ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next) {
if (ifa->ifa_addr == nullptr) {
continue;
}
// man getifaddrs(3)
for (ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next) {
if (ifa->ifa_addr == nullptr) {
continue;
}

if ((ifa->ifa_addr->sa_family == AF_INET && version == Address::IpVersion::v4) ||
(ifa->ifa_addr->sa_family == AF_INET6 && version == Address::IpVersion::v6)) {
const struct sockaddr_storage* addr =
reinterpret_cast<const struct sockaddr_storage*>(ifa->ifa_addr);
ret = Address::addressFromSockAddrOrThrow(*addr, (version == Address::IpVersion::v4)
? sizeof(sockaddr_in)
: sizeof(sockaddr_in6));
if (!isLoopbackAddress(*ret)) {
break;
}
if ((ifa->ifa_addr->sa_family == AF_INET && version == Address::IpVersion::v4) ||
(ifa->ifa_addr->sa_family == AF_INET6 && version == Address::IpVersion::v6)) {
const struct sockaddr_storage* addr =
reinterpret_cast<const struct sockaddr_storage*>(ifa->ifa_addr);
ret = Address::addressFromSockAddrOrThrow(
*addr, (version == Address::IpVersion::v4) ? sizeof(sockaddr_in) : sizeof(sockaddr_in6));
if (!isLoopbackAddress(*ret)) {
break;
}
}
}

if (ifaddr) {
Api::OsSysCallsSingleton::get().freeifaddrs(ifaddr);
}
if (ifaddr) {
freeifaddrs(ifaddr);
}
#endif

// If the local address is not found above, then return the loopback address by default.
if (ret == nullptr) {
Expand Down
2 changes: 0 additions & 2 deletions tools/spelling/spelling_dictionary.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ ALS
AMZ
APC
API
ARRAYSIZE
ARN
ASAN
ASCII
Expand Down Expand Up @@ -815,7 +814,6 @@ megamiss
mem
memcmp
memcpy
memset
memoize
mergeable
messagename
Expand Down