From 033a650f4bf8720d605ecbaa877178e6e66055db Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Tue, 31 Aug 2021 01:06:25 +0200 Subject: [PATCH] fix: parsing other tableentries than unicast; bump version Signed-off-by: Blackyfff --- usr/lib/ffdns/update-dns.sh | 2 +- usr/lib/ffdns/update-public-acl.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/usr/lib/ffdns/update-dns.sh b/usr/lib/ffdns/update-dns.sh index 96d4964..5fc2fa2 100755 --- a/usr/lib/ffdns/update-dns.sh +++ b/usr/lib/ffdns/update-dns.sh @@ -8,7 +8,7 @@ # exit script when command fails set -e -export DNSSCRIPT_VERSION="0.8.4" +export DNSSCRIPT_VERSION="0.9.0" . /etc/ffdns/community.conf . /etc/ffdns/local.conf diff --git a/usr/lib/ffdns/update-public-acl.sh b/usr/lib/ffdns/update-public-acl.sh index c825183..5ae4b8a 100755 --- a/usr/lib/ffdns/update-public-acl.sh +++ b/usr/lib/ffdns/update-public-acl.sh @@ -23,17 +23,17 @@ else Installed4Routes="" Installed6Routes="" for Table in $Tables; do - Installed4Routes="$(echo "$Installed4Routes" && ip -4 ro sh ta "$Table")" - Installed6Routes="$(echo "$Installed6Routes" && ip -6 ro sh ta "$Table")" + Installed4Routes="$(echo "$Installed4Routes" && ip -d -4 ro sh ta "$Table")" + Installed6Routes="$(echo "$Installed6Routes" && ip -d -6 ro sh ta "$Table")" done PublicSubs="$(echo "$Installed6Routes" | \ - sed -e '/^default from/!d;s/.* from \(\S\+\).*/\1/g')" + sed -e '/^unicast default from/!d;s/.* from \(\S\+\).*/\1/g')" Privatev4Prefix="\(192\.168\.\|172\.\(1[6-9]\|2[0-9]\|3[01]\)\.\|10\.\)" Privatev6Prefix="\([fF][cCdD][0-9a-fA-F]\{2\}:\)" Publicv4Singles="$(echo "$Installed4Routes" | \ - sed -e 's/^\(\S\+\)\s.*/\t\1;/g;/^\t'"$Privatev4Prefix"'\|^\t\(unreachable\|default\|0\.\)\|^$/d')" + sed -e 's/^\S\+\s\+\(\S\+\)\s.*/\t\1;/g;/^\t'"$Privatev4Prefix"'\|^\t\(unreachable\|default\|0\.\)\|^$/d')" Publicv6Singles="$(echo "$Installed6Routes" | \ - sed -e 's/^\(\S\+\)\s.*/\1/g;/^'"$Privatev6Prefix"'\|^\(unreachable\|default\|::\|64:ff9b::\)\|^$/d')" + sed -e 's/^\S\+\s\+\(\S\+\)\s.*/\1/g;/^'"$Privatev6Prefix"'\|^\(unreachable\|default\|::\|64:ff9b::\)\|^$/d')" # the following code is not well optimized yet and may take a bit to process # therefore it is not recommended to activate it on hardware-routers