From 88264842454cb775d41c4400b3370934c43fc382 Mon Sep 17 00:00:00 2001
From: Koichiro IWAO <meta@vmeta.jp>
Date: Wed, 14 Jun 2023 20:56:01 +0900
Subject: [PATCH] Rename macro BRDEST -> BRIDGE for simplicity

UNIX_VLAN_BRDEST_IFACE_PREFIX -> UNIX_VLAN_BRIDGE_IFACE_PREFIX
---
 src/Cedar/BridgeUnix.c | 2 +-
 src/Cedar/Cedar.h      | 2 +-
 src/Cedar/SM.c         | 2 +-
 src/Cedar/VLanUnix.c   | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Cedar/BridgeUnix.c b/src/Cedar/BridgeUnix.c
index 5c1d0646..b9c29039 100644
--- a/src/Cedar/BridgeUnix.c
+++ b/src/Cedar/BridgeUnix.c
@@ -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));
 							}
diff --git a/src/Cedar/Cedar.h b/src/Cedar/Cedar.h
index 5ce8afa0..097b6a4c 100644
--- a/src/Cedar/Cedar.h
+++ b/src/Cedar/Cedar.h
@@ -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"
diff --git a/src/Cedar/SM.c b/src/Cedar/SM.c
index 41c17700..b76343f3 100644
--- a/src/Cedar/SM.c
+++ b/src/Cedar/SM.c
@@ -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))
 	{
diff --git a/src/Cedar/VLanUnix.c b/src/Cedar/VLanUnix.c
index ae7e93e8..80174209 100644
--- a/src/Cedar/VLanUnix.c
+++ b/src/Cedar/VLanUnix.c
@@ -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
 }