From c22707f48a497cd12c131cf7883aa0b7297dfde5 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Mon, 3 Aug 2020 19:10:12 +0200 Subject: [PATCH] Remove duplicate in protocol list of omr-bypass --- .../htdocs/luci-static/resources/view/services/omr-bypass.js | 4 ++-- luci-app-omr-bypass/root/etc/init.d/omr-bypass | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/luci-app-omr-bypass/htdocs/luci-static/resources/view/services/omr-bypass.js b/luci-app-omr-bypass/htdocs/luci-static/resources/view/services/omr-bypass.js index 2a4053353..72b2a05ec 100644 --- a/luci-app-omr-bypass/htdocs/luci-static/resources/view/services/omr-bypass.js +++ b/luci-app-omr-bypass/htdocs/luci-static/resources/view/services/omr-bypass.js @@ -183,9 +183,9 @@ return L.view.extend({ for (var i = 0; i < host.length; i++) { var m = host[i].split(/:/); if (m && m[0] != "#Proto") - name.push(m[0]); + name.push(m[0].toLowerCase()); } - name = Array.from(new Set(name)).sort(function (a, b) { return a.toLowerCase().localeCompare(b.toLowerCase()); }); + name = Array.from(new Set(name)).sort(function (a, b) { return a.toLowerCase().localeCompare(b.toLowerCase())}).reduce(function(a, b){ if (a.slice(-1)[0] !== b) a.push(b);return a;},[]); for (var i = 0; i < name.length; i++) { this.value(name[i]); } diff --git a/luci-app-omr-bypass/root/etc/init.d/omr-bypass b/luci-app-omr-bypass/root/etc/init.d/omr-bypass index 25cab7f31..064d4fd1f 100755 --- a/luci-app-omr-bypass/root/etc/init.d/omr-bypass +++ b/luci-app-omr-bypass/root/etc/init.d/omr-bypass @@ -277,7 +277,7 @@ _bypass_proto() { fi # Use dnsmasq ipset to bypass domains of the proto local domains - domains="$(cat /proc/net/xt_ndpi/host_proto | grep $proto: | sed -e "s/$proto://" -e 's/*//' -e 's/,/ /g')" + domains="$(cat /proc/net/xt_ndpi/host_proto | grep -i $proto: | sed -e "s/$proto://" -e 's/*//' -e 's/,/ /g')" if [ -n "$domains" ]; then for domain in $domains; do if [ -n "$domain" ] && [ "$(uci -q show omr-bypass | grep $domain)" = "" ]; then