AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-08-25 05:53:00 +03:00
Code Releases Activity

Merge 645d5ebb55 into fc7093ed36

Browse Source
This commit is contained in:
hiura2023 2024-03-08 16:26:30 +09:00 committed by GitHub
commit 2525c39aac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Cedar/BridgeWin32.c
View File

@ -1161,7 +1161,9 @@ void Win32EthMakeCombinedName(char *dst, UINT dst_size, char *nicname, char *gui
if (IsEmptyStr(guid) == false) if (IsEmptyStr(guid) == false)
{ {
Format(dst, dst_size, "%s (ID=%010u)", nicname, Win32EthGenIdFromGuid(guid)); // 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,18 +1187,19 @@ 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.
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="))
{ {
if (EndWith(id_str, ")")) if (EndWith(id_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 +1207,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 +1349,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 +1410,8 @@ 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)";
char *qos_tag = "(Microsoft's Packet Scheduler)"; // Allow to combine "FriendlyName" consisting of a NULL character and QOS.
SU *su = NULL; SU *su = NULL;
LIST *su_adapter_list = NULL; LIST *su_adapter_list = NULL;
@ -1660,7 +1666,9 @@ ANSI_STR:
} }
else else
{ {
Format(tmp, sizeof(tmp), "%s (%u)", a->Title, k + 1); // Allow to combine "FriendlyName" consisting of a NULL character and ID.
//Format(tmp, sizeof(tmp), "%s (%u)", a->Title, k + 1);
Format(tmp, sizeof(tmp), "%s(%u)", a->Title, k + 1);
} }
ok = true; ok = true;

4
src/Cedar/SeLowUser.c
View File

@ -827,7 +827,9 @@ 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)
if (IsEmptyStr(tmp) || StartWith(tmp, SL_ADAPTER_ID_PREFIX) == false)
{ {
// Name is invalid // Name is invalid
return NULL; return NULL;