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

Rename macro BRDEST -> BRIDGE for simplicity

Browse Source 
UNIX_VLAN_BRDEST_IFACE_PREFIX -> UNIX_VLAN_BRIDGE_IFACE_PREFIX
This commit is contained in:
Koichiro IWAO 2023-06-14 20:56:01 +09:00
parent 09708bc8cb
commit 8826484245
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Cedar/BridgeUnix.c
View File

@ -321,7 +321,7 @@ TOKEN_LIST *GetEthListLinux(bool enum_normal, bool enum_rawip)
{ {
if (IsInListStr(o, name) == false) if (IsInListStr(o, name) == false)
{ {
if (StartWith(name, UNIX_VLAN_BRDEST_IFACE_PREFIX"_") == false) if (StartWith(name, UNIX_VLAN_BRIDGE_IFACE_PREFIX"_") == false)
{ {
Add(o, CopyStr(name)); Add(o, CopyStr(name));
} }

2
src/Cedar/Cedar.h
View File

@ -676,7 +676,7 @@
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#define UNIX_VLAN_CLIENT_IFACE_PREFIX "vpn" // Prefix of UNIX virtual LAN card interface (used for client) #define UNIX_VLAN_CLIENT_IFACE_PREFIX "vpn" // Prefix of UNIX virtual LAN card interface (used for client)
#define UNIX_VLAN_BRDEST_IFACE_PREFIX "tap" // Prefix of UNIX virtual LAN card interface (used for bridge destination) #define UNIX_VLAN_BRIDGE_IFACE_PREFIX "tap" // Prefix of UNIX virtual LAN card interface (used for bridge destination)
#ifndef UNIX_BSD #ifndef UNIX_BSD
#define TAP_FILENAME_1 "/dev/net/tun" #define TAP_FILENAME_1 "/dev/net/tun"

2
src/Cedar/SM.c
View File

@ -7988,7 +7988,7 @@ void SmBridgeDlgOnOk(HWND hWnd, SM_SERVER *s)
t.TapMode = tapmode; t.TapMode = tapmode;
if (InStrEx(t.DeviceName, UNIX_VLAN_CLIENT_IFACE_PREFIX, false) if (InStrEx(t.DeviceName, UNIX_VLAN_CLIENT_IFACE_PREFIX, false)
|| InStrEx(t.DeviceName, "UNIX_VLAN_BRDEST_IFACE_PREFIX, false) || InStrEx(t.DeviceName, "UNIX_VLAN_BRIDGE_IFACE_PREFIX, false)
|| InStrEx(t.DeviceName, "tun", false) || InStrEx(t.DeviceName, "tun", false)
|| InStrEx(t.DeviceName, "tap", false)) || InStrEx(t.DeviceName, "tap", false))
{ {

4
src/Cedar/VLanUnix.c
View File

@ -273,7 +273,7 @@ VLAN *NewBridgeTap(char *name, char *mac_address, bool create_up)
return NULL; return NULL;
} }
fd = UnixCreateTapDeviceEx(name, UNIX_VLAN_BRDEST_IFACE_PREFIX, mac_address, create_up); fd = UnixCreateTapDeviceEx(name, UNIX_VLAN_BRIDGE_IFACE_PREFIX, mac_address, create_up);
if (fd == -1) if (fd == -1)
{ {
return NULL; return NULL;
@ -611,7 +611,7 @@ void UnixDestroyTapDeviceEx(char *name, char *prefix)
void UnixDestroyBridgeTapDevice(char *name) void UnixDestroyBridgeTapDevice(char *name)
{ {
#ifdef UNIX_BSD #ifdef UNIX_BSD
UnixDestroyTapDeviceEx(name, UNIX_VLAN_BRDEST_IFACE_PREFIX); UnixDestroyTapDeviceEx(name, UNIX_VLAN_BRIDGE_IFACE_PREFIX);
#endif // UNIX_BSD #endif // UNIX_BSD
} }