diff options
| author | Ivan Nardi <12729895+IvanNardi@users.noreply.github.com> | 2023-11-21 08:28:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-21 08:28:32 +0100 |
| commit | 55664392a9661a3061bc0e1325e354863946814d (patch) | |
| tree | c1e2391c6360b02b257c0225b58b354032dab433 /utils/mullvad_ip_addresses_download.sh | |
| parent | 8d71998670cb83e9f14a41508fdd49db6d1f2afd (diff) | |
Ip address list: aggregate Mullvad and Tor lists too (#2154)
Missing from bdb73db1a
See #2150
Diffstat (limited to 'utils/mullvad_ip_addresses_download.sh')
| -rwxr-xr-x | utils/mullvad_ip_addresses_download.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/utils/mullvad_ip_addresses_download.sh b/utils/mullvad_ip_addresses_download.sh index ec7597acc..941f50a27 100755 --- a/utils/mullvad_ip_addresses_download.sh +++ b/utils/mullvad_ip_addresses_download.sh @@ -9,6 +9,8 @@ DEST=../src/lib/inc_generated/ndpi_mullvad_match.c.inc TMP=/tmp/mullvad.json LIST=/tmp/mullvad.list LIST6=/tmp/mullvad.list6 +LIST_MERGED=/tmp/mullvad.list_m +LIST6_MERGED=/tmp/mullvad.list6_m ORIGIN=https://api-www.mullvad.net/www/relays/all/ @@ -20,12 +22,16 @@ is_file_empty "${TMP}" echo "(2) Processing IP addresses..." jq -r '.[].ipv4_addr_in' $TMP > $LIST is_file_empty "${LIST}" +./mergeipaddrlist.py $LIST > $LIST_MERGED +is_file_empty "${LIST_MERGED}" jq -r '.[].ipv6_addr_in | select( . != null )' $TMP > $LIST6 is_file_empty "${LIST6}" -./ipaddr2list.py $LIST NDPI_PROTOCOL_MULLVAD $LIST6 > $DEST +./mergeipaddrlist.py $LIST6 > $LIST6_MERGED +is_file_empty "${LIST6_MERGED}" +./ipaddr2list.py $LIST_MERGED NDPI_PROTOCOL_MULLVAD $LIST6_MERGED > $DEST is_file_empty "${DEST}" -rm -f $TMP $LIST $LIST6 +rm -f $TMP $LIST $LIST6 $LIST_MERGED $LIST6_MERGED echo "(3) Mullvad IPs are available in $DEST" exit 0 |