optimize script ipv6 condition

no more forking a sed process
h0tw1r3 · Apr 22, 2024 · 8185b9f · 8185b9f
1 parent 2ffaf95
commit 8185b9f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 16 deletions.
diff --git a/scripts/shield-trigger b/scripts/shield-trigger
@@ -27,12 +27,9 @@ null_route() {
  # louzy detection of IPv4 or IPv6 address
  #
  TASK="$1"
- INET=$(echo "$2" | sed 's/[0-9\.]//g')
- if [ -z "$INET" ]
- then
- INET=""
- GW="127.0.0.1"
- else
+ INET=""
+ GW="127.0.0.1"
+ if [ "${2#*:}" != "$2" ] ; then
  INET="-f inet6"
  GW="::1"
  fi

diff --git a/scripts/shield-trigger-iptables b/scripts/shield-trigger-iptables
@@ -22,16 +22,8 @@
 #
 
 run_iptables() {
- #
- # louzy detection of IPv4 or IPv6 address
- #
- IPT=$(echo "$2" | sed 's/[0-9\.]//g')
- if [ -z "$IPT" ]
- then
- IPT=iptables
- else
- IPT=ip6tables
- fi
+ IPT="iptables"
+ [ "${2#*:}" != "$2" ] && IPT="ip6tables"
 
 # switch -A for iptables to -I
 if [ "$1" = "-A" ]