tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Try to resolve interface names before removing nameless interfaces." am: 9f8e1d52cb

Browse source 
Change-Id: Id5751c2e9c8882b5cdc58d786195d0f518880a43
This commit is contained in:
Automerger Merge Worker 2020-02-25 09:10:32 +00:00
commit cea478eca2
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libc/bionic/ifaddrs.cpp
View file

@ -248,11 +248,20 @@ static void __getifaddrs_callback(void* context, nlmsghdr* hdr) {
}
}
static void remove_nameless_interfaces(ifaddrs** list) {
static void resolve_or_remove_nameless_interfaces(ifaddrs** list) {
ifaddrs_storage* addr = reinterpret_cast<ifaddrs_storage*>(*list);
ifaddrs_storage* prev_addr = nullptr;
while (addr != nullptr) {
ifaddrs* next_addr = addr->ifa.ifa_next;
// Try resolving interfaces without a name first.
if (strlen(addr->name) == 0) {
if (if_indextoname(addr->interface_index, addr->name) != nullptr) {
addr->ifa.ifa_name = addr->name;
}
}
// If the interface could not be resolved, remove it.
if (strlen(addr->name) == 0) {
if (prev_addr == nullptr) {
*list = next_addr;
@ -296,8 +305,8 @@ int getifaddrs(ifaddrs** out) {
if (!getlink_success) {
async_safe_format_log(ANDROID_LOG_INFO, "ifaddrs", "Failed to send RTM_GETLINK request");
// If we weren't able to depend on GETLINK messages, it's possible some
// interfaces never got their name set. Remove those.
remove_nameless_interfaces(out);
// interfaces never got their name set. Resolve them using if_indextoname or remove them.
resolve_or_remove_nameless_interfaces(out);
}
return 0;