diff options
Diffstat (limited to 'utils/tor_ip_addresses_download.sh')
| -rwxr-xr-x | utils/tor_ip_addresses_download.sh | 7 |
1 files changed, 5 insertions, 2 deletions
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" |