diff --git a/src/Cedar/BridgeWin32.c b/src/Cedar/BridgeWin32.c index b5df92f2..2941ae81 100644 --- a/src/Cedar/BridgeWin32.c +++ b/src/Cedar/BridgeWin32.c @@ -1162,7 +1162,6 @@ void Win32EthMakeCombinedName(char *dst, UINT dst_size, char *nicname, char *gui if (IsEmptyStr(guid) == false) { // Allow to combine "FriendlyName" consisting of a NULL character and ID. - //Format(dst, dst_size, "%s (ID=%010u)", nicname, Win32EthGenIdFromGuid(guid)); Format(dst, dst_size, "%s(ID=%010u)", nicname, Win32EthGenIdFromGuid(guid)); } else @@ -1187,7 +1186,7 @@ UINT Win32EthGetNameAndIdFromCombinedName(char *name, UINT name_size, char *str) len = StrLen(str); - // Allow to combine "FriendlyName" consisting of a NULL character and ID. + // Allow to combine "FriendlyName" consisting of a NULL character and ID beginning with "(ID=". if (len >= 15) { StrCpy(id_str, sizeof(id_str), str + len - 15); @@ -1410,8 +1409,7 @@ LIST *GetEthAdapterListInternal() UINT size; char *buf; UINT i, j; - //char *qos_tag = " (Microsoft's Packet Scheduler)"; - char *qos_tag = "(Microsoft's Packet Scheduler)"; // Allow to combine "FriendlyName" consisting of a NULL character and QOS. + char *qos_tag = "(Microsoft's Packet Scheduler)"; // Allow to combine "FriendlyName" consisting of a NULL character and QOS tag. SU *su = NULL; LIST *su_adapter_list = NULL; @@ -1666,8 +1664,7 @@ ANSI_STR: } else { - // Allow to combine "FriendlyName" consisting of a NULL character and ID. - //Format(tmp, sizeof(tmp), "%s (%u)", a->Title, k + 1); + // Allow to combine "FriendlyName" consisting of a NULL character and SEQ number. Format(tmp, sizeof(tmp), "%s(%u)", a->Title, k + 1); } diff --git a/src/Cedar/SeLowUser.c b/src/Cedar/SeLowUser.c index 29967464..1074adf9 100644 --- a/src/Cedar/SeLowUser.c +++ b/src/Cedar/SeLowUser.c @@ -753,11 +753,45 @@ LIST *SuGetAdapterList(SU *u) for (i = 0;i < u->AdapterInfoList.NumAdapters;i++) { SL_ADAPTER_INFO *info = &u->AdapterInfoList.Adapters[i]; - SU_ADAPTER_LIST *a = SuAdapterInfoToAdapterList(info); - if (a != NULL) + if (IsEmptyStr(info->FriendlyName)) { - Add(ret, a); + // Some NetAdapterCx drivers doesn't report the FriendlyName in the kernel mode. + // So we attempt to obtain the DriverDesc string from NetCfg registry key alternatively. + char regkey[MAX_PATH] = {0}; + char tmp[MAX_PATH] = {0}; + char adapter_guid[MAX_PATH] = {0}; + + UniToStr(adapter_guid, sizeof(adapter_guid), info->AdapterId + StrLen(SL_ADAPTER_ID_PREFIX)); + + if (GetClassRegKeyWin32(regkey, sizeof(regkey), tmp, sizeof(tmp), adapter_guid)) + { + char *driver_desc = MsRegReadStrEx2(REG_LOCAL_MACHINE, regkey, "DriverDesc", false, true); + + if (driver_desc != NULL) + { + StrCpy(info->FriendlyName, sizeof(info->FriendlyName), driver_desc); + Free(driver_desc); + } + } + } + + { + SU_ADAPTER_LIST *a = SuAdapterInfoToAdapterList(info); + + char macstr[128] = {0}; + BinToStr(macstr, sizeof(macstr), info->MacAddress, sizeof(info->MacAddress)); + + if (a != NULL) + { + // Debug("SU: Adapter %u (OK): ID=%S, MAC=%s, FriendlyName=%s\n", i, info->AdapterId, macstr, info->FriendlyName); + + Add(ret, a); + } + else + { + // Debug("SU: Adapter %u (NG): ID=%S, MAC=%s, FriendlyName=%s\n", i, info->AdapterId, macstr, info->FriendlyName); + } } } @@ -828,8 +862,7 @@ SU_ADAPTER_LIST *SuAdapterInfoToAdapterList(SL_ADAPTER_INFO *info) UniToStr(tmp, sizeof(tmp), info->AdapterId); // Make the NIC appear in the "Local Bridge Settings" list regardless of a NULL character consisted in "FriendlyName". - //if (IsEmptyStr(tmp) || IsEmptyStr(info->FriendlyName) || StartWith(tmp, SL_ADAPTER_ID_PREFIX) == false) - if (IsEmptyStr(tmp) || StartWith(tmp, SL_ADAPTER_ID_PREFIX) == false) + if (IsEmptyStr(tmp) || /* IsEmptyStr(info->FriendlyName) || */ StartWith(tmp, SL_ADAPTER_ID_PREFIX) == false) { // Name is invalid return NULL;