diff options
| author | Ivan Nardi <12729895+IvanNardi@users.noreply.github.com> | 2023-11-17 12:26:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-17 12:26:23 +0100 |
| commit | bdb73db1a49d271bfb958eaabcce489013d84f3c (patch) | |
| tree | ccc307b0defcda97bacd2620340dc9d645421b08 /utils/azure_ip_addresses_download.sh | |
| parent | 6c9571d9a92b8c71bd7b8a565f062a49bd7d4d49 (diff) | |
IP lists: aggregate addresses wherever possible (#2152)
See #2150
Diffstat (limited to 'utils/azure_ip_addresses_download.sh')
| -rwxr-xr-x | utils/azure_ip_addresses_download.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/utils/azure_ip_addresses_download.sh b/utils/azure_ip_addresses_download.sh index 4aada03ee..243e11fd3 100755 --- a/utils/azure_ip_addresses_download.sh +++ b/utils/azure_ip_addresses_download.sh @@ -10,6 +10,8 @@ LINK_TMP=/tmp/azure_link.txt TMP=/tmp/azure.json LIST=/tmp/azure.list LIST6=/tmp/azure.list6 +LIST_MERGED=/tmp/azure.list_m +LIST6_MERGED=/tmp/azure.list6_m # https://www.microsoft.com/en-us/download/confirmation.aspx?id=56519 # Azure links have the format https://download.microsoft.com/download/7/1/D/71D86715-5596-4529-9B13-DA13A5DE5B63/ServiceTags_Public_<date>.json LINK_ORIGIN="https://www.microsoft.com/en-us/download/confirmation.aspx?id=56519" @@ -31,12 +33,16 @@ is_file_empty "${TMP}" echo "(3) Processing IP addresses..." tr -d '\r' < $TMP | grep / | tr -d '"' | tr -d " " | tr -d "," | grep -v : > $LIST is_file_empty "${LIST}" +./mergeipaddrlist.py $LIST > $LIST_MERGED +is_file_empty "${LIST_MERGED}" tr -d '\r' < $TMP | grep / | tr -d '"' | tr -d " " | tr -d "," | grep : > $LIST6 is_file_empty "${LIST6}" -./ipaddr2list.py $LIST NDPI_PROTOCOL_MICROSOFT_AZURE $LIST6 > $DEST +./mergeipaddrlist.py $LIST6 > $LIST6_MERGED +is_file_empty "${LIST6_MERGED}" +./ipaddr2list.py $LIST_MERGED NDPI_PROTOCOL_MICROSOFT_AZURE $LIST6_MERGED > $DEST is_file_empty "${DEST}" -rm -f $TMP $LIST $LIST6 +rm -f ${TMP} ${LIST} ${LIST6} ${LIST_MERGED} ${LIST_MERGED6} echo "(4) Microsoft Azure IPs are available in $DEST" exit 0 |