improve route storing reliability (#2)

eshork · May 14, 2024 · e7aa920 · e7aa920
1 parent 417e7bf
commit e7aa920
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/root/defaults/route-killswitch b/root/defaults/route-killswitch
@@ -15,7 +15,7 @@ if [[ $OVPN_KILLSWITCH == "true" || $OVPN_KILLSWITCH == "1" ]]; then
     DEFAULT_GATEWAY_ORIG="/etc/openvpn/default_gateway.orig"
     if [[ ! -f ${DEFAULT_GATEWAY_ORIG} ]]; then
         echo "[OVPN_KILLSWITCH] Storing original default gateway within: ${DEFAULT_GATEWAY_ORIG}"
-        route | grep default | awk '{print $2}' > ${DEFAULT_GATEWAY_ORIG}
+        route -n | grep ^0.0.0.0 | grep -v tun | awk '{print $2}' > ${DEFAULT_GATEWAY_ORIG}
     fi
 
     echo "[OVPN_KILLSWITCH] Route-based killswitch enabled: dropping current default route & seeding remote VPN hosts"

diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-openvpn/run b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-openvpn/run
@@ -77,9 +77,9 @@ else
     # this is placed here because we only want to do this once, when the container starts and the routes are fresh (ovpn won't mess with routes it didn't create)
     if [[ $OVPN_SPLIT_PRIVATE == "true" || $OVPN_SPLIT_PRIVATE == "1" ]]; then
         echo "OVPN_SPLIT_PRIVATE enabled: preserving default gateway for private network addresses"
-        route add -net 192.168.0.0/16 gw $( route | grep default | awk '{print $2}' )
-        route add -net 10.0.0.0/8 gw $( route | grep default | awk '{print $2}' )
-        route add -net 172.16.0.0/12 gw $( route | grep default | awk '{print $2}' )
+        route add -net 192.168.0.0/16 gw $( route -n | grep ^0.0.0.0 | grep -v tun | awk '{print $2}' )
+        route add -net 10.0.0.0/8 gw $( route -n | grep ^0.0.0.0 | grep -v tun | awk '{print $2}' )
+        route add -net 172.16.0.0/12 gw $( route -n | grep ^0.0.0.0 | grep -v tun | awk '{print $2}' )
     fi
 
     if [[ $OVPN_KILLSWITCH == "true" || $OVPN_KILLSWITCH == "1" ]]; then