From 81fe99945f27ed61c7f416229573155c0f6066e9 Mon Sep 17 00:00:00 2001
From: Jason <xjasonlyu@gmail.com>
Date: Sat, 8 Aug 2020 13:08:55 +0800
Subject: [PATCH] update script

---
 Dockerfile   |  5 +++--
 tun2socks.sh | 11 ++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0225174..989e94e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,8 +21,9 @@ RUN apk add --update --no-cache iproute2 \
 
 ENV TUN tun0
 ENV ETH eth0
-ENV ETHGW=
-ENV TUNGW=
+ENV ETHADDR=
+ENV TUNADDR=
+ENV TUNMASK=
 ENV PROXY=
 ENV LOGLEVEL=
 ENV EXCLUDED=
diff --git a/tun2socks.sh b/tun2socks.sh
index 1dce826..59434a3 100644
--- a/tun2socks.sh
+++ b/tun2socks.sh
@@ -2,8 +2,9 @@
 
 TUN="${TUN:-tun0}"
 ETH="${ETH:-eth0}"
-ETHGW="${ETHGW:-172.16.1.1}"
-TUNGW="${TUNGW:-198.18.0.1}"
+ETHADDR="${ETHADDR:-172.16.1.1}"
+TUNADDR="${TUNADDR:-198.18.0.1}"
+TUNMASK="${TUNMASK:-255.254.0.0}"
 PROXY="${PROXY:-172.16.1.2:1080}"
 LOGLEVEL="${LOGLEVEL:-warning}"
 EXCLUDED="${EXCLUDED:-172.16.1.2/32}"
@@ -15,17 +16,17 @@ HOSTS="${HOSTS:-localhost=127.0.0.1}"
 
 # create tun device
 ip tuntap add mode tun dev "$TUN"
-ip addr add "$TUNGW"/24 dev "$TUN"
+ip addr add "$TUNADDR"/"$TUNMASK" dev "$TUN"
 ip link set dev "$TUN" up
 
 # change default gateway
 ip route del default > /dev/null
-ip route add default via "$TUNGW" dev "$TUN"
+ip route add default via "$TUNADDR" dev "$TUN"
 
 # add to ip route
 for ip in $(echo "$EXCLUDED" | tr ',' '\n')
 do
-    ip route add "$ip" via "$ETHGW"
+    ip route add "$ip" via "$ETHADDR"
 done
 
 if [ -n "$EXTRACMD" ]; then