From d668ab4becf446195f3c6cd338d5de2711d7bf4e Mon Sep 17 00:00:00 2001 From: Darryl Sokoloski Date: Sun, 27 Mar 2022 05:10:44 -0400 Subject: [PATCH] [SSDP] Extract HTTP user-agent when available. (#1500) [SSDP] Added capture file with UA header. [SSDP] Added pcap test output log file. Signed-off-by: Darryl Sokoloski --- src/lib/protocols/ssdp.c | 21 +++++++++++++++++++++ tests/pcap/ssdp-m-search-ua.pcap | Bin 0 -> 952 bytes tests/result/ssdp-m-search-ua.pcap.out | 8 ++++++++ 3 files changed, 29 insertions(+) create mode 100644 tests/pcap/ssdp-m-search-ua.pcap create mode 100644 tests/result/ssdp-m-search-ua.pcap.out diff --git a/src/lib/protocols/ssdp.c b/src/lib/protocols/ssdp.c index 92354b27a..cc2eb2f71 100644 --- a/src/lib/protocols/ssdp.c +++ b/src/lib/protocols/ssdp.c @@ -29,9 +29,30 @@ #include "ndpi_api.h" +static void ssdp_parse_lines(struct ndpi_detection_module_struct + *ndpi_struct, struct ndpi_flow_struct *flow) +{ + struct ndpi_packet_struct *packet = &ndpi_struct->packet; + + ndpi_parse_packet_line_info(ndpi_struct, flow); + + /* Save user-agent for device discovery if available */ + if(packet->user_agent_line.ptr != NULL && packet->user_agent_line.len != 0) { + if(flow->http.user_agent == NULL) { + flow->http.user_agent = ndpi_malloc(packet->user_agent_line.len + 1); + if(flow->http.user_agent) { + memcpy(flow->http.user_agent, + (char*)packet->user_agent_line.ptr, packet->user_agent_line.len); + flow->http.user_agent[packet->user_agent_line.len] = '\0'; + } + } + } +} + static void ndpi_int_ssdp_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) { + ssdp_parse_lines(ndpi_struct, flow); ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SSDP, NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI); } diff --git a/tests/pcap/ssdp-m-search-ua.pcap b/tests/pcap/ssdp-m-search-ua.pcap new file mode 100644 index 0000000000000000000000000000000000000000..30d47079c3f15fd28461f5a4803295058df7e5fa GIT binary patch literal 952 zcmca|c+)~A1{MYcU}0bca=N|kll~rKW4HligD@jQT>bxFAN0LBC-324aAjaPH8%q& zDp>LKz=}^s@Bjb*b*GL!hhf{cNxr(lu8u*@9tv6t9w8wC`i6Rjyj&js!68-(M#h$U zMy94vY+z+*X<)$1=1Qd<1QUGcMX)7(t1Ii@k=;oH@ zlmJx}rKaZT<`<<~6{i-JWhSSBC9QypLxWv|bRFGY{eYU>^YhblQWcytit=+)^(`&+ z4D?JaOic95O%!|+lNJ1f6(V@Kc)5Cj{_Hx7&!3O&LH;!68`}Qt1^Tn-E 239.255.255.250:1900 [proto: 12/SSDP][ClearText][Confidence: DPI][cat: System/18][4 pkts/864 bytes -> 0 pkts/0 bytes][Goodput ratio: 80/0][3.00 sec][PLAIN TEXT (SEARCH )][Plen Bins: 0,0,0,0,0,100,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,0,0]