mirror of
https://github.com/SoftEtherVPN/SoftEtherVPN.git
synced 2024-11-22 17:39:53 +03:00
Rename macro BRDEST -> BRIDGE for simplicity
UNIX_VLAN_BRDEST_IFACE_PREFIX -> UNIX_VLAN_BRIDGE_IFACE_PREFIX
This commit is contained in:
parent
09708bc8cb
commit
8826484245
@ -321,7 +321,7 @@ TOKEN_LIST *GetEthListLinux(bool enum_normal, bool enum_rawip)
|
||||
{
|
||||
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));
|
||||
}
|
||||
|
@ -676,7 +676,7 @@
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
||||
#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
|
||||
#define TAP_FILENAME_1 "/dev/net/tun"
|
||||
|
@ -7988,7 +7988,7 @@ void SmBridgeDlgOnOk(HWND hWnd, SM_SERVER *s)
|
||||
t.TapMode = tapmode;
|
||||
|
||||
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, "tap", false))
|
||||
{
|
||||
|
@ -273,7 +273,7 @@ VLAN *NewBridgeTap(char *name, char *mac_address, bool create_up)
|
||||
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)
|
||||
{
|
||||
return NULL;
|
||||
@ -611,7 +611,7 @@ void UnixDestroyTapDeviceEx(char *name, char *prefix)
|
||||
void UnixDestroyBridgeTapDevice(char *name)
|
||||
{
|
||||
#ifdef UNIX_BSD
|
||||
UnixDestroyTapDeviceEx(name, UNIX_VLAN_BRDEST_IFACE_PREFIX);
|
||||
UnixDestroyTapDeviceEx(name, UNIX_VLAN_BRIDGE_IFACE_PREFIX);
|
||||
#endif // UNIX_BSD
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user