From 9eeb898ee39567d5eef5d7e87c3db062ce9c860b Mon Sep 17 00:00:00 2001 From: LEAN-ESX Date: Fri, 16 Aug 2019 12:07:46 -0700 Subject: [PATCH 1/2] luci-app=ssr-puls: fix inbound port map in GFWlist mode --- package/lean/luci-app-ssr-plus/Makefile | 2 +- package/lean/luci-app-ssr-plus/root/usr/bin/ssr-rules | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile index 1097a0b1c7..ebef0a08f8 100644 --- a/package/lean/luci-app-ssr-plus/Makefile +++ b/package/lean/luci-app-ssr-plus/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ssr-plus PKG_VERSION:=1 -PKG_RELEASE:=97 +PKG_RELEASE:=98 PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray \ diff --git a/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-rules b/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-rules index b27c9d513d..463f52b415 100755 --- a/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-rules +++ b/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-rules @@ -91,6 +91,7 @@ EOF ipset -N gmlan hash:net 2>/dev/null for ip in $LAN_GM_IP; do ipset -! add gmlan $ip ; done $IPT -A SS_SPEC_WAN_AC -m set --match-set gmlan src -m set ! --match-set china dst -j SS_SPEC_WAN_FW + $IPT -A SS_SPEC_WAN_AC -m set --match-set china dst -j RETURN $IPT -I SS_SPEC_WAN_AC -d $server -j RETURN elif [ "$RUNMODE" = "oversea" ] ;then @@ -196,6 +197,7 @@ tp_rule() { -j TPROXY --on-port "$LOCAL_PORT" --tproxy-mark 0x01/0x01 elif [ "$RUNMODE" = "gfw" ] ;then + $ipt -A SS_SPEC_TPROXY -p udp -m set --match-set china dst -j RETURN $ipt -A SS_SPEC_TPROXY -p udp -m set --match-set gmlan src -m set ! --match-set china dst \ -j TPROXY --on-port "$LOCAL_PORT" --tproxy-mark 0x01/0x01 $ipt -A SS_SPEC_TPROXY -p udp -m set --match-set gfwlist dst \ From 60cc52ffe42953b4448d4299b9c4ee67fab4b857 Mon Sep 17 00:00:00 2001 From: LEAN-ESX Date: Fri, 16 Aug 2019 12:24:37 -0700 Subject: [PATCH 2/2] luci-app-autorebooot: fix sunday schedule reboot datetype --- package/lean/luci-app-autoreboot/Makefile | 2 +- .../luci-app-autoreboot/luasrc/model/cbi/autoreboot.lua | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lean/luci-app-autoreboot/Makefile b/package/lean/luci-app-autoreboot/Makefile index 9e27329863..a148d6a446 100644 --- a/package/lean/luci-app-autoreboot/Makefile +++ b/package/lean/luci-app-autoreboot/Makefile @@ -9,7 +9,7 @@ LUCI_TITLE:=LuCI support for Scheduled Reboot LUCI_DEPENDS:=+luci LUCI_PKGARCH:=all PKG_VERSION:=1.0 -PKG_RELEASE:=8 +PKG_RELEASE:=9 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lean/luci-app-autoreboot/luasrc/model/cbi/autoreboot.lua b/package/lean/luci-app-autoreboot/luasrc/model/cbi/autoreboot.lua index 8a008d7fa1..114543557b 100644 --- a/package/lean/luci-app-autoreboot/luasrc/model/cbi/autoreboot.lua +++ b/package/lean/luci-app-autoreboot/luasrc/model/cbi/autoreboot.lua @@ -11,15 +11,15 @@ enable.rmempty = false enable.default=0 week=s:option(ListValue,"week",translate("Week Day")) -week:value(0,translate("Everyday")) +week:value(*,translate("Everyday")) week:value(1,translate("Monday")) week:value(2,translate("Tuesday")) week:value(3,translate("Wednesday")) week:value(4,translate("Thursday")) week:value(5,translate("Friday")) week:value(6,translate("Saturday")) -week:value(7,translate("Sunday")) -week.default=0 +week:value(0,translate("Sunday")) +week.default=3 hour=s:option(Value,"hour",translate("Hour")) hour.datatype = "range(0,23)"