AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-22 17:39:53 +03:00
Code Releases Activity

Merge pull request #1963 from hiura2023/master

Browse Source 
Change bridge function: Make the NIC appear in the "Local Bridge Settings" list
This commit is contained in:
Ilya Shipitsin 2024-03-11 20:52:35 +01:00 committed by GitHub
commit f6c185f279
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 52 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Cedar/BridgeWin32.c
View File

@ -1161,6 +1161,7 @@ void Win32EthMakeCombinedName(char *dst, UINT dst_size, char *nicname, char *gui
if (IsEmptyStr(guid) == false) 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 else
@ -1185,9 +1186,10 @@ UINT Win32EthGetNameAndIdFromCombinedName(char *name, UINT name_size, char *str)
len = StrLen(str); len = StrLen(str);
if (len >= 16) // 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 - 16); StrCpy(id_str, sizeof(id_str), str + len - 15);
if (StartWith(id_str, "(ID=")) if (StartWith(id_str, "(ID="))
{ {
@ -1196,7 +1198,7 @@ UINT Win32EthGetNameAndIdFromCombinedName(char *name, UINT name_size, char *str)
char num[MAX_SIZE]; char num[MAX_SIZE];
Zero(num, sizeof(num)); Zero(num, sizeof(num));
StrCpy(num, sizeof(num), id_str + 5); StrCpy(num, sizeof(num), id_str + 4);
num[StrLen(num) - 1] = 0; num[StrLen(num) - 1] = 0;
@ -1204,7 +1206,7 @@ UINT Win32EthGetNameAndIdFromCombinedName(char *name, UINT name_size, char *str)
if (ret != 0) if (ret != 0)
{ {
name[len - 16] = 0; name[len - 15] = 0;
} }
} }
} }
@ -1346,6 +1348,8 @@ TOKEN_LIST *GetEthListEx(UINT *total_num_including_hidden, bool enum_normal, boo
Debug("%s - %s\n", a->Guid, a->Title); Debug("%s - %s\n", a->Guid, a->Title);
} }
// Make sure that "FriendlyName" does not cosist a NULL character.
Debug("%s,- s=%d, t=%s, %s,\n", a->Guid, show, tmp, a->Title[0] == 0 ? "check=NG FriendlyName(Title) is NULL !" : "check=OK");
} }
*total_num_including_hidden = ret->NumTokens; *total_num_including_hidden = ret->NumTokens;
@ -1405,7 +1409,7 @@ LIST *GetEthAdapterListInternal()
UINT size; UINT size;
char *buf; char *buf;
UINT i, j; 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 tag.
SU *su = NULL; SU *su = NULL;
LIST *su_adapter_list = NULL; LIST *su_adapter_list = NULL;
@ -1660,6 +1664,7 @@ ANSI_STR:
} }
else else
{ {
// Allow to combine "FriendlyName" consisting of a NULL character and SEQ number.
Format(tmp, sizeof(tmp), "%s(%u)", a->Title, k + 1); Format(tmp, sizeof(tmp), "%s(%u)", a->Title, k + 1);
} }

37
src/Cedar/SeLowUser.c
View File

@ -753,12 +753,46 @@ LIST *SuGetAdapterList(SU *u)
for (i = 0;i < u->AdapterInfoList.NumAdapters;i++) for (i = 0;i < u->AdapterInfoList.NumAdapters;i++)
{ {
SL_ADAPTER_INFO *info = &u->AdapterInfoList.Adapters[i]; SL_ADAPTER_INFO *info = &u->AdapterInfoList.Adapters[i];
if (IsEmptyStr(info->FriendlyName))
{
// 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); SU_ADAPTER_LIST *a = SuAdapterInfoToAdapterList(info);
char macstr[128] = {0};
BinToStr(macstr, sizeof(macstr), info->MacAddress, sizeof(info->MacAddress));
if (a != NULL) if (a != NULL)
{ {
// Debug("SU: Adapter %u (OK): ID=%S, MAC=%s, FriendlyName=%s\n", i, info->AdapterId, macstr, info->FriendlyName);
Add(ret, a); Add(ret, a);
} }
else
{
// Debug("SU: Adapter %u (NG): ID=%S, MAC=%s, FriendlyName=%s\n", i, info->AdapterId, macstr, info->FriendlyName);
}
}
} }
// Sort // Sort
@ -827,7 +861,8 @@ SU_ADAPTER_LIST *SuAdapterInfoToAdapterList(SL_ADAPTER_INFO *info)
Copy(&t.Info, info, sizeof(SL_ADAPTER_INFO)); Copy(&t.Info, info, sizeof(SL_ADAPTER_INFO));
UniToStr(tmp, sizeof(tmp), info->AdapterId); UniToStr(tmp, sizeof(tmp), info->AdapterId);
if (IsEmptyStr(tmp) || IsEmptyStr(info->FriendlyName) || StartWith(tmp, SL_ADAPTER_ID_PREFIX) == false) // 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)
{ {
// Name is invalid // Name is invalid
return NULL; return NULL;