From 55664392a9661a3061bc0e1325e354863946814d Mon Sep 17 00:00:00 2001
From: Ivan Nardi <12729895+IvanNardi@users.noreply.github.com>
Date: Tue, 21 Nov 2023 08:28:32 +0100
Subject: Ip address list: aggregate Mullvad and Tor lists too (#2154)

Missing from bdb73db1a
See #2150
---
 utils/tor_ip_addresses_download.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'utils/tor_ip_addresses_download.sh')

diff --git a/utils/tor_ip_addresses_download.sh b/utils/tor_ip_addresses_download.sh
index 602556a4e..cfdba68e2 100755
--- a/utils/tor_ip_addresses_download.sh
+++ b/utils/tor_ip_addresses_download.sh
@@ -7,6 +7,7 @@ cd "$(dirname "${0}")" || exit 1
 
 DEST=../src/lib/inc_generated/ndpi_tor_match.c.inc
 LIST=/tmp/tor.list
+LIST_MERGED=/tmp/tor.list_m
 # There are at least two lists:
 #  * https://torstatus.rueckgr.at/ip_list_all.php/Tor_ip_list_ALL.csv
 #  * https://check.torproject.org/torbulkexitlist
@@ -18,12 +19,14 @@ echo "(1) Downloading file... ${ORIGIN}"
 http_response=$(curl -s -o $LIST -w "%{http_code}" ${ORIGIN})
 check_http_response "${http_response}"
 is_file_empty "${LIST}"
+./mergeipaddrlist.py $LIST > $LIST_MERGED
+is_file_empty "${LIST_MERGED}"
 
 #TODO: TOR relays don't support ipv6 yet
 
 echo "(2) Processing IP addresses..."
-./ipaddr2list.py $LIST NDPI_PROTOCOL_TOR > $DEST
-rm -f "${LIST}"
+./ipaddr2list.py $LIST_MERGED NDPI_PROTOCOL_TOR > $DEST
+rm -f "${LIST}" "${LIST_MERGED}"
 is_file_empty "${DEST}"
 
 echo "(3) TOR IPs are available in $DEST"
-- 
cgit v1.2.3