Skip to content

Commit a3758e9

Browse files
lmq8267lmq8267
authored
https://github.com/EasyTier/luci-app-easytier/issues/62
1 parent d9d1c03 commit a3758e9

File tree

1 file changed

+5
-65
lines changed
  • luci-app-easytier/root/etc/init.d

1 file changed

+5
-65
lines changed

‎luci-app-easytier/root/etc/init.d/easytier‎

Lines changed: 5 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -119,19 +119,14 @@ check_config() {
119119
instance_name=$(cat $config_file | grep "instance_name =" | awk '{print $3}'| tr -d '" ')
120120
socks_port=$(cat $config_file | grep "socks5_proxy" | awk -F ":" '{print $3}'| tr -d '" ')
121121
[ -z "$(grep -F 'listeners = []' $config_file)" ] && listenermode="ON"
122-
tcp_port=$(cat $config_file | grep "tcp://0.0.0.0" | awk -F ":" '{print $3}'| tr -d '", ')
123-
udp_port=$(cat $config_file | grep "udp://0.0.0.0" | awk -F ":" '{print $3}'| tr -d '", ')
124-
ws_port=$(cat $config_file | grep "ws://0.0.0.0" | awk -F ":" '{print $3}'| tr -d '"/, ')
125-
wss_port=$(cat $config_file | grep "wss://0.0.0.0" | awk -F ":" '{print $3}'| tr -d '"/, ')
126-
wg_port=$(cat $config_file | grep "wg://0.0.0.0" | awk -F ":" '{print $3}'| tr -d '", ')
122+
tcp_port=$(grep -oE '"tcp://(\[::\]|0\.0\.0\.0):[0-9]+"' "$config_file" | head -n1 | sed -E 's/.*:([0-9]+)"/\1/')
123+
udp_port=$(grep -oE '"udp://(\[::\]|0\.0\.0\.0):[0-9]+"' "$config_file" | head -n1 | sed -E 's/.*:([0-9]+)"/\1/')
124+
ws_port=$(grep -oE '"ws://(\[::\]|0\.0\.0\.0):[0-9]+"' "$config_file" | head -n1 | sed -E 's/.*:([0-9]+)"/\1/')
125+
wss_port=$(grep -oE '"wss://(\[::\]|0\.0\.0\.0):[0-9]+"' "$config_file" | head -n1 | sed -E 's/.*:([0-9]+)"/\1/')
126+
wg_port=$(grep -oE '"wg://(\[::\]|0\.0\.0\.0):[0-9]+"' "$config_file" | head -n1 | sed -E 's/.*:([0-9]+)"/\1/')
127127
tunname=$(cat $config_file | grep "dev_name =" | awk '{print $3}'| tr -d '", ')
128128
proxy_network=$(grep -F '[[proxy_network]]' $config_file)
129129
wireguard_port=$(cat $config_file | grep "wireguard_listen = " | awk -F ":" '{print $2}'| tr -d '/", ')
130-
v6ws_port=$(cat $config_file | grep 'ws://\[::\]:' | sed -n 's/.*:\([0-9]*\)\/.*/\1/p')
131-
v6wss_port=$(cat $config_file | grep 'wss://\[::\]:' | sed -n 's/.*:\([0-9]*\)\/.*/\1/p')
132-
v6tcp_port=$(cat $config_file |grep 'tcp://\[::\]:' | sed -n 's/.*:\([0-9]*\).*/\1/p')
133-
v6udp_port=$(cat $config_file |grep 'udp://\[::\]:' | sed -n 's/.*:\([0-9]*\).*/\1/p')
134-
v6wg_port=$(cat $config_file |grep 'wg://\[::\]:' | sed -n 's/.*:\([0-9]*\).*/\1/p')
135130

136131
procd_open_instance
137132
get_tz
@@ -173,61 +168,6 @@ check_config() {
173168
uci set firewall.easytier_wireguard.dest_port="$wireguard_port"
174169
uci set firewall.easytier_wireguard.enabled="1"
175170
fi
176-
if [ ! -z "$v6tcp_port" ] ; then
177-
echo "$(date '+%Y-%m-%d %H:%M:%S') easytier : 添加防火墙规则 easytier_v6tcp 放行TCP端口 ${v6tcp_port} " >>/tmp/easytier.log
178-
uci -q delete firewall.easytier_v6tcp
179-
uci set firewall.easytier_v6tcp=rule
180-
uci set firewall.easytier_v6tcp.name="easytier_v6tcp"
181-
uci set firewall.easytier_v6tcp.target="ACCEPT"
182-
uci set firewall.easytier_v6tcp.src="wan"
183-
uci set firewall.easytier_v6tcp.proto="tcp"
184-
uci set firewall.easytier_v6tcp.dest_port="$v6tcp_port"
185-
uci set firewall.easytier_v6tcp.enabled="1"
186-
fi
187-
if [ ! -z "$v6udp_port" ] ; then
188-
echo "$(date '+%Y-%m-%d %H:%M:%S') easytier : 添加防火墙规则 easytier_v6udp 放行UDP端口 ${v6udp_port} " >>/tmp/easytier.log
189-
uci -q delete firewall.easytier_v6udp
190-
uci set firewall.easytier_v6udp=rule
191-
uci set firewall.easytier_v6udp.name="easytier_v6udp"
192-
uci set firewall.easytier_v6udp.target="ACCEPT"
193-
uci set firewall.easytier_v6udp.src="wan"
194-
uci set firewall.easytier_v6udp.proto="udp"
195-
uci set firewall.easytier_v6udp.dest_port="$v6udp_port"
196-
uci set firewall.easytier_v6udp.enabled="1"
197-
fi
198-
if [ ! -z "$v6ws_port" ] ; then
199-
echo "$(date '+%Y-%m-%d %H:%M:%S') easytier : 添加防火墙规则 easytier_v6ws 放行TCP端口 ${v6ws_port} " >>/tmp/easytier.log
200-
uci -q delete firewall.easytier_v6ws
201-
uci set firewall.easytier_v6ws=rule
202-
uci set firewall.easytier_v6ws.name="easytier_v6ws"
203-
uci set firewall.easytier_v6ws.target="ACCEPT"
204-
uci set firewall.easytier_v6ws.src="wan"
205-
uci set firewall.easytier_v6ws.proto="tcp"
206-
uci set firewall.easytier_v6ws.dest_port="$v6ws_port"
207-
uci set firewall.easytier_v6ws.enabled="1"
208-
fi
209-
if [ ! -z "$v6wss_port" ] ; then
210-
echo "$(date '+%Y-%m-%d %H:%M:%S') easytier : 添加防火墙规则 easytier_v6wss 放行TCP端口 ${v6wss_port} " >>/tmp/easytier.log
211-
uci -q delete firewall.easytier_v6wss
212-
uci set firewall.easytier_v6wss=rule
213-
uci set firewall.easytier_v6wss.name="easytier_v6wss"
214-
uci set firewall.easytier_v6wss.target="ACCEPT"
215-
uci set firewall.easytier_v6wss.src="wan"
216-
uci set firewall.easytier_v6wss.proto="tcp"
217-
uci set firewall.easytier_v6wss.dest_port="$v6wss_port"
218-
uci set firewall.easytier_v6wss.enabled="1"
219-
fi
220-
if [ ! -z "$v6wg_port" ] ; then
221-
echo "$(date '+%Y-%m-%d %H:%M:%S') easytier : 添加防火墙规则 easytier_v6wg 放行UDP端口 ${v6wg_port} " >>/tmp/easytier.log
222-
uci -q delete firewall.easytier_v6wg
223-
uci set firewall.easytier_v6wg=rule
224-
uci set firewall.easytier_v6wg.name="easytier_v6wg"
225-
uci set firewall.easytier_v6wg.target="ACCEPT"
226-
uci set firewall.easytier_v6wg.src="wan"
227-
uci set firewall.easytier_v6wg.proto="udp"
228-
uci set firewall.easytier_v6wg.dest_port="$v6wg_port"
229-
uci set firewall.easytier_v6wg.enabled="1"
230-
fi
231171
}
232172

233173
get_etconfig() {

0 commit comments

Comments
 (0)