sync (#444)

luci-app-openmptcprouter/htdocs/luci-static/resources/openmptcprouter/css/wanstatus.css

@@ -1,6 +1,6 @@
 .container {
   /* container for entire page. fixes bootstrap theme's ridiculously small page width */
-  max-width: 1644px;
+  max-width: 1600px;
 }
 #interface_field {
   padding: 12px 20px 20px 20px;

luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter

@@ -86,9 +86,9 @@ if [ "$(uci -q get openmptcprouter.settings.check_ipv6_website)" = "" ]; then
 		commit openmptcprouter
 	EOF
 fi
-if [ "$(uci -q get openmptcprouter.settings.status_vps_timeout)" = "" ]; then
+if [ "$(uci -q get openmptcprouter.settings.status_vps_timeout)" = "" ] || [ "$(uci -q get openmptcprouter.settings.status_vps_timeout)" = "1" ]; then
 	uci -q batch <<-EOF >/dev/null
-		set openmptcprouter.settings.status_vps_timeout=1
+		set openmptcprouter.settings.status_vps_timeout=3
 		commit openmptcprouter
 	EOF
 fi

openmptcprouter/files/bin/blocklanfw

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [ -f /usr/sbin/iptables-legacy ]; then
+if [ -e /usr/sbin/iptables-legacy ]; then
 	IPTABLES="/usr/sbin/iptables-legacy"
 	IP6TABLES="/usr/sbin/ip6tables-legacy"
 	IPTABLESSAVE="/usr/sbin/iptables-legacy-save"
@@ -89,10 +89,10 @@ v2ray_rules6_fw_drop() {
 [ -n "$(pgrep blocklanfw)" ] && exit 0
 [ -z "$($IPTABLESSAVE 2>/dev/null | grep zone_lan)" ] && exit 0
 fw=0
-if [ "$(uci -q get openmptcprouter.settings.proxy)" = "shadowsocks" ]; then
+if [ "$(uci -q get openmptcprouter.settings.proxy)" = "shadowsocks" ] || [ "$(uci -q get openmptcprouter.settings.proxy)" = "shadowsocks-rust" ]; then
 	ss_rules6_fw_drop
 	ss_rules_fw_drop
-elif [ "$(uci -q get openmptcprouter.settings.proxy)" = "v2ray" ]; then
+elif [ -n "$(uci -q get openmptcprouter.settings.proxy | grep v2ray)" ] || [ -n "$(uci -q get openmptcprouter.settings.proxy | grep xray)" ]; then
 	v2r_rules_fw_drop
 	v2ray_rules6_fw_drop
 fi

openmptcprouter/files/etc/init.d/openmptcprouter-vps

@@ -1343,7 +1343,7 @@ _set_vps_firewall() {
 	vps_config=""
 	_login
 	[ -z "$token" ] && {
-		logger -t "OMR-VPS" "Can't get ${fwservername} token, try later"
+		[ "$(logread | tail -n 3 | grep -c 'vps token')" -lt 3 ] && logger -t "OMR-VPS" "Can't get ${fwservername} token, try later"
 		uci -q batch <<-EOF >/dev/null
 			set openmptcprouter.${fwservername}.admin_error=1
 		EOF
@@ -2018,7 +2018,7 @@ _backup_send() {
 	vps_config=""
 	_login
 	[ -z "$token" ] && {
-		logger -t "OMR-VPS" "Can't get ${servername} token, try later"
+		[ "$(logread | tail -n 3 | grep -c 'vps token')" -lt 3 ] && logger -t "OMR-VPS" "Can't get ${servername} token, try later"
 		uci -q batch <<-EOF >/dev/null
 			set openmptcprouter.${servername}.admin_error=1
 		EOF
@@ -2060,7 +2060,7 @@ _backup_get_and_apply() {
 	vps_config=""
 	_login
 	[ -z "$token" ] && {
-		logger -t "OMR-VPS" "Can't get ${servername} token, try later"
+		[ "$(logread | tail -n 3 | grep -c 'vps token')" -lt 3 ] && logger -t "OMR-VPS" "Can't get ${servername} token, try later"
 		uci -q batch <<-EOF >/dev/null
 			set openmptcprouter.${servername}.admin_error=1
 		EOF
@@ -2104,7 +2104,7 @@ _backup_list() {
 	vps_config=""
 	_login
 	[ -z "$token" ] && {
-		logger -t "OMR-VPS" "Can't get ${servername} token, try later"
+		[ "$(logread | tail -n 3 | grep -c 'vps token')" -lt 3 ] && logger -t "OMR-VPS" "Can't get ${servername} token, try later"
 		uci -q batch <<-EOF >/dev/null
 			set openmptcprouter.${servername}.admin_error=1
 		EOF
@@ -2186,7 +2186,7 @@ _get_token() {
 		if [ "$(uci -q get openmptcprouter.${servername}.username)" != "openmptcprouter" ]; then
 			reason="$reason, custom username"
 		fi
-		logger -t "OMR-VPS" "Can't get ${servername} token, try later ($reason)"
+		[ "$(logread | tail -n 3 | grep -c 'vps token')" -lt 3 ] && logger -t "OMR-VPS" "Can't get ${servername} token, try later ($reason)"
 		uci -q batch <<-EOF >/dev/null
 			set openmptcprouter.${servername}.admin_error=1
 		EOF
@@ -2321,7 +2321,7 @@ _set_pihole_server() {
 	vps_config=""
 	_login
 	[ -z "$token" ] && {
-		logger -t "OMR-VPS" "Can't get token, try later"
+		[ "$(logread | tail -n 3 | grep -c 'vps token')" -lt 3 ] && logger -t "OMR-VPS" "Can't get token, try later"
 		uci -q batch <<-EOF >/dev/null
 			set openmptcprouter.${pservername}.admin_error=1
 		EOF

shadowsocks-libev/files/shadowsocks-libev.config

@@ -14,7 +14,7 @@ config ss_redir hi1
 
 config ss_redir hi2
 	option server 'sss0'
-	option local_address '0.0.0.0'
+	option local_address '::'
 	option local_port '1100'
 	option mode 'tcp_and_udp'
 	option timeout '1000'
@@ -48,3 +48,15 @@ config ss_tunnel 'dns'
 	option server 'sss0'
 	option local_port '5353'
 	option tunnel_address '8.8.8.8:53'
+
+config ss_local 'tracker_sss0'
+	option server 'sss0'
+	option local_address '127.0.0.1'
+	option local_port '1111'
+	option mode 'tcp_and_udp'
+	option timeout '600'
+	option fast_open '0'
+	option syslog '0'
+	option reuse_port '1'
+	option mptcp '1'
+	option verbose '0'

shadowsocks-rust/files/shadowsocks-rust.config

@@ -56,3 +56,15 @@ config ss_tunnel 'dns'
 	option server 'sss0'
 	option local_port '5353'
 	option tunnel_address '8.8.8.8:53'
+
+config ss_local 'tracker_sss0'
+	option server 'sss0'
+	option local_address '127.0.0.1'
+	option local_port '1111'
+	option mode 'tcp_and_udp'
+	option timeout '600'
+	option fast_open '0'
+	option syslog '0'
+	option reuse_port '1'
+	option mptcp '1'
+	option verbose '0'