aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/include/ndpi_private.h2
-rw-r--r--src/include/ndpi_protocol_ids.h6
-rw-r--r--src/lib/ndpi_content_match.c.inc4
-rw-r--r--src/lib/ndpi_main.c17
-rw-r--r--src/lib/protocols/kontiki.c80
-rw-r--r--src/lib/protocols/tvuplayer.c161
6 files changed, 11 insertions, 259 deletions
diff --git a/src/include/ndpi_private.h b/src/include/ndpi_private.h
index 9db4ceed8..75668b866 100644
--- a/src/include/ndpi_private.h
+++ b/src/include/ndpi_private.h
@@ -714,7 +714,6 @@ void init_irc_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int3
void init_jabber_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
void init_kakaotalk_voice_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
void init_kerberos_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
-void init_kontiki_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
void init_ldap_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
void init_lotus_notes_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
void init_mail_imap_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
@@ -774,7 +773,6 @@ void init_teamviewer_dissector(struct ndpi_detection_module_struct *ndpi_struct,
void init_telegram_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
void init_telnet_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
void init_tftp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
-void init_tvuplayer_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
void init_usenet_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
void init_wsd_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
void init_veohtv_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h
index fc989fccf..a7b295924 100644
--- a/src/include/ndpi_protocol_ids.h
+++ b/src/include/ndpi_protocol_ids.h
@@ -60,7 +60,7 @@ typedef enum {
NDPI_PROTOCOL_MAIL_SMTPS = 29,
NDPI_PROTOCOL_DTLS = 30,
NDPI_PROTOCOL_UBNTAC2 = 31, /* Ubiquity UBNT AirControl = 2 */
- NDPI_PROTOCOL_KONTIKI = 32,
+ NDPI_PROTOCOL_FREE_32 = 32, /* FREE */
NDPI_PROTOCOL_YANDEX_MAIL = 33,
NDPI_PROTOCOL_YANDEX_MUSIC = 34,
NDPI_PROTOCOL_GNUTELLA = 35,
@@ -87,7 +87,7 @@ typedef enum {
NDPI_PROTOCOL_YANDEX_MARKET = 56,
NDPI_PROTOCOL_YANDEX_DISK = 57,
NDPI_PROTOCOL_DISCORD = 58,
- NDPI_PROTOCOL_TVUPLAYER = 59,
+ NDPI_PROTOCOL_FREE_59 = 59, /* FREE */
NDPI_PROTOCOL_MONGODB = 60,
NDPI_PROTOCOL_PLURALSIGHT = 61,
NDPI_PROTOCOL_YANDEX_CLOUD = 62,
@@ -177,7 +177,7 @@ typedef enum {
NDPI_PROTOCOL_RADIUS = 146,
NDPI_PROTOCOL_WINDOWS_UPDATE = 147,
NDPI_PROTOCOL_TEAMVIEWER = 148,
- NDPI_PROTOCOL_TUENTI = 149,
+ NDPI_PROTOCOL_FREE_149 = 149, /* FREE */
NDPI_PROTOCOL_LOTUS_NOTES = 150,
NDPI_PROTOCOL_SAP = 151,
NDPI_PROTOCOL_GTP = 152,
diff --git a/src/lib/ndpi_content_match.c.inc b/src/lib/ndpi_content_match.c.inc
index d850581f7..369cc76a4 100644
--- a/src/lib/ndpi_content_match.c.inc
+++ b/src/lib/ndpi_content_match.c.inc
@@ -663,10 +663,6 @@ static ndpi_protocol_match host_match[] =
{ "skype-calling-missedcallsregistrar-", "Skype_Teams", NDPI_PROTOCOL_SKYPE_TEAMS, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
{ "teams.cloudapp.net", "Skype_Teams", NDPI_PROTOCOL_SKYPE_TEAMS, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
-
-
- { "tuenti.com", "Tuenti", NDPI_PROTOCOL_TUENTI, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
-
{ "twttr.com", "Twitter", NDPI_PROTOCOL_TWITTER, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_DEFAULT_LEVEL },
{ "twitter.", "Twitter", NDPI_PROTOCOL_TWITTER, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_DEFAULT_LEVEL },
{ "twimg.com", "Twitter", NDPI_PROTOCOL_TWITTER, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN , NDPI_PROTOCOL_DEFAULT_LEVEL},
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c
index 815aa2e1c..ada595971 100644
--- a/src/lib/ndpi_main.c
+++ b/src/lib/ndpi_main.c
@@ -1140,8 +1140,8 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp
"VMware", NDPI_PROTOCOL_CATEGORY_REMOTE_ACCESS,
ndpi_build_default_ports(ports_a, 903, 0, 0, 0, 0) /* TCP */,
ndpi_build_default_ports(ports_b, 902, 903, 0, 0, 0) /* UDP */);
- ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_POTENTIALLY_DANGEROUS, NDPI_PROTOCOL_KONTIKI,
- "Kontiki", NDPI_PROTOCOL_CATEGORY_MEDIA,
+ ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_POTENTIALLY_DANGEROUS, NDPI_PROTOCOL_FREE_32,
+ "Free32", NDPI_PROTOCOL_CATEGORY_MEDIA,
ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */,
ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */);
ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_POTENTIALLY_DANGEROUS, NDPI_PROTOCOL_GNUTELLA,
@@ -1260,8 +1260,8 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp
"Discord", NDPI_PROTOCOL_CATEGORY_COLLABORATIVE,
ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */,
ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */);
- ndpi_set_proto_defaults(ndpi_str, 0 /* encrypted */, 1 /* app proto */, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_TVUPLAYER,
- "TVUplayer", NDPI_PROTOCOL_CATEGORY_VIDEO,
+ ndpi_set_proto_defaults(ndpi_str, 0 /* encrypted */, 1 /* app proto */, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_FREE_59,
+ "Free59", NDPI_PROTOCOL_CATEGORY_VIDEO,
ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */,
ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */);
ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 1 /* app proto */, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_PLURALSIGHT,
@@ -2304,6 +2304,10 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp
"KNXnet_IP", NDPI_PROTOCOL_CATEGORY_IOT_SCADA,
ndpi_build_default_ports(ports_a, 3671, 0, 0, 0, 0) /* TCP */,
ndpi_build_default_ports(ports_b, 3671, 0, 0, 0, 0) /* UDP */);
+ ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_FREE_149,
+ "Free149", NDPI_PROTOCOL_CATEGORY_VOIP,
+ ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */,
+ ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */);
#ifdef CUSTOM_NDPI_PROTOCOLS
#include "../../../nDPI-custom/custom_ndpi_main.c"
@@ -5565,8 +5569,6 @@ static int ndpi_callback_init(struct ndpi_detection_module_struct *ndpi_str) {
/* NON_TCP_UDP */
init_non_tcp_udp_dissector(ndpi_str, &a);
- /* TVUPLAYER */
- init_tvuplayer_dissector(ndpi_str, &a);
/* PPSTREAM */
init_ppstream_dissector(ndpi_str, &a);
@@ -5640,9 +5642,6 @@ static int ndpi_callback_init(struct ndpi_detection_module_struct *ndpi_str) {
/* SNMP */
init_snmp_dissector(ndpi_str, &a);
- /* KONTIKI */
- init_kontiki_dissector(ndpi_str, &a);
-
/* ICECAST */
init_icecast_dissector(ndpi_str, &a);
diff --git a/src/lib/protocols/kontiki.c b/src/lib/protocols/kontiki.c
deleted file mode 100644
index 5da07acc0..000000000
--- a/src/lib/protocols/kontiki.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * kontiki.c
- *
- * Copyright (C) 2009-11 - ipoque GmbH
- * Copyright (C) 2011-22 - ntop.org
- *
- * This file is part of nDPI, an open source deep packet inspection
- * library based on the OpenDPI and PACE technology by ipoque GmbH
- *
- * 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/>.
- *
- */
-
-
-#include "ndpi_protocol_ids.h"
-
-#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_KONTIKI
-
-#include "ndpi_api.h"
-#include "ndpi_private.h"
-
-
-static void ndpi_int_kontiki_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
- struct ndpi_flow_struct *flow)
-{
- ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_KONTIKI, NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI);
- NDPI_LOG_INFO(ndpi_struct, "found Kontiki UDP\n");
-}
-
-static void ndpi_search_kontiki(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
-{
- struct ndpi_packet_struct *packet = &ndpi_struct->packet;
-
- NDPI_LOG_DBG(ndpi_struct, "search Kontiki\n");
-
- if (packet->payload_packet_len == 4 && (get_u_int32_t(packet->payload, 0) == htonl(0x02010100))) {
- ndpi_int_kontiki_add_connection(ndpi_struct, flow);
- return;
- }
-
- if (packet->payload_packet_len > 0 && packet->payload[0] == 0x02) {
-
- if (packet->payload_packet_len == 20 && (get_u_int32_t(packet->payload, 16) == htonl(0x02040100))) {
- ndpi_int_kontiki_add_connection(ndpi_struct, flow);
- return;
- }
- if (packet->payload_packet_len == 16 && (get_u_int32_t(packet->payload, 12) == htonl(0x000004e4))) {
- ndpi_int_kontiki_add_connection(ndpi_struct, flow);
- return;
- }
- }
-
- NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
-}
-
-
-void init_kontiki_dissector(struct ndpi_detection_module_struct *ndpi_struct,
- u_int32_t *id)
-{
- ndpi_set_bitmask_protocol_detection("Kontiki", ndpi_struct, *id,
- NDPI_PROTOCOL_KONTIKI,
- ndpi_search_kontiki,
- NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD,
- SAVE_DETECTION_BITMASK_AS_UNKNOWN,
- ADD_TO_DETECTION_BITMASK);
-
- *id += 1;
-}
-
diff --git a/src/lib/protocols/tvuplayer.c b/src/lib/protocols/tvuplayer.c
deleted file mode 100644
index d400a86fc..000000000
--- a/src/lib/protocols/tvuplayer.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * tvuplayer.c
- *
- * Copyright (C) 2009-11 - ipoque GmbH
- * Copyright (C) 2011-22 - ntop.org
- *
- * This file is part of nDPI, an open source deep packet inspection
- * library based on the OpenDPI and PACE technology by ipoque GmbH
- *
- * 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/>.
- *
- */
-
-#include "ndpi_protocol_ids.h"
-
-#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_TVUPLAYER
-
-#include "ndpi_api.h"
-#include "ndpi_private.h"
-
-static void ndpi_int_tvuplayer_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
- struct ndpi_flow_struct *flow/* , */
- /* ndpi_protocol_type_t protocol_type */)
-{
- ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_TVUPLAYER, NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI);
-}
-
-static void ndpi_search_tvuplayer(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
-{
- struct ndpi_packet_struct *packet = &ndpi_struct->packet;
-
-
- NDPI_LOG_DBG(ndpi_struct, "search tvuplayer. \n");
-
- if (packet->tcp != NULL) {
- if ((packet->payload_packet_len == 36 || packet->payload_packet_len == 24)
- && packet->payload[0] == 0x00
- && ntohl(get_u_int32_t(packet->payload, 2)) == 0x31323334
- && ntohl(get_u_int32_t(packet->payload, 6)) == 0x35363837 && packet->payload[10] == 0x01) {
- NDPI_LOG_INFO(ndpi_struct, "found tvuplayer over tcp. \n");
- ndpi_int_tvuplayer_add_connection(ndpi_struct, flow);
- return;
- }
-
- if (packet->payload_packet_len >= 50) {
-
- if (memcmp(packet->payload, "POST", 4) || memcmp(packet->payload, "GET", 3)) {
- NDPI_PARSE_PACKET_LINE_INFO(ndpi_struct, flow, packet);
- if (packet->user_agent_line.ptr != NULL &&
- packet->user_agent_line.len >= 8 && (memcmp(packet->user_agent_line.ptr, "MacTVUP", 7) == 0)) {
- NDPI_LOG_INFO(ndpi_struct, "Found user agent as MacTVUP\n");
- ndpi_int_tvuplayer_add_connection(ndpi_struct, flow);
- return;
- }
- }
- }
- }
-
- if (packet->udp != NULL) {
-
- if (packet->payload_packet_len == 56 &&
- packet->payload[0] == 0xff
- && packet->payload[1] == 0xff && packet->payload[2] == 0x00
- && packet->payload[3] == 0x01
- && packet->payload[12] == 0x02 && packet->payload[13] == 0xff
- && packet->payload[19] == 0x2c && ((packet->payload[26] == 0x05 && packet->payload[27] == 0x14)
- || (packet->payload[26] == 0x14 && packet->payload[27] == 0x05))) {
- NDPI_LOG_INFO(ndpi_struct, "found tvuplayer pattern type I. \n");
- ndpi_int_tvuplayer_add_connection(ndpi_struct, flow);
- return;
- }
- if (packet->payload_packet_len == 82
- && packet->payload[0] == 0x00 && packet->payload[2] == 0x00
- && packet->payload[10] == 0x00 && packet->payload[11] == 0x00
- && packet->payload[12] == 0x01 && packet->payload[13] == 0xff
- && packet->payload[19] == 0x14 && packet->payload[32] == 0x03
- && packet->payload[33] == 0xff && packet->payload[34] == 0x01
- && packet->payload[39] == 0x32 && ((packet->payload[46] == 0x05 && packet->payload[47] == 0x14)
- || (packet->payload[46] == 0x14 && packet->payload[47] == 0x05))) {
- NDPI_LOG_INFO(ndpi_struct, "found tvuplayer pattern type II. \n");
- ndpi_int_tvuplayer_add_connection(ndpi_struct, flow);
- return;
- }
- if (packet->payload_packet_len == 32
- && packet->payload[0] == 0x00 && packet->payload[2] == 0x00
- && (packet->payload[10] == 0x00 || packet->payload[10] == 0x65
- || packet->payload[10] == 0x7e || packet->payload[10] == 0x49)
- && (packet->payload[11] == 0x00 || packet->payload[11] == 0x57
- || packet->payload[11] == 0x06 || packet->payload[11] == 0x22)
- && packet->payload[12] == 0x01 && (packet->payload[13] == 0xff || packet->payload[13] == 0x01)
- && packet->payload[19] == 0x14) {
- NDPI_LOG_INFO(ndpi_struct, "found tvuplayer pattern type III. \n");
- ndpi_int_tvuplayer_add_connection(ndpi_struct, flow);
- return;
- }
- if (packet->payload_packet_len == 84
- && packet->payload[0] == 0x00 && packet->payload[2] == 0x00
- && packet->payload[10] == 0x00 && packet->payload[11] == 0x00
- && packet->payload[12] == 0x01 && packet->payload[13] == 0xff
- && packet->payload[19] == 0x14 && packet->payload[32] == 0x03
- && packet->payload[33] == 0xff && packet->payload[34] == 0x01 && packet->payload[39] == 0x34) {
- NDPI_LOG_INFO(ndpi_struct, "found tvuplayer pattern type IV. \n");
- ndpi_int_tvuplayer_add_connection(ndpi_struct, flow);
- return;
- }
- if (packet->payload_packet_len == 102
- && packet->payload[0] == 0x00 && packet->payload[2] == 0x00
- && packet->payload[10] == 0x00 && packet->payload[11] == 0x00
- && packet->payload[12] == 0x01 && packet->payload[13] == 0xff
- && packet->payload[19] == 0x14 && packet->payload[33] == 0xff && packet->payload[39] == 0x14) {
- NDPI_LOG_INFO(ndpi_struct, "found tvuplayer pattern type V. \n");
- ndpi_int_tvuplayer_add_connection(ndpi_struct, flow);
- return;
- }
- if (packet->payload_packet_len == 62 && packet->payload[0] == 0x00 && packet->payload[2] == 0x00
- //&& packet->payload[10] == 0x00 && packet->payload[11] == 0x00
- && packet->payload[12] == 0x03 && packet->payload[13] == 0xff
- && packet->payload[19] == 0x32 && ((packet->payload[26] == 0x05 && packet->payload[27] == 0x14)
- || (packet->payload[26] == 0x14 && packet->payload[27] == 0x05))) {
- NDPI_LOG_INFO(ndpi_struct, "found tvuplayer pattern type VI. \n");
- ndpi_int_tvuplayer_add_connection(ndpi_struct, flow);
- return;
- }
- // to check, if byte 26, 27, 33,39 match
- if (packet->payload_packet_len == 60
- && packet->payload[0] == 0x00 && packet->payload[2] == 0x00
- && packet->payload[10] == 0x00 && packet->payload[11] == 0x00
- && packet->payload[12] == 0x06 && packet->payload[13] == 0x00 && packet->payload[19] == 0x30) {
- NDPI_LOG_INFO(ndpi_struct, "found tvuplayer pattern type VII. \n");
- ndpi_int_tvuplayer_add_connection(ndpi_struct, flow);
- return;
- }
- }
-
- NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
-
-}
-
-
-void init_tvuplayer_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id)
-{
- ndpi_set_bitmask_protocol_detection("TVUplayer", ndpi_struct, *id,
- NDPI_PROTOCOL_TVUPLAYER,
- ndpi_search_tvuplayer,
- NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
- SAVE_DETECTION_BITMASK_AS_UNKNOWN,
- ADD_TO_DETECTION_BITMASK);
-
- *id += 1;
-}
Powered by cgit, Themed by Ted Yin.