From 21b2cce7151311931130a6513a8f26fdb4fb3fca Mon Sep 17 00:00:00 2001 From: Toni Date: Mon, 5 Jul 2021 09:41:35 +0200 Subject: [PATCH] Improved Z39.50 detection. (#1225) Signed-off-by: Toni Uhlig --- src/lib/protocols/z3950.c | 13 ++++--------- tests/pcap/z3950.pcap | Bin 5261 -> 0 bytes tests/pcap/z3950.pcapng | Bin 0 -> 7508 bytes tests/result/z3950.pcap.out | 3 --- tests/result/z3950.pcapng.out | 4 ++++ 5 files changed, 8 insertions(+), 12 deletions(-) delete mode 100644 tests/pcap/z3950.pcap create mode 100644 tests/pcap/z3950.pcapng delete mode 100644 tests/result/z3950.pcap.out create mode 100644 tests/result/z3950.pcapng.out diff --git a/src/lib/protocols/z3950.c b/src/lib/protocols/z3950.c index b267c776d..8a6620ed0 100644 --- a/src/lib/protocols/z3950.c +++ b/src/lib/protocols/z3950.c @@ -62,15 +62,10 @@ static int z3950_parse_sequences(struct ndpi_packet_struct const * const packet, u_int8_t seq_length; payload = &packet->payload[payload_offset]; - if (payload[0] == 0x9F) + if ((payload[0] & 0x1F) == 0x1F) { - if (payload_offset + 3 >= packet->payload_packet_len) - { - return -1; - } - payload_offset++; - payload = &packet->payload[payload_offset]; - seq_type = payload[0]; + /* We ignore decoding of complex sequences for now. */ + return cur_sequences; } else { seq_type = payload[0] & 0x1F; } @@ -103,7 +98,7 @@ static void ndpi_search_z3950(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) { struct ndpi_packet_struct * packet = &flow->packet; - int const minimum_expected_sequences = 7; + int const minimum_expected_sequences = 6; NDPI_LOG_DBG(ndpi_struct, "search z39.50\n"); diff --git a/tests/pcap/z3950.pcap b/tests/pcap/z3950.pcap deleted file mode 100644 index 713a3acf6034a1f1cecea14d758f6965722005e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5261 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 KUi;yOWB&mX!OAKC diff --git a/tests/pcap/z3950.pcapng b/tests/pcap/z3950.pcapng new file mode 100644 index 0000000000000000000000000000000000000000..7f19cb7912087947e45bf535c52db620adca3cb1 GIT binary patch literal 7508 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 literal 0 HcmV?d00001 diff --git a/tests/result/z3950.pcap.out b/tests/result/z3950.pcap.out deleted file mode 100644 index 8aed9fd28..000000000 --- a/tests/result/z3950.pcap.out +++ /dev/null @@ -1,3 +0,0 @@ -Z39.50 15 4997 1 - - 1 TCP 192.168.2.100:58921 <-> 193.174.240.93:210 [proto: 260/Z39.50][cat: Network/14][7 pkts/623 bytes <-> 8 pkts/4374 bytes][Goodput ratio: 37/90][1.55 sec][bytes ratio: -0.751 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/0 293/29 1341/73 524/28][Pkt Len c2s/s2c min/avg/max/stddev: 54/60 89/547 170/1506 44/623][PLAIN TEXT (p.5.4.1 12b)][Plen Bins: 25,0,25,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,0,0] diff --git a/tests/result/z3950.pcapng.out b/tests/result/z3950.pcapng.out new file mode 100644 index 000000000..779d71f70 --- /dev/null +++ b/tests/result/z3950.pcapng.out @@ -0,0 +1,4 @@ +Z39.50 31 6308 2 + + 1 TCP 192.168.2.100:58921 <-> 193.174.240.93:210 [proto: 260/Z39.50][cat: Network/14][7 pkts/623 bytes <-> 8 pkts/4374 bytes][Goodput ratio: 37/90][1.55 sec][bytes ratio: -0.751 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/0 293/29 1341/73 524/28][Pkt Len c2s/s2c min/avg/max/stddev: 54/60 89/547 170/1506 44/623][PLAIN TEXT (p.5.4.1 12b)][Plen Bins: 25,0,25,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,0,0] + 2 TCP 192.168.0.20:46524 <-> 129.187.139.43:9991 [proto: 260/Z39.50][cat: Network/14][10 pkts/764 bytes <-> 6 pkts/547 bytes][Goodput ratio: 28/36][76.54 sec][bytes ratio: 0.166 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 0/2 1539/3022 9007/9037 3003/4253][Pkt Len c2s/s2c min/avg/max/stddev: 54/60 76/91 138/167 32/37][PLAIN TEXT (p/5.27.1 872b)][Plen Bins: 0,50,33,16,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,0,0]