From 7c686e124e9ceeb7d929adb6494f486e068d51c5 Mon Sep 17 00:00:00 2001
From: MartineauUK <MartineauUK@users.noreply.github.com>
Date: Wed, 15 Dec 2021 18:03:56 +0000
Subject: [PATCH] Update wg_server

FIX: @server' Peer Passthru feature is missing the necessary RPDB rule (Rewrite regression) - Thanks SNB Forum member @ Chongnt)
FIX: When terminating a @server' Peer configured forPassthru, the passthru 'client' Peer wgxx-down.sh script is executed rather than the 'server' Peer script - Thanks SNB Forum member @ Chongnt)
---
 wg_server | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/wg_server b/wg_server
index 97aa1df..dbbce8b 100644
--- a/wg_server
+++ b/wg_server
@@ -1,16 +1,16 @@
 #!/bin/sh
-VERSION="v4.12"
-#============================================================================================ © 2021 Martineau v4.12
+VERSION="v4.13"
+#============================================================================================ © 2021 Martineau v4.13
 #
 
 # Maintainer: Martineau
-# Last Updated Date: 12-Dec-2021
+# Last Updated Date: 15-Dec-2021
 #
 # Description:
 #
 # Acknowledgement:
 #
-# Contributors: odkrys,ZebMcKayhan,Torson
+# Contributors: odkrys,ZebMcKayhan,Torson,chongnt
 
 # shellcheck disable=SC2034
 ANSIColours() {
@@ -56,6 +56,7 @@ Firewall_delete() {
 Manage_Passthru(){
 
     local PASSTHRU_CLIENTS=$(sqlite3 /opt/etc/wireguard.d/WireGuard.db "SELECT client FROM passthru where server='$WG_INTERFACE';" | sort | uniq | tr '\n' ' ')
+    local VPN_ID=           # v4.13 Fix @chongnt
 
     local ACTION="add"
     [ -n "$1" ] && ACTION=$1        # "del" or "add"
@@ -78,9 +79,10 @@ Manage_Passthru(){
                         done << EOR
 $(ip route | grep "$WG_INTERFACE")
 EOR
-                    else
-                        ip rule $ACTION from $IP_ADDR table $TABLE
                     fi
+                    
+                    ip rule $ACTION from $IP_ADDR table $TABLE      # v4.13 Fix @chongnt
+         
                 else
                     ip rule $ACTION from $IP_ADDR table $TABLE 2>/dev/null
                 fi