Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[Android] Fix NetworkInterface.GetAllNetworkInterfaces #76370

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

Merged
merged 12 commits into from
Oct 3, 2022
Merged

[Android] Fix NetworkInterface.GetAllNetworkInterfaces #76370

Changes from 1 commit
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
Prev Previous commit
Next Next commit
Simplify the changes to be closer to the original code
  • Loading branch information
@simonrozsival
simonrozsival committed Sep 29, 2022
commit b89a6158741f8218e01d32470b1610a834e08638
9 changes: 4 additions & 5 deletions src/native/libs/System.Native/pal_interfaceaddresses.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,12 +358,11 @@ int32_t SystemNative_GetNetworkInterfaces(int32_t * interfaceCount, NetworkInter
// we do not get any AP_PACKET addresses and so count == ip4count + ip6count.
// We need to make sure that the memoryBlock is large enough to hold all interfaces
// and all addresses without any overlap between interfaceList and addressList.
int interfaceCountUpperLimit = count;
int entriesCount = count + ip4count + ip6count;
#else
int interfaceCountUpperLimit = count - ip4count - ip6count;
int entriesCount = count;
#endif
size_t entriesCount = (size_t)(interfaceCountUpperLimit + ip4count + ip6count);
void * memoryBlock = calloc(entriesCount, sizeof(NetworkInterfaceInfo));
void * memoryBlock = calloc((size_t)entriesCount, sizeof(NetworkInterfaceInfo));
if (memoryBlock == NULL)
{
errno = ENOMEM;
Expand All @@ -374,7 +373,7 @@ int32_t SystemNative_GetNetworkInterfaces(int32_t * interfaceCount, NetworkInter
ifaddrsEntry = head;
*interfaceList = nii = (NetworkInterfaceInfo*)memoryBlock;
// address of first IpAddressInfo after all NetworkInterfaceInfo entries.
*addressList = ai = (IpAddressInfo*)(nii + interfaceCountUpperLimit);
*addressList = ai = (IpAddressInfo*)(nii + (entriesCount - ip4count - ip6count));

while (ifaddrsEntry != NULL)
{
Expand Down