diff options
Diffstat (limited to 'utils/aws_ip_addresses_download.sh')
| -rwxr-xr-x | utils/aws_ip_addresses_download.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/utils/aws_ip_addresses_download.sh b/utils/aws_ip_addresses_download.sh index 04a6a790d..f413e8c6f 100755 --- a/utils/aws_ip_addresses_download.sh +++ b/utils/aws_ip_addresses_download.sh @@ -9,6 +9,8 @@ DEST=../src/lib/inc_generated/ndpi_amazon_aws_match.c.inc TMP=/tmp/aws.json LIST=/tmp/aws.list LIST6=/tmp/aws.list6 +LIST_MERGED=/tmp/aws.list_m +LIST6_MERGED=/tmp/aws.list6_m ORIGIN=https://ip-ranges.amazonaws.com/ip-ranges.json @@ -20,12 +22,16 @@ is_file_empty "${TMP}" echo "(2) Processing IP addresses..." jq -r '.prefixes | .[].ip_prefix' $TMP > $LIST is_file_empty "${LIST}" +./mergeipaddrlist.py $LIST > $LIST_MERGED +is_file_empty "${LIST_MERGED}" jq -r '.ipv6_prefixes | .[].ipv6_prefix' $TMP > $LIST6 is_file_empty "${LIST6}" -./ipaddr2list.py $LIST NDPI_PROTOCOL_AMAZON_AWS $LIST6 > $DEST +./mergeipaddrlist.py $LIST6 > $LIST6_MERGED +is_file_empty "${LIST6_MERGED}" +./ipaddr2list.py $LIST_MERGED NDPI_PROTOCOL_AMAZON_AWS $LIST6_MERGED > $DEST is_file_empty "${DEST}" -rm -f $TMP $LIST $LIST6 +rm -f ${TMP} ${LIST} ${LIST6} ${LIST_MERGED} ${LIST_MERGED6} echo "(3) Amazon AWS IPs are available in $DEST" exit 0 |