fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/coolsnowwolf/lede into dev

Browse Source
This commit is contained in:
CN_SZTL 2019-08-17 12:37:30 +08:00
commit 7ca1978a35
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/lean/luci-app-autoreboot/Makefile
View File

@ -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

6
package/lean/luci-app-autoreboot/luasrc/model/cbi/autoreboot.lua
View File

@ -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)"

2
package/lean/luci-app-ssr-plus/Makefile
View File

@ -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 \

2
package/lean/luci-app-ssr-plus/root/usr/bin/ssr-rules
View File

@ -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 \