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

[Android] Fix NetworkInterface.GetAllNetworkInterfaces #76370

Merged
merged 12 commits into from
Oct 3, 2022
Merged

[Android] Fix NetworkInterface.GetAllNetworkInterfaces #76370

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
558509e
Revert "[Android] Port getifaddrs implementation from Xamarin.Android…
simonrozsival Sep 27, 2022
e6c7971
Fix allocating memory block for interfaces and addresses on recent An…
simonrozsival Sep 27, 2022
f7c87fc
Detect loopback interface on Android
simonrozsival Sep 29, 2022
5d63e03
Add comment with explanation
simonrozsival Sep 29, 2022
b89a615
Simplify the changes to be closer to the original code
simonrozsival Sep 29, 2022
cf263ae
Fix build
simonrozsival Sep 29, 2022
7e192d4
Fix typos
simonrozsival Sep 29, 2022
4751ee0
Improve comment
simonrozsival Sep 29, 2022
9224b93
Indent using spaces instead of tabs
simonrozsival Sep 29, 2022
510dd98
Remove check for ifaddrs.h
simonrozsival Sep 30, 2022
580b2e8
Add ANDROID_GETIFADDRS_WORKAROUND
simonrozsival Sep 30, 2022
b49f6f5
Update comment
simonrozsival Sep 30, 2022
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
3 changes: 3 additions & 0 deletions src/mono/cmake/config.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,9 @@
/* Have getifaddrs */
#cmakedefine HAVE_GETIFADDRS 1

/* Have struct ifaddrs */
#cmakedefine HAVE_IFADDRS 1

/* Have access */
#cmakedefine HAVE_ACCESS 1

Expand Down
1 change: 1 addition & 0 deletions src/native/libs/Common/pal_config.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#cmakedefine01 HAVE_F_FULLFSYNC
#cmakedefine01 HAVE_O_CLOEXEC
#cmakedefine01 HAVE_GETIFADDRS
#cmakedefine01 HAVE_IFADDRS
#cmakedefine01 HAVE_UTSNAME_DOMAINNAME
#cmakedefine01 HAVE_STAT64
#cmakedefine01 HAVE_FORK
Expand Down
7 changes: 0 additions & 7 deletions src/native/libs/System.Native/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/extra_libs.cmake)
set(NATIVE_LIBS_EXTRA)
append_extra_system_libs(NATIVE_LIBS_EXTRA)

if (CLR_CMAKE_TARGET_ANDROID)
add_compile_options(-Wno-gnu-zero-variadic-macro-arguments)

list (APPEND NATIVE_LIBS_EXTRA -llog)
list (APPEND NATIVE_SOURCES pal_ifaddrs.c)
endif ()

if (GEN_SHARED_LIB)
add_library(System.Native
SHARED
Expand Down
Loading