diff options
35 files changed, 43 insertions, 43 deletions
diff --git a/src/lib/ndpi_amazon_aws_match.c.inc b/src/lib/inc_generated/ndpi_amazon_aws_match.c.inc index b0834c917..b0834c917 100644 --- a/src/lib/ndpi_amazon_aws_match.c.inc +++ b/src/lib/inc_generated/ndpi_amazon_aws_match.c.inc diff --git a/src/lib/ndpi_asn_apple.c.inc b/src/lib/inc_generated/ndpi_asn_apple.c.inc index 80adb10eb..80adb10eb 100644 --- a/src/lib/ndpi_asn_apple.c.inc +++ b/src/lib/inc_generated/ndpi_asn_apple.c.inc diff --git a/src/lib/ndpi_asn_facebook.c.inc b/src/lib/inc_generated/ndpi_asn_facebook.c.inc index d5719fcb3..d5719fcb3 100644 --- a/src/lib/ndpi_asn_facebook.c.inc +++ b/src/lib/inc_generated/ndpi_asn_facebook.c.inc diff --git a/src/lib/ndpi_asn_netflix.c.inc b/src/lib/inc_generated/ndpi_asn_netflix.c.inc index d68b994f4..d68b994f4 100644 --- a/src/lib/ndpi_asn_netflix.c.inc +++ b/src/lib/inc_generated/ndpi_asn_netflix.c.inc diff --git a/src/lib/ndpi_asn_teamviewer.c.inc b/src/lib/inc_generated/ndpi_asn_teamviewer.c.inc index 630619413..630619413 100644 --- a/src/lib/ndpi_asn_teamviewer.c.inc +++ b/src/lib/inc_generated/ndpi_asn_teamviewer.c.inc diff --git a/src/lib/ndpi_asn_telegram.c.inc b/src/lib/inc_generated/ndpi_asn_telegram.c.inc index ed375805e..ed375805e 100644 --- a/src/lib/ndpi_asn_telegram.c.inc +++ b/src/lib/inc_generated/ndpi_asn_telegram.c.inc diff --git a/src/lib/ndpi_asn_twitter.c.inc b/src/lib/inc_generated/ndpi_asn_twitter.c.inc index c0b5c6222..c0b5c6222 100644 --- a/src/lib/ndpi_asn_twitter.c.inc +++ b/src/lib/inc_generated/ndpi_asn_twitter.c.inc diff --git a/src/lib/ndpi_asn_webex.c.inc b/src/lib/inc_generated/ndpi_asn_webex.c.inc index 0f947c011..0f947c011 100644 --- a/src/lib/ndpi_asn_webex.c.inc +++ b/src/lib/inc_generated/ndpi_asn_webex.c.inc diff --git a/src/lib/ndpi_azure_match.c.inc b/src/lib/inc_generated/ndpi_azure_match.c.inc index 08b76e6d0..08b76e6d0 100644 --- a/src/lib/ndpi_azure_match.c.inc +++ b/src/lib/inc_generated/ndpi_azure_match.c.inc diff --git a/src/lib/ndpi_cloudflare_match.c.inc b/src/lib/inc_generated/ndpi_cloudflare_match.c.inc index 2687accb9..2687accb9 100644 --- a/src/lib/ndpi_cloudflare_match.c.inc +++ b/src/lib/inc_generated/ndpi_cloudflare_match.c.inc diff --git a/src/lib/ndpi_dga_match.c.inc b/src/lib/inc_generated/ndpi_dga_match.c.inc index 0f434672a..0f434672a 100644 --- a/src/lib/ndpi_dga_match.c.inc +++ b/src/lib/inc_generated/ndpi_dga_match.c.inc diff --git a/src/lib/ndpi_ethereum_match.c.inc b/src/lib/inc_generated/ndpi_ethereum_match.c.inc index 7b6143e7b..7b6143e7b 100644 --- a/src/lib/ndpi_ethereum_match.c.inc +++ b/src/lib/inc_generated/ndpi_ethereum_match.c.inc diff --git a/src/lib/ndpi_google_cloud_match.c.inc b/src/lib/inc_generated/ndpi_google_cloud_match.c.inc index 83efedc55..83efedc55 100644 --- a/src/lib/ndpi_google_cloud_match.c.inc +++ b/src/lib/inc_generated/ndpi_google_cloud_match.c.inc diff --git a/src/lib/ndpi_google_match.c.inc b/src/lib/inc_generated/ndpi_google_match.c.inc index c93c140b8..c93c140b8 100644 --- a/src/lib/ndpi_google_match.c.inc +++ b/src/lib/inc_generated/ndpi_google_match.c.inc diff --git a/src/lib/ndpi_icloud_private_relay_match.c.inc b/src/lib/inc_generated/ndpi_icloud_private_relay_match.c.inc index c3dd6ec15..c3dd6ec15 100644 --- a/src/lib/ndpi_icloud_private_relay_match.c.inc +++ b/src/lib/inc_generated/ndpi_icloud_private_relay_match.c.inc diff --git a/src/lib/ndpi_ms_office365_match.c.inc b/src/lib/inc_generated/ndpi_ms_office365_match.c.inc index 31bc24963..31bc24963 100644 --- a/src/lib/ndpi_ms_office365_match.c.inc +++ b/src/lib/inc_generated/ndpi_ms_office365_match.c.inc diff --git a/src/lib/ndpi_ms_onedrive_match.c.inc b/src/lib/inc_generated/ndpi_ms_onedrive_match.c.inc index 2c15e4f3f..2c15e4f3f 100644 --- a/src/lib/ndpi_ms_onedrive_match.c.inc +++ b/src/lib/inc_generated/ndpi_ms_onedrive_match.c.inc diff --git a/src/lib/ndpi_ms_outlook_match.c.inc b/src/lib/inc_generated/ndpi_ms_outlook_match.c.inc index 184a799f9..184a799f9 100644 --- a/src/lib/ndpi_ms_outlook_match.c.inc +++ b/src/lib/inc_generated/ndpi_ms_outlook_match.c.inc diff --git a/src/lib/ndpi_ms_skype_teams_match.c.inc b/src/lib/inc_generated/ndpi_ms_skype_teams_match.c.inc index 2fff0d721..2fff0d721 100644 --- a/src/lib/ndpi_ms_skype_teams_match.c.inc +++ b/src/lib/inc_generated/ndpi_ms_skype_teams_match.c.inc diff --git a/src/lib/ndpi_tor_match.c.inc b/src/lib/inc_generated/ndpi_tor_match.c.inc index d882c9e95..d882c9e95 100644 --- a/src/lib/ndpi_tor_match.c.inc +++ b/src/lib/inc_generated/ndpi_tor_match.c.inc diff --git a/src/lib/ndpi_whatsapp_match.c.inc b/src/lib/inc_generated/ndpi_whatsapp_match.c.inc index 4b5651f13..4b5651f13 100644 --- a/src/lib/ndpi_whatsapp_match.c.inc +++ b/src/lib/inc_generated/ndpi_whatsapp_match.c.inc diff --git a/src/lib/ndpi_zoom_match.c.inc b/src/lib/inc_generated/ndpi_zoom_match.c.inc index 0964dca1f..0964dca1f 100644 --- a/src/lib/ndpi_zoom_match.c.inc +++ b/src/lib/inc_generated/ndpi_zoom_match.c.inc diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 89b39d205..82b6c60c2 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -48,28 +48,28 @@ #endif #include "ndpi_content_match.c.inc" -#include "ndpi_dga_match.c.inc" -#include "ndpi_azure_match.c.inc" -#include "ndpi_tor_match.c.inc" -#include "ndpi_whatsapp_match.c.inc" -#include "ndpi_amazon_aws_match.c.inc" -#include "ndpi_ethereum_match.c.inc" -#include "ndpi_zoom_match.c.inc" -#include "ndpi_cloudflare_match.c.inc" -#include "ndpi_ms_office365_match.c.inc" -#include "ndpi_ms_onedrive_match.c.inc" -#include "ndpi_ms_outlook_match.c.inc" -#include "ndpi_ms_skype_teams_match.c.inc" -#include "ndpi_google_match.c.inc" -#include "ndpi_google_cloud_match.c.inc" -#include "ndpi_icloud_private_relay_match.c.inc" -#include "ndpi_asn_telegram.c.inc" -#include "ndpi_asn_apple.c.inc" -#include "ndpi_asn_twitter.c.inc" -#include "ndpi_asn_netflix.c.inc" -#include "ndpi_asn_webex.c.inc" -#include "ndpi_asn_teamviewer.c.inc" -#include "ndpi_asn_facebook.c.inc" +#include "inc_generated/ndpi_dga_match.c.inc" +#include "inc_generated/ndpi_azure_match.c.inc" +#include "inc_generated/ndpi_tor_match.c.inc" +#include "inc_generated/ndpi_whatsapp_match.c.inc" +#include "inc_generated/ndpi_amazon_aws_match.c.inc" +#include "inc_generated/ndpi_ethereum_match.c.inc" +#include "inc_generated/ndpi_zoom_match.c.inc" +#include "inc_generated/ndpi_cloudflare_match.c.inc" +#include "inc_generated/ndpi_ms_office365_match.c.inc" +#include "inc_generated/ndpi_ms_onedrive_match.c.inc" +#include "inc_generated/ndpi_ms_outlook_match.c.inc" +#include "inc_generated/ndpi_ms_skype_teams_match.c.inc" +#include "inc_generated/ndpi_google_match.c.inc" +#include "inc_generated/ndpi_google_cloud_match.c.inc" +#include "inc_generated/ndpi_icloud_private_relay_match.c.inc" +#include "inc_generated/ndpi_asn_telegram.c.inc" +#include "inc_generated/ndpi_asn_apple.c.inc" +#include "inc_generated/ndpi_asn_twitter.c.inc" +#include "inc_generated/ndpi_asn_netflix.c.inc" +#include "inc_generated/ndpi_asn_webex.c.inc" +#include "inc_generated/ndpi_asn_teamviewer.c.inc" +#include "inc_generated/ndpi_asn_facebook.c.inc" /* Third party libraries */ #include "third_party/include/ndpi_patricia.h" diff --git a/utils/asn_update.sh b/utils/asn_update.sh index a023b2468..c104adc9b 100755 --- a/utils/asn_update.sh +++ b/utils/asn_update.sh @@ -25,36 +25,36 @@ function create_list() { cd "$(dirname "${0}")" || return echo "(1) Downloading Apple routes..." -DEST="../src/lib/ndpi_asn_apple.c.inc" +DEST="../src/lib/inc_generated/ndpi_asn_apple.c.inc" create_list NDPI_PROTOCOL_APPLE $DEST "AS714" "AS6185" "AS2709" echo "(3) Apple IPs are available in $DEST" echo "(1) Downloading Facebook routes..." -DEST=../src/lib/ndpi_asn_facebook.c.inc +DEST=../src/lib/inc_generated/ndpi_asn_facebook.c.inc create_list NDPI_PROTOCOL_FACEBOOK $DEST "AS63293" "AS54115" "AS34825" "AS32934" echo "(3) Facebook IPs are available in $DEST" echo "(1) Downloading Netflix routes..." -DEST=../src/lib/ndpi_asn_netflix.c.inc +DEST=../src/lib/inc_generated/ndpi_asn_netflix.c.inc create_list NDPI_PROTOCOL_NETFLIX $DEST "AS55095" "AS40027" "AS394406" "AS2906" echo "(3) Netflix IPs are available in $DEST" echo "(1) Downloading Teamviewer routes..." -DEST=../src/lib/ndpi_asn_teamviewer.c.inc +DEST=../src/lib/inc_generated/ndpi_asn_teamviewer.c.inc create_list NDPI_PROTOCOL_TEAMVIEWER $DEST "AS43304" "AS212710" "AS208187" "AS208175" echo "(3) Teamviewer IPs are available in $DEST" echo "(1) Downloading Telegram routes..." -DEST=../src/lib/ndpi_asn_telegram.c.inc +DEST=../src/lib/inc_generated/ndpi_asn_telegram.c.inc create_list NDPI_PROTOCOL_TELEGRAM $DEST "AS62041" "AS62014" "AS59930" "AS44907" "AS211157" echo "(3) Telegram IPs are available in $DEST" echo "(1) Downloading Twitter routes..." -DEST=../src/lib/ndpi_asn_twitter.c.inc +DEST=../src/lib/inc_generated/ndpi_asn_twitter.c.inc create_list NDPI_PROTOCOL_TWITTER $DEST "AS63179" "AS54888" "AS35995" "AS13414" echo "(3) Twitter IPs are available in $DEST" echo "(1) Downloading Webex routes..." -DEST=../src/lib/ndpi_asn_webex.c.inc +DEST=../src/lib/inc_generated/ndpi_asn_webex.c.inc create_list NDPI_PROTOCOL_WEBEX $DEST "AS6577" "AS399937" "AS16472" "AS13445" echo "(3) Webex IPs are available in $DEST" diff --git a/utils/aws_ip_addresses_download.sh b/utils/aws_ip_addresses_download.sh index 5c62183b8..ffaaddf6a 100755 --- a/utils/aws_ip_addresses_download.sh +++ b/utils/aws_ip_addresses_download.sh @@ -2,7 +2,7 @@ cd "$(dirname "${0}")" -DEST=../src/lib/ndpi_amazon_aws_match.c.inc +DEST=../src/lib/inc_generated/ndpi_amazon_aws_match.c.inc TMP=/tmp/aws.json LIST=/tmp/aws.list ORIGIN=https://ip-ranges.amazonaws.com/ip-ranges.json diff --git a/utils/azure_ip_addresses_download.sh b/utils/azure_ip_addresses_download.sh index 83ae9bb82..822871b7c 100755 --- a/utils/azure_ip_addresses_download.sh +++ b/utils/azure_ip_addresses_download.sh @@ -2,7 +2,7 @@ cd "$(dirname "${0}")" -DEST=../src/lib/ndpi_azure_match.c.inc +DEST=../src/lib/inc_generated/ndpi_azure_match.c.inc LINK_TMP=/tmp/azure_link.txt TMP=/tmp/azure.json LIST=/tmp/azure.list diff --git a/utils/cloudflare_ip_addresses_download.sh b/utils/cloudflare_ip_addresses_download.sh index 32f4f3567..9327f7b23 100755 --- a/utils/cloudflare_ip_addresses_download.sh +++ b/utils/cloudflare_ip_addresses_download.sh @@ -2,7 +2,7 @@ cd "$(dirname "${0}")" -DEST=../src/lib/ndpi_cloudflare_match.c.inc +DEST=../src/lib/inc_generated/ndpi_cloudflare_match.c.inc LIST=/tmp/cloudflare.list # TODO: ipv6 list from https://www.cloudflare.com/ips-v6 ORIGIN="https://www.cloudflare.com/ips-v4" diff --git a/utils/ethereum_ip_addresses_download.sh b/utils/ethereum_ip_addresses_download.sh index 3497a943f..2e2c62ea2 100755 --- a/utils/ethereum_ip_addresses_download.sh +++ b/utils/ethereum_ip_addresses_download.sh @@ -2,7 +2,7 @@ cd "$(dirname "${0}")" -DEST=../src/lib/ndpi_ethereum_match.c.inc +DEST=../src/lib/inc_generated/ndpi_ethereum_match.c.inc TMP=/tmp/ethereum LIST=/tmp/ethereum.list ORIGIN="https://raw.githubusercontent.com/ethereum/go-ethereum/master/params/bootnodes.go" diff --git a/utils/google_cloud_ip_addresses_download.sh b/utils/google_cloud_ip_addresses_download.sh index 97d399e9f..2f219cb43 100755 --- a/utils/google_cloud_ip_addresses_download.sh +++ b/utils/google_cloud_ip_addresses_download.sh @@ -2,7 +2,7 @@ cd "$(dirname "${0}")" || return -DEST=../src/lib/ndpi_google_cloud_match.c.inc +DEST=../src/lib/inc_generated/ndpi_google_cloud_match.c.inc TMP=/tmp/google_c.json LIST=/tmp/google_c.list ORIGIN="https://www.gstatic.com/ipranges/cloud.json" diff --git a/utils/google_ip_addresses_download.sh b/utils/google_ip_addresses_download.sh index efb8ee043..04b89b81f 100755 --- a/utils/google_ip_addresses_download.sh +++ b/utils/google_ip_addresses_download.sh @@ -4,7 +4,7 @@ set -e cd "$(dirname "${0}")" || return -DEST=../src/lib/ndpi_google_match.c.inc +DEST=../src/lib/inc_generated/ndpi_google_match.c.inc LIST=/tmp/google.list echo "(1) Downloading file..." diff --git a/utils/icloud_private_relay_ip_addresses_download.sh b/utils/icloud_private_relay_ip_addresses_download.sh index 242dd17b9..9b8de3c4c 100755 --- a/utils/icloud_private_relay_ip_addresses_download.sh +++ b/utils/icloud_private_relay_ip_addresses_download.sh @@ -2,7 +2,7 @@ cd "$(dirname "${0}")" || return -DEST=../src/lib/ndpi_icloud_private_relay_match.c.inc +DEST=../src/lib/inc_generated/ndpi_icloud_private_relay_match.c.inc TMP=/tmp/icloud.csv LIST=/tmp/icloud.list LIST_MERGED=/tmp/icloud.list_m diff --git a/utils/microsoft_ip_addresses_download.sh b/utils/microsoft_ip_addresses_download.sh index 29a277480..641372b08 100755 --- a/utils/microsoft_ip_addresses_download.sh +++ b/utils/microsoft_ip_addresses_download.sh @@ -2,10 +2,10 @@ cd "$(dirname "${0}")" -DEST_OUTLOOK=../src/lib/ndpi_ms_outlook_match.c.inc -DEST_SKYPE_MSTEAMS=../src/lib/ndpi_ms_skype_teams_match.c.inc -DEST_ONEDRIVE=../src/lib/ndpi_ms_onedrive_match.c.inc -DEST_OFFICE365=../src/lib/ndpi_ms_office365_match.c.inc +DEST_OUTLOOK=../src/lib/inc_generated/ndpi_ms_outlook_match.c.inc +DEST_SKYPE_MSTEAMS=../src/lib/inc_generated/ndpi_ms_skype_teams_match.c.inc +DEST_ONEDRIVE=../src/lib/inc_generated/ndpi_ms_onedrive_match.c.inc +DEST_OFFICE365=../src/lib/inc_generated/ndpi_ms_office365_match.c.inc TMP=/tmp/ms.json LIST=/tmp/ms.list # https://docs.microsoft.com/en-us/microsoft-365/enterprise/urls-and-ip-address-ranges?view=o365-worldwide diff --git a/utils/tor_ip_addresses_download.sh b/utils/tor_ip_addresses_download.sh index 8598e1151..e0f9fa1ff 100755 --- a/utils/tor_ip_addresses_download.sh +++ b/utils/tor_ip_addresses_download.sh @@ -2,7 +2,7 @@ cd "$(dirname "${0}")" -DEST=../src/lib/ndpi_tor_match.c.inc +DEST=../src/lib/inc_generated/ndpi_tor_match.c.inc LIST=/tmp/tor.list # There are at least two lists: # * https://torstatus.rueckgr.at/ip_list_all.php/Tor_ip_list_ALL.csv diff --git a/utils/whatsapp_ip_addresses_download.sh b/utils/whatsapp_ip_addresses_download.sh index 1f0e99a30..e53ac68f6 100755 --- a/utils/whatsapp_ip_addresses_download.sh +++ b/utils/whatsapp_ip_addresses_download.sh @@ -2,7 +2,7 @@ cd "$(dirname "${0}")" -DEST=../src/lib/ndpi_whatsapp_match.c.inc +DEST=../src/lib/inc_generated/ndpi_whatsapp_match.c.inc TMP=/tmp/wa.zip LIST=/tmp/wa.list # https://developers.facebook.com/docs/whatsapp/guides/network-requirements/ diff --git a/utils/zoom_ip_addresses_download.sh b/utils/zoom_ip_addresses_download.sh index 3256b5459..9fe1a9445 100755 --- a/utils/zoom_ip_addresses_download.sh +++ b/utils/zoom_ip_addresses_download.sh @@ -2,7 +2,7 @@ cd "$(dirname "${0}")" -DEST=../src/lib/ndpi_zoom_match.c.inc +DEST=../src/lib/inc_generated/ndpi_zoom_match.c.inc LIST=/tmp/zoom.list # https://support.zoom.us/hc/en-us/articles/201362683-Zoom-network-firewall-or-proxy-server-settings # There are few lists in this page, partially overlapping. Pick the generic one |