ForkMaster/zapret
1
0
Fork 0
mirror of https://github.com/bol-van/zapret.git synced 2024-11-11 17:29:16 +05:00
Code Issues Actions Packages Projects Releases Wiki Activity

ipset: optimize get_reestr_preresolved

Browse Source
This commit is contained in:
bol-van 2022-12-14 13:35:59 +03:00
parent 6edd8232c0
commit 6217e84074
2 changed files with 40 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
ipset/get_reestr_preresolved.sh
View File

@ -11,35 +11,27 @@ URL4="http://list.nethub.fi/reestr_resolved4.txt"
URL6="http://list.nethub.fi/reestr_resolved6.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 && { getuser && {
[ "$DISABLE_IPV4" != "1" ] && { [ "$DISABLE_IPV4" != "1" ] && dl "$URL4" "$ZIPLIST"
curl -vH "Accept-Encoding: gzip" -k --fail --max-time 180 --connect-timeout 10 --retry 4 --max-filesize 33554432 "$URL4" | gunzip - >"$TMPLIST" || [ "$DISABLE_IPV6" != "1" ] && dl "$URL6" "$ZIPLIST6"
{
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"
}
} }
"$IPSET_DIR/create_ipset.sh" "$IPSET_DIR/create_ipset.sh"

48
ipset/get_reestr_preresolved_smart.sh
View File

@ -11,35 +11,27 @@ URL4="http://list.nethub.fi/reestr_smart4.txt"
URL6="http://list.nethub.fi/reestr_smart6.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 && { getuser && {
[ "$DISABLE_IPV4" != "1" ] && { [ "$DISABLE_IPV4" != "1" ] && dl "$URL4" "$ZIPLIST"
curl -vH "Accept-Encoding: gzip" -k --fail --max-time 180 --connect-timeout 10 --retry 4 --max-filesize 33554432 "$URL4" | gunzip - >"$TMPLIST" || [ "$DISABLE_IPV6" != "1" ] && dl "$URL6" "$ZIPLIST6"
{
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"
}
} }
"$IPSET_DIR/create_ipset.sh" "$IPSET_DIR/create_ipset.sh"