Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/configuration_parameters.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,5 +83,5 @@ List of the supported configuration options:
| "openvpn" | "subclassification_by_ip" | enable | NULL | NULL | Enable/disable sub-classification of OpenVPN flows using server IP. Useful to detect the specific VPN application/app. At the moment, this knob allows to identify: Mullvad, NordVPN, ProtonVPN. |
| "wireguard" | "subclassification_by_ip" | enable | NULL | NULL | Enable/disable sub-classification of Wireguard flows using server IP. Useful to detect the specific VPN application/app. At the moment, this knob allows to identify: Mullvad, NordVPN, ProtonVPN. |
| $PROTO_NAME | "log" | disable | NULL | NULL | Enable/disable logging/debug for specific protocol. Use "any" as protocol name if you want to easily enable/disable logging/debug for all protocols |
| $PROTO_NAME | "ip_list.load" | enable | NULL | NULL | Enable/disable loading of internal list of IP addresses (used for (sub)classification) specific to that protocol. Use "any" as protocol name if you want to easily enable/disable all lists. This knob is valid only for the following protocols: Alibaba, Amazon AWS, Apple, Avast, Bloomberg, Cachefly, Cloudflare, DigitalOcean, Discord, Disney+, Dropbox, Edgecast, EpicGames, Ethereum, Facebook, Github, Google, Google Cloud, GoTo, Hotspot Shield, Hulu, Line, Microsoft 365, Microsoft Azure, Microsoft One Drive, Microsoft Outlook, Microsoft Teams, Mullvad, Netflix, NordVPN, Nvidia, OpenDNS, ProtonVPN, RiotGames, Roblox, Starcraft, Steam, SurfSharkVPN, Teamviewer, Telegram, Tencent, Threema, TOR, Twitch, Twitter, UbuntuONE, VK, Yandex, Yandex Cloud, Webex, Whatsapp, Zoom |
| $PROTO_NAME | "ip_list.load" | enable | NULL | NULL | Enable/disable loading of internal list of IP addresses (used for (sub)classification) specific to that protocol. Use "any" as protocol name if you want to easily enable/disable all lists. This knob is valid only for the following protocols: Alibaba, Amazon AWS, Apple, Avast, Blizzard, Bloomberg, Cachefly, Cloudflare, DigitalOcean, Discord, Disney+, Dropbox, Edgecast, EpicGames, Ethereum, Facebook, Github, Google, Google Cloud, GoTo, Hotspot Shield, Hulu, Line, Microsoft 365, Microsoft Azure, Microsoft One Drive, Microsoft Outlook, Microsoft Teams, Mullvad, Netflix, NordVPN, Nvidia, OpenDNS, ProtonVPN, RiotGames, Roblox, Steam, SurfSharkVPN, Teamviewer, Telegram, Tencent, Threema, TOR, Twitch, Twitter, UbuntuONE, VK, Yandex, Yandex Cloud, Webex, Whatsapp, Zoom |
| $PROTO_NAME | "monitoring" | disable | NULL | NULL | Enable/disable monitoring state for this specific protocol. Use "any" as protocol name if you want to easily enable/disable monitoring feature for all protocols. This knob is valid only for the following protocols: Stun. Monitoring allows nDPI to process the entire flow (i.e. all its packets), without any limits. See doc/monitoring.md for further details |
9 changes: 9 additions & 0 deletions doc/protocols.rst
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,15 @@ Google Meet is a video conferencing service from Google.
References: `Main site: <https://meet.google.com/>`_


.. _Proto 213:

`NDPI_PROTOCOL_BLIZZARD`
========================
Blizzard Entertainment is an American video game developer and publisher, and a subsidiary of Activision Blizzard. The company is best known for producing the role-playing game World of Warcraft as well as video game franchises Diablo, StarCraft, and Overwatch.

References: `Main site: <https://www.blizzard.com>`_


.. _Proto 235:

`NDPI_PROTOCOL_VALVE_SDR`
Expand Down
2 changes: 1 addition & 1 deletion src/include/ndpi_private.h
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,7 @@ void init_sonos_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_in
void init_spotify_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
void init_ssh_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
void init_tls_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
void init_starcraft_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
void init_blizzard_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
void init_steam_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
void init_stun_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
void init_syslog_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
Expand Down
2 changes: 1 addition & 1 deletion src/include/ndpi_protocol_ids.h
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ typedef enum {
NDPI_PROTOCOL_DEEZER = 210,
NDPI_PROTOCOL_INSTAGRAM = 211,
NDPI_PROTOCOL_MICROSOFT = 212,
NDPI_PROTOCOL_STARCRAFT = 213,
NDPI_PROTOCOL_BLIZZARD = 213,
NDPI_PROTOCOL_TEREDO = 214,
NDPI_PROTOCOL_HOTSPOT_SHIELD = 215,
NDPI_PROTOCOL_IMO = 216,
Expand Down
3 changes: 0 additions & 3 deletions src/include/ndpi_typedefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -1635,9 +1635,6 @@ struct ndpi_flow_struct {
/* NDPI_PROTOCOL_ZATTOO */
u_int8_t zattoo_stage:3;

/* NDPI_PROTOCOL_STARCRAFT */
u_int8_t starcraft_udp_stage : 3; // 0-7

/* NDPI_PROTOCOL_OOKLA */
u_int8_t ookla_stage : 1;

Expand Down
96 changes: 96 additions & 0 deletions src/lib/inc_generated/ndpi_asn_blizzard.c.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
/*
*
* This file is generated automatically and part of nDPI
*
* nDPI is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* nDPI is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
*
*/

/* ****************************************************** */


static ndpi_network ndpi_protocol_blizzard_protocol_list[] = {
{ 0x052AA000 /* 5.42.160.0/20 */, 20, NDPI_PROTOCOL_BLIZZARD },
{ 0x052AB200 /* 5.42.178.0/23 */, 23, NDPI_PROTOCOL_BLIZZARD },
{ 0x18691200 /* 24.105.18.0/23 */, 23, NDPI_PROTOCOL_BLIZZARD },
{ 0x18691900 /* 24.105.25.0/24 */, 24, NDPI_PROTOCOL_BLIZZARD },
{ 0x18691C00 /* 24.105.28.0/22 */, 22, NDPI_PROTOCOL_BLIZZARD },
{ 0x18692000 /* 24.105.32.0/20 */, 20, NDPI_PROTOCOL_BLIZZARD },
{ 0x18693200 /* 24.105.50.0/23 */, 23, NDPI_PROTOCOL_BLIZZARD },
{ 0x18693400 /* 24.105.52.0/22 */, 22, NDPI_PROTOCOL_BLIZZARD },
{ 0x18693800 /* 24.105.56.0/23 */, 23, NDPI_PROTOCOL_BLIZZARD },
{ 0x18693B00 /* 24.105.59.0/24 */, 24, NDPI_PROTOCOL_BLIZZARD },
{ 0x18693C00 /* 24.105.60.0/22 */, 22, NDPI_PROTOCOL_BLIZZARD },
{ 0x25F40000 /* 37.244.0.0/24 */, 24, NDPI_PROTOCOL_BLIZZARD },
{ 0x25F40200 /* 37.244.2.0/23 */, 23, NDPI_PROTOCOL_BLIZZARD },
{ 0x25F40400 /* 37.244.4.0/22 */, 22, NDPI_PROTOCOL_BLIZZARD },
{ 0x25F40800 /* 37.244.8.0/21 */, 21, NDPI_PROTOCOL_BLIZZARD },
{ 0x25F41000 /* 37.244.16.0/24 */, 24, NDPI_PROTOCOL_BLIZZARD },
{ 0x25F41300 /* 37.244.19.0/24 */, 24, NDPI_PROTOCOL_BLIZZARD },
{ 0x25F41400 /* 37.244.20.0/24 */, 24, NDPI_PROTOCOL_BLIZZARD },
{ 0x25F41700 /* 37.244.23.0/24 */, 24, NDPI_PROTOCOL_BLIZZARD },
{ 0x25F41800 /* 37.244.24.0/23 */, 23, NDPI_PROTOCOL_BLIZZARD },
{ 0x25F41B00 /* 37.244.27.0/24 */, 24, NDPI_PROTOCOL_BLIZZARD },
{ 0x25F41C00 /* 37.244.28.0/24 */, 24, NDPI_PROTOCOL_BLIZZARD },
{ 0x25F42000 /* 37.244.32.0/20 */, 20, NDPI_PROTOCOL_BLIZZARD },
{ 0x25F43000 /* 37.244.48.0/23 */, 23, NDPI_PROTOCOL_BLIZZARD },
{ 0x25F43200 /* 37.244.50.0/24 */, 24, NDPI_PROTOCOL_BLIZZARD },
{ 0x25F43400 /* 37.244.52.0/22 */, 22, NDPI_PROTOCOL_BLIZZARD },
{ 0x25F43800 /* 37.244.56.0/21 */, 21, NDPI_PROTOCOL_BLIZZARD },
{ 0x3B992800 /* 59.153.40.0/23 */, 23, NDPI_PROTOCOL_BLIZZARD },
{ 0x40E00000 /* 64.224.0.0/21 */, 21, NDPI_PROTOCOL_BLIZZARD },
{ 0x40E01800 /* 64.224.24.0/21 */, 21, NDPI_PROTOCOL_BLIZZARD },
{ 0x4228B000 /* 66.40.176.0/21 */, 21, NDPI_PROTOCOL_BLIZZARD },
{ 0x4228B800 /* 66.40.184.0/22 */, 22, NDPI_PROTOCOL_BLIZZARD },
{ 0x4228BE00 /* 66.40.190.0/23 */, 23, NDPI_PROTOCOL_BLIZZARD },
{ 0x67047200 /* 103.4.114.0/23 */, 23, NDPI_PROTOCOL_BLIZZARD },
{ 0x67C62000 /* 103.198.32.0/23 */, 23, NDPI_PROTOCOL_BLIZZARD },
{ 0x6E2DD000 /* 110.45.208.0/24 */, 24, NDPI_PROTOCOL_BLIZZARD },
{ 0x75340600 /* 117.52.6.0/24 */, 24, NDPI_PROTOCOL_BLIZZARD },
{ 0x75341A00 /* 117.52.26.0/23 */, 23, NDPI_PROTOCOL_BLIZZARD },
{ 0x75341C00 /* 117.52.28.0/23 */, 23, NDPI_PROTOCOL_BLIZZARD },
{ 0x75342100 /* 117.52.33.0/24 */, 24, NDPI_PROTOCOL_BLIZZARD },
{ 0x75342200 /* 117.52.34.0/23 */, 23, NDPI_PROTOCOL_BLIZZARD },
{ 0x75342400 /* 117.52.36.0/23 */, 23, NDPI_PROTOCOL_BLIZZARD },
{ 0x79FE8900 /* 121.254.137.0/24 */, 24, NDPI_PROTOCOL_BLIZZARD },
{ 0x79FECE00 /* 121.254.206.0/23 */, 23, NDPI_PROTOCOL_BLIZZARD },
{ 0x79FEDA00 /* 121.254.218.0/24 */, 24, NDPI_PROTOCOL_BLIZZARD },
{ 0x89DD4000 /* 137.221.64.0/19 */, 19, NDPI_PROTOCOL_BLIZZARD },
{ 0x89DD6000 /* 137.221.96.0/20 */, 20, NDPI_PROTOCOL_BLIZZARD },
{ 0x89DD7000 /* 137.221.112.0/24 */, 24, NDPI_PROTOCOL_BLIZZARD },
{ 0x96740900 /* 150.116.9.0/24 */, 24, NDPI_PROTOCOL_BLIZZARD },
{ 0x9E73C000 /* 158.115.192.0/22 */, 22, NDPI_PROTOCOL_BLIZZARD },
{ 0x9E73C400 /* 158.115.196.0/23 */, 23, NDPI_PROTOCOL_BLIZZARD },
{ 0x9E73C700 /* 158.115.199.0/24 */, 24, NDPI_PROTOCOL_BLIZZARD },
{ 0x9E73C800 /* 158.115.200.0/21 */, 21, NDPI_PROTOCOL_BLIZZARD },
{ 0x9E73D800 /* 158.115.216.0/21 */, 21, NDPI_PROTOCOL_BLIZZARD },
{ 0xB6A21F00 /* 182.162.31.0/24 */, 24, NDPI_PROTOCOL_BLIZZARD },
{ 0xB93C7000 /* 185.60.112.0/22 */, 22, NDPI_PROTOCOL_BLIZZARD },
{ 0xC64A2000 /* 198.74.32.0/22 */, 22, NDPI_PROTOCOL_BLIZZARD },
{ 0xC64A2400 /* 198.74.36.0/23 */, 23, NDPI_PROTOCOL_BLIZZARD },
{ 0xCA094200 /* 202.9.66.0/23 */, 23, NDPI_PROTOCOL_BLIZZARD },
/* End */
{ 0x0, 0, 0 }
};

static ndpi_network6 ndpi_protocol_blizzard_protocol_list_6[] = {
{ "2a04:e800:5010::", 47, NDPI_PROTOCOL_BLIZZARD },
{ "2a04:e800:5016::", 48, NDPI_PROTOCOL_BLIZZARD },
{ "2a04:e800:5020::", 48, NDPI_PROTOCOL_BLIZZARD },
{ "2a04:e800:5040::", 48, NDPI_PROTOCOL_BLIZZARD },
{ "2a04:e800:5407::", 48, NDPI_PROTOCOL_BLIZZARD },
{ "2a04:e802::", 32, NDPI_PROTOCOL_BLIZZARD },
/* End */
{ NULL, 0, 0 }
};
94 changes: 0 additions & 94 deletions src/lib/inc_generated/ndpi_asn_starcraft.c.inc

This file was deleted.

13 changes: 13 additions & 0 deletions src/lib/ndpi_content_match.c.inc
Original file line number Diff line number Diff line change
Expand Up @@ -484,6 +484,19 @@ static ndpi_protocol_match host_match[] =
{ "e1800.d.akamaiedge.net", "Playstation", NDPI_PROTOCOL_PLAYSTATION, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_DEFAULT_LEVEL },
{ "e1879.e7.akamaiedge.net", "Playstation", NDPI_PROTOCOL_PLAYSTATION, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_DEFAULT_LEVEL },

{ "battle.net", "Blizzard", NDPI_PROTOCOL_BLIZZARD, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_DEFAULT_LEVEL },
{ "blizzard.com", "Blizzard", NDPI_PROTOCOL_BLIZZARD, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_DEFAULT_LEVEL },
{ "bnetaccount.akamaized.net", "Blizzard", NDPI_PROTOCOL_BLIZZARD, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_DEFAULT_LEVEL },
{ "blz-contentstack-images.akamaized.net", "Blizzard", NDPI_PROTOCOL_BLIZZARD, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_DEFAULT_LEVEL },
{ "blz-contentstack-assets.akamaized.net", "Blizzard", NDPI_PROTOCOL_BLIZZARD, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_DEFAULT_LEVEL },
{ "blzprofile.akamaized.net", "Blizzard", NDPI_PROTOCOL_BLIZZARD, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_DEFAULT_LEVEL },
{ "bnetstorefront.akamaized.net", "Blizzard", NDPI_PROTOCOL_BLIZZARD, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_DEFAULT_LEVEL },
{ "bnetcmsus-a.akamaihd.net", "Blizzard", NDPI_PROTOCOL_BLIZZARD, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_DEFAULT_LEVEL },
{ "blizzard-api.arkoselabs.com", "Blizzard", NDPI_PROTOCOL_BLIZZARD, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_DEFAULT_LEVEL },
{ "starcraft2.com", "Blizzard", NDPI_PROTOCOL_BLIZZARD, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_DEFAULT_LEVEL },
{ "blzstatic.com", "Blizzard", NDPI_PROTOCOL_BLIZZARD, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_DEFAULT_LEVEL },
{ "images.blz-contentstack.com", "Blizzard", NDPI_PROTOCOL_BLIZZARD, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_DEFAULT_LEVEL },

{ "cnn.com", "CNN", NDPI_PROTOCOL_CNN, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE, NDPI_PROTOCOL_DEFAULT_LEVEL },
{ "cnn.net", "CNN", NDPI_PROTOCOL_CNN, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE, NDPI_PROTOCOL_DEFAULT_LEVEL },

Expand Down
Loading
Loading