From 6217e840742a49aeba458b356ef338a176d12dbf Mon Sep 17 00:00:00 2001
From: bol-van <none@none.none>
Date: Wed, 14 Dec 2022 13:35:59 +0300
Subject: [PATCH] ipset: optimize get_reestr_preresolved

---
 ipset/get_reestr_preresolved.sh       | 48 +++++++++++----------------
 ipset/get_reestr_preresolved_smart.sh | 48 +++++++++++----------------
 2 files changed, 40 insertions(+), 56 deletions(-)

diff --git a/ipset/get_reestr_preresolved.sh b/ipset/get_reestr_preresolved.sh
index 663da04..f4a0af3 100755
--- a/ipset/get_reestr_preresolved.sh
+++ b/ipset/get_reestr_preresolved.sh
@@ -11,35 +11,27 @@ URL4="http://list.nethub.fi/reestr_resolved4.txt"
 URL6="http://list.nethub.fi/reestr_resolved6.txt"
 
 
+dl()
+{
+  # $1 - url
+  # $2 - file
+  curl -vH "Accept-Encoding: gzip" -k --fail --max-time 180 --connect-timeout 10 --retry 4 --max-filesize 33554432 "$1" | gunzip - >"$TMPLIST" ||
+  {
+   echo list download failed : $1
+   exit 2
+  }
+  dlsize=$(LANG=C wc -c "$TMPLIST" | xargs | cut -f 1 -d ' ')
+  if test $dlsize -lt 32768; then
+   echo list is too small : $dlsize bytes. can be bad.
+   exit 2
+  fi
+  zz "$2" <"$TMPLIST"
+  rm -f "$TMPLIST"
+}
+
 getuser && {
- [ "$DISABLE_IPV4" != "1" ] && {
-  curl -vH "Accept-Encoding: gzip" -k --fail --max-time 180 --connect-timeout 10 --retry 4 --max-filesize 33554432 "$URL4" | gunzip - >"$TMPLIST" ||
-  {
-   echo ipv4 list download failed
-   exit 2
-  }
-  dlsize=$(LANG=C wc -c "$TMPLIST" | xargs | cut -f 1 -d ' ')
-  if test $dlsize -lt 32768; then
-   echo list is too small. can be bad.
-   exit 2
-  fi
-  zz "$ZIPLIST" <"$TMPLIST"
-  rm -f "$TMPLIST"
- }
- [ "$DISABLE_IPV6" != "1" ] && {
-  curl -H "Accept-Encoding: gzip" -k --fail --max-time 180 --connect-timeout 10 --retry 4 --max-filesize 33554432 "$URL6" | gunzip - >"$TMPLIST" ||
-  {
-   echo ipv4 list download failed
-   exit 2
-  }
-  dlsize=$(LANG=C wc -c "$TMPLIST" | xargs | cut -f 1 -d ' ')
-  if test $dlsize -lt 32768; then
-   echo list is too small. can be bad.
-   exit 2
-  fi
-  zz "$ZIPLIST6" <"$TMPLIST"
-  rm -f "$TMPLIST"
- }
+ [ "$DISABLE_IPV4" != "1" ] && dl "$URL4" "$ZIPLIST"
+ [ "$DISABLE_IPV6" != "1" ] && dl "$URL6" "$ZIPLIST6"
 }
 
 "$IPSET_DIR/create_ipset.sh"
diff --git a/ipset/get_reestr_preresolved_smart.sh b/ipset/get_reestr_preresolved_smart.sh
index 7287fdc..d2eb757 100755
--- a/ipset/get_reestr_preresolved_smart.sh
+++ b/ipset/get_reestr_preresolved_smart.sh
@@ -11,35 +11,27 @@ URL4="http://list.nethub.fi/reestr_smart4.txt"
 URL6="http://list.nethub.fi/reestr_smart6.txt"
 
 
+dl()
+{
+  # $1 - url
+  # $2 - file
+  curl -vH "Accept-Encoding: gzip" -k --fail --max-time 180 --connect-timeout 10 --retry 4 --max-filesize 33554432 "$1" | gunzip - >"$TMPLIST" ||
+  {
+   echo list download failed : $1
+   exit 2
+  }
+  dlsize=$(LANG=C wc -c "$TMPLIST" | xargs | cut -f 1 -d ' ')
+  if test $dlsize -lt 32768; then
+   echo list is too small : $dlsize bytes. can be bad.
+   exit 2
+  fi
+  zz "$2" <"$TMPLIST"
+  rm -f "$TMPLIST"
+}
+
 getuser && {
- [ "$DISABLE_IPV4" != "1" ] && {
-  curl -vH "Accept-Encoding: gzip" -k --fail --max-time 180 --connect-timeout 10 --retry 4 --max-filesize 33554432 "$URL4" | gunzip - >"$TMPLIST" ||
-  {
-   echo ipv4 list download failed
-   exit 2
-  }
-  dlsize=$(LANG=C wc -c "$TMPLIST" | xargs | cut -f 1 -d ' ')
-  if test $dlsize -lt 32768; then
-   echo list is too small. can be bad.
-   exit 2
-  fi
-  zz "$ZIPLIST" <"$TMPLIST"
-  rm -f "$TMPLIST"
- }
- [ "$DISABLE_IPV6" != "1" ] && {
-  curl -H "Accept-Encoding: gzip" -k --fail --max-time 180 --connect-timeout 10 --retry 4 --max-filesize 33554432 "$URL6" | gunzip - >"$TMPLIST" ||
-  {
-   echo ipv4 list download failed
-   exit 2
-  }
-  dlsize=$(LANG=C wc -c "$TMPLIST" | xargs | cut -f 1 -d ' ')
-  if test $dlsize -lt 32768; then
-   echo list is too small. can be bad.
-   exit 2
-  fi
-  zz "$ZIPLIST6" <"$TMPLIST"
-  rm -f "$TMPLIST"
- }
+ [ "$DISABLE_IPV4" != "1" ] && dl "$URL4" "$ZIPLIST"
+ [ "$DISABLE_IPV6" != "1" ] && dl "$URL6" "$ZIPLIST6"
 }
 
 "$IPSET_DIR/create_ipset.sh"