Skip to content

Commit

Permalink
release: v0.44.15-beta
Browse files Browse the repository at this point in the history
  • Loading branch information
@vernesong
vernesong committed Jan 31, 2022
1 parent 464a82d commit 604b55d
Show file tree
Hide file tree
Showing 11 changed files with 30 additions and 20 deletions.
8 changes: 4 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
<a target="_blank" href="https://github.com/Dreamacro/clash/releases/tag/v1.9.0">
<img src="https://img.shields.io/badge/Clash-v1.9.0-blue.svg">
</a>
<a target="_blank" href="https://github.com/vernesong/OpenClash/tree/v0.44.14-beta">
<img src="https://img.shields.io/badge/source code-v0.44.14--beta-green.svg">
<a target="_blank" href="https://github.com/vernesong/OpenClash/tree/v0.44.15-beta">
<img src="https://img.shields.io/badge/source code-v0.44.15--beta-green.svg">
</a>
<a target="_blank" href="https://github.com/vernesong/OpenClash/releases/tag/v0.44.14-beta">
<img src="https://img.shields.io/badge/New Release-v0.44.14--beta-orange.svg">
<a target="_blank" href="https://github.com/vernesong/OpenClash/releases/tag/v0.44.15-beta">
<img src="https://img.shields.io/badge/New Release-v0.44.15--beta-orange.svg">
</a>
</p>

Expand Down
2 changes: 1 addition & 1 deletion luci-app-openclash/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=luci-app-openclash
PKG_VERSION:=0.44.14
PKG_VERSION:=0.44.15
PKG_RELEASE:=beta
PKG_MAINTAINER:=vernesong <https://github.com/vernesong/OpenClash>

Expand Down
1 change: 1 addition & 0 deletions luci-app-openclash/luasrc/model/cbi/openclash/config-subscribe-edit.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ o.rmempty = true
---- de_exkey
o = s:option(MultiValue, "de_ex_keyword", font_red..bold_on..translate("Exclude Keyword Match Default")..bold_off..font_off)
o.rmempty = true
o:depends("sub_convert", 0)
o:value("过期时间")
o:value("剩余流量")
o:value("TG群")
Expand Down
2 changes: 1 addition & 1 deletion luci-app-openclash/luasrc/model/cbi/openclash/rule-providers-manage.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ local uci = require "luci.model.uci".cursor()

m = SimpleForm("openclash", translate("Other Rule Providers List"))
m.description=translate("Rule Project:").." ConnersHua ( https://github.com/DivineEngine/Profiles )<br/>"..
translate("Rule Project:").." lhie1 ( https://github.com/lhie1/Rules )<br/>"..
translate("Rule Project:").." lhie1 ( https://github.com/dler-io/Rules )<br/>"..
translate("Rule Project:").." ACL4SSR ( https://github.com/ACL4SSR/ACL4SSR/tree/master )"
m.reset = false
m.submit = false
Expand Down
3 changes: 1 addition & 2 deletions luci-app-openclash/luasrc/view/openclash/log.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,10 @@
}

.radio-button{
width: fit-content;
width: fit-content;
text-align: center;
overflow: auto;
margin: 10px auto;
white-space: nowrap;
background-color: #d1d1d1;
border-radius: 4px;
}
Expand Down
2 changes: 1 addition & 1 deletion luci-app-openclash/luasrc/view/openclash/sub_info_show.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
};
});

var s_<%=idname%> = setTimeout("sub_info_get_<%=idname%>()",1000*10);
var s_<%=idname%> = setTimeout("sub_info_get_<%=idname%>()",1000*60);
};

//]]></script>
Expand Down
24 changes: 17 additions & 7 deletions luci-app-openclash/root/etc/init.d/openclash
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1704,13 +1704,19 @@ if [ "$china_ip_route" = "1" ] || [ "$disable_udp_quic" = "1" ]; then
ipset -! restore </etc/openclash/china_ip_route.ipset 2>/dev/null
fi

if [ "$enable_redirect_dns" -eq 1 ] && [ -z "$(iptables -t nat -nL PREROUTING --line-number |grep 'DNS Hijack')"]; then
if [ "$enable_redirect_dns" -eq 1 ]; then
DNSPORT=$(uci -q get dhcp.@dnsmasq[0].port)
if [ -z "$DNSPORT" ]; then
DNSPORT=$(netstat -nlp |grep -E '127.0.0.1:.*dnsmasq' |awk -F '127.0.0.1:' '{print $2}' |awk '{print $1}' |head -1 || echo "$dns_port")
DNSPORT=$(netstat -nlp |grep -E '127.0.0.1:.*dnsmasq' |awk -F '127.0.0.1:' '{print $2}' |awk '{print $1}' |head -1 || echo "$dns_port")
fi
if [ -z "$(iptables -t nat -nL PREROUTING --line-number |grep 'DNS Hijack')"]; then
iptables -t nat -I PREROUTING -p udp --dport 53 -j REDIRECT --to-ports "$DNSPORT" -m comment --comment "DNS Hijack"
iptables -t nat -I PREROUTING -p tcp --dport 53 -j REDIRECT --to-ports "$DNSPORT" -m comment --comment "DNS Hijack"
fi
if [ -z "$(iptables -t nat -nL OUTPUT --line-number |grep 'DNS Hijack')"]; then
iptables -t nat -I OUTPUT -p udp --dport 53 -j REDIRECT --to-ports "$DNSPORT" -m comment --comment "DNS Hijack"
iptables -t nat -I OUTPUT -p tcp --dport 53 -j REDIRECT --to-ports "$DNSPORT" -m comment --comment "DNS Hijack"
fi
iptables -t nat -I PREROUTING -p udp --dport 53 -j REDIRECT --to-ports "$DNSPORT" -m comment --comment "DNS Hijack"
iptables -t nat -I PREROUTING -p tcp --dport 53 -j REDIRECT --to-ports "$DNSPORT" -m comment --comment "DNS Hijack"
fi

#lan_ac
Expand Down Expand Up @@ -1876,6 +1882,10 @@ if [ -z "$en_mode_tun" ] || [ "$en_mode_tun" -eq 2 ]; then
if [ "$en_mode" = "fake-ip" ]; then
iptables -t nat -N openclash_output
iptables -t nat -F openclash_output
if [ "$enable_redirect_dns" -eq 1 ] && [ -z "$(iptables -t nat -nL OUTPUT --line-number |grep 'DNS Hijack')"]; then
iptables -t nat -I OUTPUT -p udp --dport 53 -j REDIRECT --to-ports "$DNSPORT" -m comment --comment "DNS Hijack"
iptables -t nat -I OUTPUT -p tcp --dport 53 -j REDIRECT --to-ports "$DNSPORT" -m comment --comment "DNS Hijack"
fi
iptables -t nat -A openclash_output -m set --match-set localnetwork dst -j RETURN
if [ "$intranet_allowed" -eq 1 ]; then
iptables -t nat -A openclash_output -p tcp -d 198.18.0.0/16 -j DNAT --to-destination "$lan_ip:$proxy_port"
Expand All @@ -1885,7 +1895,7 @@ if [ -z "$en_mode_tun" ] || [ "$en_mode_tun" -eq 2 ]; then

fi
fi
iptables -t nat -I OUTPUT -j openclash_output >/dev/null 2>&1
iptables -t nat -A OUTPUT -j openclash_output >/dev/null 2>&1
fi
if [ -n "$en_mode_tun" ]; then
#TUN模式
Expand Down Expand Up @@ -1917,7 +1927,7 @@ if [ -n "$en_mode_tun" ]; then
elif [ -z "$_koolshare" ]; then
iptables -t mangle -A openclash_output -m owner ! --uid-owner 65534 -p udp -d 198.18.0.0/16 -j MARK --set-mark "$PROXY_FWMARK"
fi
iptables -t mangle -I OUTPUT -j openclash_output
iptables -t mangle -A OUTPUT -j openclash_output
elif [ -z "$_koolshare" ] && [ "$en_mode" = "redir-host" ] && [ "$en_mode_tun" -eq 1 ]; then
iptables -t mangle -N openclash_output
iptables -t mangle -F openclash_output
Expand All @@ -1928,7 +1938,7 @@ if [ -n "$en_mode_tun" ]; then
iptables -t mangle -A openclash_output -m owner ! --uid-owner 65534 -m set --match-set china_ip_route dst -j RETURN >/dev/null 2>&1
fi
iptables -t mangle -A openclash_output -m owner ! --uid-owner 65534 -p tcp -j MARK --set-mark "$PROXY_FWMARK"
iptables -t mangle -I OUTPUT -j openclash_output
iptables -t mangle -A OUTPUT -j openclash_output
fi

iptables -t mangle -N openclash
Expand Down
4 changes: 2 additions & 2 deletions luci-app-openclash/root/usr/share/openclash/res/openclash_version
View file

Large diffs are not rendered by default.

Binary file removed luci-app-openclash_0.44.14-beta_all.ipk
View file
Binary file not shown.
Binary file added luci-app-openclash_0.44.15-beta_all.ipk
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions version
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
v0.44.14-beta
https://img.shields.io/badge/New Release-v0.44.14--beta-orange.svg
v0.44.15-beta
https://img.shields.io/badge/New Release-v0.44.15--beta-orange.svg

0 comments on commit 604b55d

Please sign in to comment.