diff --git a/ipt2socks/Makefile b/ipt2socks/Makefile index 781991b7..80676677 100644 --- a/ipt2socks/Makefile +++ b/ipt2socks/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ipt2socks -PKG_VERSION:=1.1.5 +PKG_VERSION:=1.1.4 PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/zfl9/ipt2socks/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=762c3e24962c0b4a46ea8285ae36b0a3123ddbd062681a67779c26905132026c +PKG_HASH:=68dc76e63951d655c2fd9b420e175b5a75a50014d6db6e729398b41f2c988356 PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 diff --git a/luci-app-fchomo/root/usr/share/fchomo/generate_client.uc b/luci-app-fchomo/root/usr/share/fchomo/generate_client.uc index 0f28b5c9..42a2a86f 100644 --- a/luci-app-fchomo/root/usr/share/fchomo/generate_client.uc +++ b/luci-app-fchomo/root/usr/share/fchomo/generate_client.uc @@ -46,12 +46,14 @@ const ucisniff = 'sniff', ucisubro = 'subrules'; /* Hardcode options */ -const common_tcpport = uci.get(uciconf, ucifchm, 'common_tcpport') || '20-21,22,53,80,110,143,443,465,853,873,993,995,5222,8080,8443,9418', - common_udpport = uci.get(uciconf, ucifchm, 'common_udpport') || '20-21,22,53,80,110,143,443,853,993,995,8080,8443,9418', - stun_port = uci.get(uciconf, ucifchm, 'stun_port') || '3478,19302', - turn_port = uci.get(uciconf, ucifchm, 'turn_port') || '5349', - steam_client_port = uci.get(uciconf, ucifchm, 'steam_client_port') || '27015-27050', - steam_p2p_udpport = uci.get(uciconf, ucifchm, 'steam_p2p_udpport') || '3478,4379,4380,27000-27100', +const port_presets = { + common_tcpport: uci.get(uciconf, ucifchm, 'common_tcpport') || '20-21,22,53,80,110,143,443,465,853,873,993,995,5222,8080,8443,9418', + common_udpport: uci.get(uciconf, ucifchm, 'common_udpport') || '20-21,22,53,80,110,143,443,853,993,995,8080,8443,9418', + stun_port: uci.get(uciconf, ucifchm, 'stun_port') || '3478,19302', + turn_port: uci.get(uciconf, ucifchm, 'turn_port') || '5349', + steam_client_port: uci.get(uciconf, ucifchm, 'steam_client_port') || '27015-27050', + steam_p2p_udpport: uci.get(uciconf, ucifchm, 'steam_p2p_udpport') || '3478,4379,4380,27000-27100', + }, tun_name = uci.get(uciconf, ucifchm, 'tun_name') || 'hmtun0', tun_addr4 = uci.get(uciconf, ucifchm, 'tun_addr4') || '198.19.0.1/30', tun_addr6 = uci.get(uciconf, ucifchm, 'tun_addr6') || 'fdfe:dcba:9877::1/126',