From f3532f0bad383424c334e664b8901ef964832988 Mon Sep 17 00:00:00 2001 From: Ivan Nardi <12729895+IvanNardi@users.noreply.github.com> Date: Mon, 20 Jan 2025 18:06:56 +0100 Subject: Unify "Skype" and "Teams" ids (#2687) * Rename `NDPI_PROTOCOL_SKYPE_TEAMS_CALL` -> `NDPI_PROTOCOL_MSTEAMS_CALL` * Rename ip list from "Skype/Teams" to "Teams" --- .../inc_generated/ndpi_ms_skype_teams_match.c.inc | 42 ---------------------- src/lib/inc_generated/ndpi_msteams_match.c.inc | 42 ++++++++++++++++++++++ 2 files changed, 42 insertions(+), 42 deletions(-) delete mode 100644 src/lib/inc_generated/ndpi_ms_skype_teams_match.c.inc create mode 100644 src/lib/inc_generated/ndpi_msteams_match.c.inc (limited to 'src/lib/inc_generated') diff --git a/src/lib/inc_generated/ndpi_ms_skype_teams_match.c.inc b/src/lib/inc_generated/ndpi_ms_skype_teams_match.c.inc deleted file mode 100644 index 737a70e66..000000000 --- a/src/lib/inc_generated/ndpi_ms_skype_teams_match.c.inc +++ /dev/null @@ -1,42 +0,0 @@ -/* - * - * 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 . - * - */ - -/* ****************************************************** */ - - -static ndpi_network ndpi_protocol_skype_teams_protocol_list[] = { - { 0x34700000 /* 52.112.0.0/14 */, 14, NDPI_PROTOCOL_SKYPE_TEAMS }, - { 0x347A0000 /* 52.122.0.0/15 */, 15, NDPI_PROTOCOL_SKYPE_TEAMS }, - { 0x34EE778D /* 52.238.119.141/32 */, 32, NDPI_PROTOCOL_SKYPE_TEAMS }, - { 0x34F4A0CF /* 52.244.160.207/32 */, 32, NDPI_PROTOCOL_SKYPE_TEAMS }, - /* End */ - { 0x0, 0, 0 } -}; - -static ndpi_network6 ndpi_protocol_skype_teams_protocol_list_6[] = { - { "2603:1027::", 48, NDPI_PROTOCOL_SKYPE_TEAMS }, - { "2603:1037::", 48, NDPI_PROTOCOL_SKYPE_TEAMS }, - { "2603:1047::", 48, NDPI_PROTOCOL_SKYPE_TEAMS }, - { "2603:1057::", 48, NDPI_PROTOCOL_SKYPE_TEAMS }, - { "2603:1063::", 38, NDPI_PROTOCOL_SKYPE_TEAMS }, - { "2620:1ec:6::", 48, NDPI_PROTOCOL_SKYPE_TEAMS }, - { "2620:1ec:40::", 42, NDPI_PROTOCOL_SKYPE_TEAMS }, - /* End */ - { NULL, 0, 0 } -}; diff --git a/src/lib/inc_generated/ndpi_msteams_match.c.inc b/src/lib/inc_generated/ndpi_msteams_match.c.inc new file mode 100644 index 000000000..b311a53df --- /dev/null +++ b/src/lib/inc_generated/ndpi_msteams_match.c.inc @@ -0,0 +1,42 @@ +/* + * + * 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 . + * + */ + +/* ****************************************************** */ + + +static ndpi_network ndpi_protocol_msteams_protocol_list[] = { + { 0x34700000 /* 52.112.0.0/14 */, 14, NDPI_PROTOCOL_MSTEAMS }, + { 0x347A0000 /* 52.122.0.0/15 */, 15, NDPI_PROTOCOL_MSTEAMS }, + { 0x34EE778D /* 52.238.119.141/32 */, 32, NDPI_PROTOCOL_MSTEAMS }, + { 0x34F4A0CF /* 52.244.160.207/32 */, 32, NDPI_PROTOCOL_MSTEAMS }, + /* End */ + { 0x0, 0, 0 } +}; + +static ndpi_network6 ndpi_protocol_msteams_protocol_list_6[] = { + { "2603:1027::", 48, NDPI_PROTOCOL_MSTEAMS }, + { "2603:1037::", 48, NDPI_PROTOCOL_MSTEAMS }, + { "2603:1047::", 48, NDPI_PROTOCOL_MSTEAMS }, + { "2603:1057::", 48, NDPI_PROTOCOL_MSTEAMS }, + { "2603:1063::", 38, NDPI_PROTOCOL_MSTEAMS }, + { "2620:1ec:6::", 48, NDPI_PROTOCOL_MSTEAMS }, + { "2620:1ec:40::", 42, NDPI_PROTOCOL_MSTEAMS }, + /* End */ + { NULL, 0, 0 } +}; -- cgit v1.2.3