From 1f9bc2bdec734537bf2650e769a5d9c4b880a063 Mon Sep 17 00:00:00 2001
From: Keith Irwin <git@ki9.us>
Date: Mon, 7 Nov 2022 17:01:23 -0700
Subject: [PATCH] Route through host to other peers

---
 back/lib/admin/peer/add     | 2 +-
 back/lib/admin/user/add     | 2 +-
 back/lib/dashboard/peer/add | 2 +-
 checklist.md                | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/back/lib/admin/peer/add b/back/lib/admin/peer/add
index ee768d0..83cfa94 100755
--- a/back/lib/admin/peer/add
+++ b/back/lib/admin/peer/add
@@ -153,7 +153,7 @@ while IFS=$'\t' read -r server_hostname server_ipv4 server_ipv6 server_pubkey se
 	server_blocks="${server_blocks}\n[Peer] # ${server_hostname}.${TLD}\nPublicKey=${server_pubkey}\nPresharedKey=${server_psk}\nAllowedIPs=${server_ipv4}/32,${server_ipv6}/128\nEndpoint=${server_endpoint}\n"
 	if [ "${server_hostname}" == "${LOCAL_SERVER}" ]; then
 		# Add new user to local server
-		if "${LIB_DIR}/wg_peer_add" "${pubkey}" "${server_psk}" "${ipv4}/32,${ipv6}/128"; then
+		if "${LIB_DIR}/wg_peer_add" "${pubkey}" "${server_psk}" "${ipv4}/${IPV4_NET#*/},${ipv6}/${IPV6_NET#*/}"; then
 			printf 'Added %s to local wireguard server.\n' "${domain}" >>"${LOGFILE}"
 		else
 			printf 'ERROR! Failed to add %s to local wireguard server!\n' "${domain}" >>"${LOGFILE}"
diff --git a/back/lib/admin/user/add b/back/lib/admin/user/add
index a6ee5a7..ffa1d20 100755
--- a/back/lib/admin/user/add
+++ b/back/lib/admin/user/add
@@ -133,7 +133,7 @@ while IFS=$'\t' read -r server_hostname server_ipv4 server_ipv6 server_pubkey se
 	server_blocks="${server_blocks}\n[Peer] # ${server_hostname}.${TLD}\nPublicKey=${server_pubkey}\nPresharedKey=${server_psk}\nAllowedIPs=${server_ipv4}/32,${server_ipv6}/128\nEndpoint=${server_endpoint}\n"
 	if [ "${server_hostname}" == "${LOCAL_SERVER}" ]; then
 		# Add new user to local server
-		if "${LIB_DIR}/wg_peer_add" "${pubkey}" "${server_psk}" "${ipv4}/32,${ipv6}/128"; then
+		if "${LIB_DIR}/wg_peer_add" "${pubkey}" "${server_psk}" "${ipv4}/${IPV4_NET#*/},${ipv6}/${IPV6_NET#*/}"; then
 			printf 'Added %s to local wireguard server.\n' "${domain}" >>"${LOGFILE}"
 		else
 			printf 'ERROR! Failed to add %s to local wireguard server!\n' "${domain}" >>"${LOGFILE}"
diff --git a/back/lib/dashboard/peer/add b/back/lib/dashboard/peer/add
index 956895d..69352d5 100755
--- a/back/lib/dashboard/peer/add
+++ b/back/lib/dashboard/peer/add
@@ -148,7 +148,7 @@ while IFS=$'\t' read -r server_hostname server_ipv4 server_ipv6 server_pubkey se
 	server_blocks="${server_blocks}\n[Peer] # ${server_hostname}.${TLD}\nPublicKey=${server_pubkey}\nPresharedKey=${server_psk}\nAllowedIPs=${server_ipv4}/32,${server_ipv6}/128\nEndpoint=${server_endpoint}\n"
 	if [ "${server_hostname}" == "${LOCAL_SERVER}" ]; then
 		# Add new user to local server
-		if "${LIB_DIR}/wg_peer_add" "${pubkey}" "${server_psk}" "${ipv4}/32,${ipv6}/128"; then
+		if "${LIB_DIR}/wg_peer_add" "${pubkey}" "${server_psk}" "${ipv4}/${IPV4_NET#*/},${ipv6}/${IPV6_NET#*/}"; then
 			printf 'Added %s to local wireguard server.\n' "${domain}" >>"${LOGFILE}"
 		else
 			printf 'ERROR! Failed to add %s to local wireguard server!\n' "${domain}" >>"${LOGFILE}"
diff --git a/checklist.md b/checklist.md
index 1f09e92..a35943b 100644
--- a/checklist.md
+++ b/checklist.md
@@ -16,11 +16,11 @@
 [X] Display full domain to user peers
 [X] Disable delete button for new peers on dashboard
 [X] shellcheck
-[ ] Prepare config portability
-[ ] Let this server route traffic for all hosts
+[X] Prepare config portability
+[X] Let this server route traffic for all hosts
 [ ] Prevent deleting user's only peer
 [ ] shellcheck
-[ ] Clean up bash file headings
+[ ] Remove bash errors
 [ ] Federated servers
 [ ] shellcheck
 [ ] Deploy on GF4