From 1303c7974fd4e31f81597554beccb597980c9310 Mon Sep 17 00:00:00 2001
From: Cyberes <cyberes@evulid.cc>
Date: Tue, 20 Jun 2023 10:29:28 -0600
Subject: [PATCH] reorganize, start arp proxy

---
 bridge/{ => nat}/bridge-lan.sh                |  6 ++--
 bridge/{ => nat}/bridge-reset.sh              |  6 ++--
 bridge/{ => nat}/clone-client-mac.sh          |  6 ++--
 bridge/{ => nat}/get-dhcp-dns.sh              |  0
 bridge/{ => nat}/get_client_mac_address.sh    |  0
 .../nat/nat-install.sh                        |  0
 config/config.sh.example                      | 30 -------------------
 7 files changed, 9 insertions(+), 39 deletions(-)
 rename bridge/{ => nat}/bridge-lan.sh (95%)
 rename bridge/{ => nat}/bridge-reset.sh (93%)
 rename bridge/{ => nat}/clone-client-mac.sh (89%)
 rename bridge/{ => nat}/get-dhcp-dns.sh (100%)
 rename bridge/{ => nat}/get_client_mac_address.sh (100%)
 rename bridge-install.sh => bridge/nat/nat-install.sh (100%)
 delete mode 100644 config/config.sh.example

diff --git a/bridge/bridge-lan.sh b/bridge/nat/bridge-lan.sh
similarity index 95%
rename from bridge/bridge-lan.sh
rename to bridge/nat/bridge-lan.sh
index 3f9f853..2584b32 100755
--- a/bridge/bridge-lan.sh
+++ b/bridge/nat/bridge-lan.sh
@@ -8,10 +8,10 @@ while [ -L "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
 done
 DIR=$(cd -P "$(dirname "$SOURCE")" >/dev/null 2>&1 && pwd)
 
-if [[ -f "$DIR/../config/config.sh" ]]; then
-  . "$DIR/../config/config.sh"
+if [[ -f "$DIR/../../config/nat-config.sh" ]]; then
+  . "$DIR/../../config/nat-config.sh"
 else
-  echo "$DIR/../config/config.sh missing!"
+  echo "$DIR/../../config/nat-config.sh missing!"
   exit 1
 fi
 
diff --git a/bridge/bridge-reset.sh b/bridge/nat/bridge-reset.sh
similarity index 93%
rename from bridge/bridge-reset.sh
rename to bridge/nat/bridge-reset.sh
index f19c54d..7a8ca74 100755
--- a/bridge/bridge-reset.sh
+++ b/bridge/nat/bridge-reset.sh
@@ -11,10 +11,10 @@ while [ -L "$SOURCE" ]; do
 done
 DIR=$(cd -P "$(dirname "$SOURCE")" >/dev/null 2>&1 && pwd)
 
-if [[ -f "$DIR/../config/config.sh" ]]; then
-  source "$DIR/../config/config.sh"
+if [[ -f "$DIR/../../config/nat-config.sh" ]]; then
+  source "$DIR/../../config/nat-config.sh"
 else
-  echo "$DIR/../config/config.sh missing!"
+  echo "$DIR/../../config/nat-config.sh missing!"
   exit 1
 fi
 
diff --git a/bridge/clone-client-mac.sh b/bridge/nat/clone-client-mac.sh
similarity index 89%
rename from bridge/clone-client-mac.sh
rename to bridge/nat/clone-client-mac.sh
index ecc9c71..79fd5c9 100755
--- a/bridge/clone-client-mac.sh
+++ b/bridge/nat/clone-client-mac.sh
@@ -11,10 +11,10 @@ while [ -L "$SOURCE" ]; do
 done
 DIR=$(cd -P "$(dirname "$SOURCE")" >/dev/null 2>&1 && pwd)
 
-if [[ -f "$DIR/../config/config.sh" ]]; then
-  . "$DIR/../config/config.sh"
+if [[ -f "$DIR/../../config/nat-config.sh" ]]; then
+  . "$DIR/../../config/nat-config.sh"
 else
-  echo "$DIR/../config/config.sh missing!"
+  echo "$DIR/../../config/nat-config.sh missing!"
   exit 1
 fi
 
diff --git a/bridge/get-dhcp-dns.sh b/bridge/nat/get-dhcp-dns.sh
similarity index 100%
rename from bridge/get-dhcp-dns.sh
rename to bridge/nat/get-dhcp-dns.sh
diff --git a/bridge/get_client_mac_address.sh b/bridge/nat/get_client_mac_address.sh
similarity index 100%
rename from bridge/get_client_mac_address.sh
rename to bridge/nat/get_client_mac_address.sh
diff --git a/bridge-install.sh b/bridge/nat/nat-install.sh
similarity index 100%
rename from bridge-install.sh
rename to bridge/nat/nat-install.sh
diff --git a/config/config.sh.example b/config/config.sh.example
deleted file mode 100644
index ef4bac5..0000000
--- a/config/config.sh.example
+++ /dev/null
@@ -1,30 +0,0 @@
-# Name of the Ethernet interface that the bridged client will plug into.
-# This will be your LAN port.
-ETH_IFACE="enp0s31f6"
-
-# Name of the WiFi interface that will connect to the wider network.
-# This will be your WAN port.
-WLAN_IFACE="wlxc8d7193710f4"
-
-# Name of the WiFi network to connect to.
-WIFI_SSID="Example-Network"
-
-# "psk": WPA2-PSK auth.
-# "peap": WPA2-Enterprise in PEAP mode. Make sure to fill out the RADIUS login details below.
-# WIFI_AUTH_MODE="peap"
-# TODO: implement psk mode
-
-# RADIUS login
-WIFI_USERNAME="username"
-WIFI_PWD="password"
-
-# Make this port accessible on the router and have its SSH server on it.
-# The installer will modify the SSH server's config for you.
-ROUTER_SSH_PORT=64535
-
-# "transparent": the bridge device clones the client's MAC address and NATs traffic to a private LAN. Only supports one bridged client.
-# TODO: support bridging multiple clients connected to an ethernet hub
-# BRIDGE_MODE="transparent"
-
-# Don't prompt the user for confirmation
-NON_INTERACTIVE=false