From 0f8326fae1bd4738625c6e1ddfdb57fbcb7869be Mon Sep 17 00:00:00 2001
From: dnomd343 <i@343.re>
Date: Sat, 25 Sep 2021 20:57:06 +0800
Subject: [PATCH] refactor: custom bypass network segment

---
 load.sh   | 39 +++++++++++++++++++--------------------
 tproxy.sh |  4 ++--
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/load.sh b/load.sh
index 064e888..b1a9b69 100755
--- a/load.sh
+++ b/load.sh
@@ -190,6 +190,21 @@ EOF
 chmod +x $ASSET_DIR/update.sh
 }
 
+load_bypass_ipv4(){
+cat>"$NETWORK_DIR/bypass/ipv4"<<EOF
+169.254.0.0/16
+224.0.0.0/3
+EOF
+}
+
+load_bypass_ipv6(){
+cat>"$NETWORK_DIR/bypass/ipv6"<<EOF
+fc00::/7
+fe80::/10
+ff00::/8
+EOF
+}
+
 load_network_ipv4(){
 cat>"$NETWORK_DIR/interface/ipv4"<<EOF
 ADDRESS=
@@ -257,27 +272,11 @@ do
 done < $NETWORK_DIR/dns
 }
 
-load_ipv4(){
-cat>$XRAY_DIR/expose/segment/ipv4<<EOF
-169.254.0.0/16
-224.0.0.0/3
-EOF
-}
-
-load_ipv6(){
-cat>$XRAY_DIR/expose/segment/ipv6<<EOF
-fc00::/7
-fe80::/10
-ff00::/8
-EOF
-}
-
-mkdir -p $XRAY_DIR/config
-mkdir -p $XRAY_DIR/expose/segment
 mkdir -p $LOG_DIR
 mkdir -p $ASSET_DIR
 mkdir -p $CONFIG_DIR
 mkdir -p $NETWORK_DIR
+mkdir -p $XRAY_DIR/config
 
 load_log
 load_inbounds
@@ -291,11 +290,11 @@ cp $CONFIG_DIR/*.json $XRAY_DIR/config/
 [ ! -s "$ASSET_DIR/update.sh" ] && load_asset_update
 cp $ASSET_DIR/*.dat $XRAY_DIR/asset/
 
-[ ! -s "$XRAY_DIR/expose/segment/ipv4" ] && load_ipv4
-[ ! -s "$XRAY_DIR/expose/segment/ipv6" ] && load_ipv6
-
+mkdir -p $NETWORK_DIR/bypass
 mkdir -p $NETWORK_DIR/interface
 [ -s "$NETWORK_DIR/dns" ] && init_dns
+[ ! -f "$NETWORK_DIR/bypass/ipv4" ] && load_bypass_ipv4
+[ ! -f "$NETWORK_DIR/bypass/ipv6" ] && load_bypass_ipv6
 [ -f "$NETWORK_DIR/interface/ignore" ] && exit
 [ ! -s "$NETWORK_DIR/interface/ipv4" ] && load_network_ipv4
 [ ! -s "$NETWORK_DIR/interface/ipv6" ] && load_network_ipv6
diff --git a/tproxy.sh b/tproxy.sh
index 78b1a4f..fade183 100755
--- a/tproxy.sh
+++ b/tproxy.sh
@@ -13,7 +13,7 @@ rm -f /ipv4_range
 while read -r segment
 do
   eval "iptables -t mangle -A XRAY -d $segment -j RETURN"
-done < /etc/xray/expose/segment/ipv4
+done < /etc/xray/expose/network/bypass/ipv4
 iptables -t mangle -A XRAY -p tcp -j TPROXY --on-port 7288 --tproxy-mark 1
 iptables -t mangle -A XRAY -p udp -j TPROXY --on-port 7288 --tproxy-mark 1
 iptables -t mangle -A PREROUTING -j XRAY
@@ -30,7 +30,7 @@ rm -f /ipv6_range
 while read -r segment
 do
   eval "ip6tables -t mangle -A XRAY6 -d $segment -j RETURN"
-done < /etc/xray/expose/segment/ipv6
+done < /etc/xray/expose/network/bypass/ipv6
 ip6tables -t mangle -A XRAY6 -p tcp -j TPROXY --on-port 7289 --tproxy-mark 1
 ip6tables -t mangle -A XRAY6 -p udp -j TPROXY --on-port 7289 --tproxy-mark 1
 ip6tables -t mangle -A PREROUTING -j XRAY6