pogmommy/nmrpflash
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

macOS: fix pretty interface name extraction

Browse source
This commit is contained in:
Joseph C. Lehner 2024-08-04 12:43:54 +02:00
parent a0406519d2
commit fba44211d7
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ethsock.c
View file

@ -704,7 +704,14 @@ void find_pretty_name(const void* key, const void* value, void* context)
}
if (!strcmp(ctx->device, device)) {
ctx->pretty = dict_get_string(dict, "UserDefinedName");
// there are two instances of UserDefinedName. The one in the "Interface" dict
// defines a base name, such as "Wi-Fi", whereas the one in the root dict
// might contain a trailing number (e.g. "Wi-Fi 2") to identify multiple
// interfaces with the same base name.
ctx->pretty = dict_get_string((CFDictionaryRef)value, "UserDefinedName");
if (!ctx->pretty) {
ctx->pretty = dict_get_string(dict, "UserDefinedName");
}
}
free(device);