修复tcp port参数重复导致的报错unknown protocol - #107

Author: lhongcai

luci-app-easytier/Makefile

@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_VERSION:=2.5.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 LUCI_TITLE:=LuCI support for EasyTier
 LUCI_DEPENDS:=+kmod-tun +luci-compat

luci-app-easytier/luasrc/model/cbi/easytier.lua

@@ -344,17 +344,17 @@ disable_udp = s:taboption("privacy", Flag, "disable_udp", translate("Disable UDP
         translate("Disable UDP hole punching (--disable-udp-hole-punching parameter)"))
 disable_udp:depends("etcmd", "etcmd")
 
-udp_port = s:taboption("privacy", Value, "udp_port", translate("UDP whitelist"),
+udp_white_port = s:taboption("privacy", Value, "udp_white_port", translate("UDP whitelist"),
         translate("udp port whitelist. Supports single ports (53) and ranges (5000-6000). (--udp-whitelist parameter)"))
-udp_port:depends("etcmd", "etcmd")
+udp_white_port:depends("etcmd", "etcmd")
 
 disable_tcp = s:taboption("privacy", Flag, "disable_tcp", translate("Disable TCP"),
         translate("Disable TCP hole punching (--disable-tcp-hole-punching parameter)"))
 disable_tcp:depends("etcmd", "etcmd")
 
-tcp_port = s:taboption("privacy", Value, "tcp_port", translate("TCP whitelist"),
+tcp_white_port = s:taboption("privacy", Value, "tcp_white_port", translate("TCP whitelist"),
         translate("tcp port whitelist. Supports single ports (53) and ranges (5000-6000). (--tcp-whitelist parameter)"))
-tcp_port:depends("etcmd", "etcmd")
+tcp_white_port:depends("etcmd", "etcmd")
 
 disable_sym = s:taboption("privacy", Flag, "disable_sym", translate("Disable sym"),
         translate("if true, disable udp nat hole punching for symmetric nat (NAT4), which is based on birthday attack and may be blocked by ISP. (--disable-sym-hole-punching parameter)"))

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

@@ -172,7 +172,7 @@ get_etconfig() {
 		listenermode="$(uci -q get easytier.@easytier[0].listenermode)"
 		tunname="$(uci -q get easytier.@easytier[0].tunname)"
 		relay_network="$(uci -q get easytier.@easytier[0].relay_network || echo 0)"
-		tcp_port="$(uci -q get easytier.@easytier[0].tcp_port)"
+		tcp_port="$(uci -q get easytier.@easytier[0].tcp_port | awk '{print $1}')"
 		ws_port="$(uci -q get easytier.@easytier[0].ws_port)"
 		wss_port="$(uci -q get easytier.@easytier[0].wss_port)"
 		wg_port="$(uci -q get easytier.@easytier[0].wg_port)"
@@ -220,8 +220,8 @@ get_etconfig() {
 		p2p_only="$(uci -q get easytier.@easytier[0].p2p_only || echo 0)"
 		disable_tcp="$(uci -q get easytier.@easytier[0].disable_tcp || echo 0)"
 		disable_sym="$(uci -q get easytier.@easytier[0].disable_sym || echo 0)"
-		udp_port="$(uci -q get easytier.@easytier[0].udp_port)"
-		tcp_port="$(uci -q get easytier.@easytier[0].tcp_port)"
+		udp_white_port="$(uci -q get easytier.@easytier[0].udp_white_port)"
+		tcp_white_port="$(uci -q get easytier.@easytier[0].tcp_white_port)"
 		disable_relay_kcp="$(uci -q get easytier.@easytier[0].disable_relay_kcp || echo 0)"
 		relay_kcp="$(uci -q get easytier.@easytier[0].relay_kcp || echo 0)"
 
@@ -535,10 +535,12 @@ start_et() {
 				[ "$disable_sym" = "0" ] || core_cmd="${core_cmd} --disable-sym-hole-punching"
 				[ "$disable_relay_kcp" = "0" ] || core_cmd="${core_cmd} --disable-relay-kcp true"
 				[ "$relay_kcp" = "0" ] || core_cmd="${core_cmd} --enable-relay-foreign-network-kcp true"
-				[ -z "$udp_port" ] || core_cmd="${core_cmd} --udp-whitelist $udp_port"
-				[ -z "$tcp_port" ] || core_cmd="${core_cmd} --tcp-whitelist $tcp_port"
+				[ -z "$udp_white_port" ] || core_cmd="${core_cmd} --udp-whitelist $udp_white_port"
+				[ -z "$tcp_white_port" ] || core_cmd="${core_cmd} --tcp-whitelist $tcp_white_port"
 				[ -z "$extra_args" ] || core_cmd="${core_cmd} $extra_args"
 
+				echo "$(date '+%Y-%m-%d %H:%M:%S') easytier : 运行 ${easytierbin} ${core_cmd} --console-log-level ${log}" >>/tmp/easytier.log
+				
 
 	     		fi
 			if [ "$etcmd" = "web" ] ; then