From 62bae30a4a8622ff831e49f252e7b16115788ee8 Mon Sep 17 00:00:00 2001 From: Toni Date: Wed, 14 Jul 2021 11:09:58 +0200 Subject: [PATCH] Improved Steam detection (Steam Datagram Relay - SDR). (#1243) * improved DNSCrypt midstream detection again (sufficient for all tested use-cases) Signed-off-by: Toni Uhlig --- src/lib/protocols/dnscrypt.c | 19 +++++++++++++----- src/lib/protocols/steam.c | 9 +++++++++ tests/pcap/steam_datagram_relay_ping.pcapng | Bin 0 -> 15656 bytes .../steam_datagram_relay_ping.pcapng.out | 7 +++++++ 4 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 tests/pcap/steam_datagram_relay_ping.pcapng create mode 100644 tests/result/steam_datagram_relay_ping.pcapng.out diff --git a/src/lib/protocols/dnscrypt.c b/src/lib/protocols/dnscrypt.c index af147614a..a5bbd0c0e 100644 --- a/src/lib/protocols/dnscrypt.c +++ b/src/lib/protocols/dnscrypt.c @@ -38,22 +38,31 @@ void ndpi_search_dnscrypt(struct ndpi_detection_module_struct *ndpi_struct, NDPI_LOG_DBG(ndpi_struct, "search dnscrypt\n"); - if (flow->packet_counter > 3) - { - NDPI_EXCLUDE_PROTO(ndpi_struct, flow); - } - /* dnscrypt protocol version 1: check magic */ if (packet->payload_packet_len >= 64 && strncmp((char*)packet->payload, "r6fnvWj8", strlen("r6fnvWj8")) == 0) { ndpi_int_dnscrypt_add_connection(ndpi_struct, flow); + return; } /* dnscrypt protocol version 1 and 2: resolver ping */ if (packet->payload_packet_len > 13 + strlen(dnscrypt_initial) && strncasecmp((char*)packet->payload + 13, dnscrypt_initial, strlen(dnscrypt_initial)) == 0) { ndpi_int_dnscrypt_add_connection(ndpi_struct, flow); + return; + } + + if ((flow->packet_direction_counter[packet->packet_direction] >= 1 && + flow->packet_direction_counter[1 - packet->packet_direction] >= 1) || + flow->packet_counter >= 10) + { + /* + * Wait for at least one packet per direction, but not more then 10 packets. + * Required as we need to wait for the server response which contains the ASCII pattern below. + */ + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); + return; } } diff --git a/src/lib/protocols/steam.c b/src/lib/protocols/steam.c index f6c0da425..8cd3ec41f 100644 --- a/src/lib/protocols/steam.c +++ b/src/lib/protocols/steam.c @@ -113,6 +113,15 @@ static void ndpi_check_steam_udp1(struct ndpi_detection_module_struct *ndpi_stru return; } + /* Check for Steam Datagram Relay (SDR) packets. */ + if (payload_len > 8 && + ndpi_ntohll(get_u_int64_t(packet->payload, 0)) == 0x0101736470696e67 /* "\x01\x01sdping" */) + { + NDPI_LOG_INFO(ndpi_struct, "found STEAM (Steam Datagram Relay)\n"); + ndpi_int_steam_add_connection(ndpi_struct, flow); + return; + } + /* Check if we so far detected the protocol in the request or not. */ if (flow->steam_stage1 == 0) { NDPI_LOG_DBG2(ndpi_struct, "STEAM stage 0: \n"); diff --git a/tests/pcap/steam_datagram_relay_ping.pcapng b/tests/pcap/steam_datagram_relay_ping.pcapng new file mode 100644 index 0000000000000000000000000000000000000000..bd5d89def99c175aac9d3670fc16ea7f14ba2ef0 GIT binary patch literal 15656 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 OJRo}x^i2F;kpBmNqH!kx literal 0 HcmV?d00001 diff --git a/tests/result/steam_datagram_relay_ping.pcapng.out b/tests/result/steam_datagram_relay_ping.pcapng.out new file mode 100644 index 000000000..24ce55fbf --- /dev/null +++ b/tests/result/steam_datagram_relay_ping.pcapng.out @@ -0,0 +1,7 @@ +Guessed flow protos: 0 + +DPI Packets (UDP): 1 (1.00 pkts/flow) + +Steam 2 2684 1 + + 1 UDP 192.168.2.100:52157 -> 139.45.193.10:27018 [proto: 74/Steam][cat: Game/8][2 pkts/2684 bytes -> 0 pkts/0 bytes][Goodput ratio: 97/0][2.52 sec][PLAIN TEXT (sdping)][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0]