mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-02-15 03:51:51 +00:00
Code Issues Releases Wiki Activity

Merge pull request #267 from Ysurac/develop

Browse source 
Fix ndpi support
This commit is contained in:
suyuan 2022-08-19 01:33:52 +08:00 committed by GitHub
commit 6fa6f23ff1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
luci-app-omr-bypass/htdocs/luci-static/resources/view/services/omr-bypass.js
View file

@ -223,6 +223,9 @@ return L.view.extend({
o.noinactive = true; o.noinactive = true;
o.nocreate = true; o.nocreate = true;
o = s.option(form.Flag, 'ndpi', _('Enable ndpi'));
o.default = o.enabled;
o = s.option(form.Value, 'note', _('Note')); o = s.option(form.Value, 'note', _('Note'));
o.rmempty = true; o.rmempty = true;

13
luci-app-omr-bypass/root/etc/init.d/omr-bypass
View file

@ -341,6 +341,7 @@ _bypass_proto() {
config_get proto $1 proto config_get proto $1 proto
config_get intf $1 interface config_get intf $1 interface
config_get enabled $1 enabled config_get enabled $1 enabled
config_get ndpi $1 ndpi
[ "$enabled" = "0" ] && return [ "$enabled" = "0" ] && return
intf=$(echo $intf | sed -e 's/\./_/') intf=$(echo $intf | sed -e 's/\./_/')
[ -n "$intf" ] && [ -z "$(ipset --list | grep omr_dst_bypass_$intf)" ] && return [ -n "$intf" ] && [ -z "$(ipset --list | grep omr_dst_bypass_$intf)" ] && return
@ -348,7 +349,7 @@ _bypass_proto() {
[ -z "$intf" ] && intf="all" [ -z "$intf" ] && intf="all"
[ -z "$proto" ] && return [ -z "$proto" ] && return
if [ "$(uci -q get openmptcprouter.settings.ndpi)" != "0" ]; then if [ "$(uci -q get openmptcprouter.settings.ndpi)" != "0" ] && [ "$ndpi" != "0" ]; then
if [ "$intf" = "all" ]; then if [ "$intf" = "all" ]; then
iptables-restore -w --wait=60 --noflush <<-EOF iptables-restore -w --wait=60 --noflush <<-EOF
*mangle *mangle
@ -802,9 +803,8 @@ start_service() {
iptables-restore -w --wait=60 --noflush <<-EOF iptables-restore -w --wait=60 --noflush <<-EOF
*mangle *mangle
:omr-bypass-dpi - :omr-bypass-dpi -
-A PREROUTING -m addrtype ! --dst-type LOCAL -j omr-bypass-dpi -A INPUT -m addrtype ! --dst-type LOCAL -j omr-bypass-dpi
-A OUTPUT -m addrtype ! --dst-type LOCAL -j omr-bypass-dpi -A FORWARD -m addrtype ! --dst-type LOCAL -j omr-bypass-dpi
-A POSTROUTING -m addrtype --dst-type LOCAL -j omr-bypass-dpi
COMMIT COMMIT
EOF EOF
if [ "$disableipv6" = "0" ]; then if [ "$disableipv6" = "0" ]; then
@ -812,9 +812,8 @@ start_service() {
ip6tables-restore -w --wait=60 --noflush <<-EOF ip6tables-restore -w --wait=60 --noflush <<-EOF
*mangle *mangle
:omr-bypass6-dpi - :omr-bypass6-dpi -
-A PREROUTING -m addrtype ! --dst-type LOCAL -j omr-bypass6-dpi -A INPUT -m addrtype ! --dst-type LOCAL -j omr-bypass6-dpi
-A OUTPUT -m addrtype ! --dst-type LOCAL -j omr-bypass6-dpi -A FORWARD -m addrtype ! --dst-type LOCAL -j omr-bypass6-dpi
-A POSTROUTING -m addrtype --dst-type LOCAL -j omr-bypass6-dpi
COMMIT COMMIT
EOF EOF
fi fi