From 97b80a8838a5187163eef3a54a711a8c0cee8742 Mon Sep 17 00:00:00 2001 From: Nardi Ivan Date: Mon, 24 Aug 2020 13:53:36 +0200 Subject: [PATCH] QUIC: minor fixes LGTM found a real issue on a boundary check Fix unit tests: a pcap ha been uploaded twice (with different names) Fix compilation when using DPDK (see #990) --- example/Makefile.dpdk.in | 2 +- src/lib/protocols/quic.c | 2 +- tests/pcap/{quic-28.pcapng => quic-28.pcap} | Bin 256428 -> 250865 bytes tests/pcap/{ietf_quic.pcap => quic-29.pcap} | Bin 11356 -> 9650 bytes tests/pcap/quic-29.pcapng | Bin 11356 -> 0 bytes tests/result/quic-28.pcap.out | 8 ++++++++ .../{ietf_quic.pcap.out => quic-29.pcap.out} | 0 7 files changed, 10 insertions(+), 2 deletions(-) rename tests/pcap/{quic-28.pcapng => quic-28.pcap} (89%) rename tests/pcap/{ietf_quic.pcap => quic-29.pcap} (75%) delete mode 100644 tests/pcap/quic-29.pcapng create mode 100644 tests/result/quic-28.pcap.out rename tests/result/{ietf_quic.pcap.out => quic-29.pcap.out} (100%) diff --git a/example/Makefile.dpdk.in b/example/Makefile.dpdk.in index 85c64a1d4..8c452ae79 100644 --- a/example/Makefile.dpdk.in +++ b/example/Makefile.dpdk.in @@ -21,7 +21,7 @@ SRCS-y := reader_util.c intrusion_detection.c ndpiReader.c CFLAGS += -g CFLAGS += -Wno-strict-prototypes -Wno-missing-prototypes -Wno-missing-declarations -Wno-unused-parameter -I $(PWD)/../src/include @CFLAGS@ -DUSE_DPDK -LDLIBS = $(LIBNDPI) @PCAP_LIB@ -lpthread @LDFLAGS@ +LDLIBS = $(LIBNDPI) @PCAP_LIB@ @LIBS@ -lpthread -lm @LDFLAGS@ include $(RTE_SDK)/mk/rte.extapp.mk diff --git a/src/lib/protocols/quic.c b/src/lib/protocols/quic.c index 0120af850..d40b4219b 100644 --- a/src/lib/protocols/quic.c +++ b/src/lib/protocols/quic.c @@ -845,7 +845,7 @@ static const uint8_t *get_crypto_data(struct ndpi_detection_module_struct *ndpi_ uint64_t unused; counter = 0; - while(clear_payload[counter] == 0 && counter < clear_payload_len) + while(counter < clear_payload_len && clear_payload[counter] == 0) counter += 1; if(counter >= clear_payload_len) return NULL; diff --git a/tests/pcap/quic-28.pcapng b/tests/pcap/quic-28.pcap similarity index 89% rename from tests/pcap/quic-28.pcapng rename to tests/pcap/quic-28.pcap index 733d665d721b9f1e44e930585ca913b283bb1548..e93354ceafd375a583b8f1a103e343de1de3699f 100644 GIT binary patch delta 4520 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 AfdBvi diff --git a/tests/pcap/ietf_quic.pcap b/tests/pcap/quic-29.pcap similarity index 75% rename from tests/pcap/ietf_quic.pcap rename to tests/pcap/quic-29.pcap index c0034b2c9ff5df9f990967dcf2585d97f55926e7..4694660cd2d8689774e21b007b71a141bbb50936 100644 GIT binary patch delta 244 zcmcZ;vB_KE%Hd55nHX3Y5P*e&5y+W7=UE(sDi_1%3#?+S93b9LbuNZU+{?l2iCRFJ z1Kd!VqZV8YlRpS-089DU0XY{~r8i#|{LKOuiHrg&ejx@`4CYD5v@n9@X6FOtw#Y)| zz`Q3)_7FLvR-l}X$~Op)u^-6uQPX4L1v!R$F&9HT(3$a*8FfS^uhsGco3?ui&~6d! XNHE81DUj2l9R=pBSOw(#(T)KC(uY+U delta 1977 zcmcIl&1(}u6rXBRHL+OntF79sP{AUGncevWQA?ZJ(pqR*wV)7YXJ)O4Qu-ktlvNNs zORgRS5fKDG@(&1t_Et|GLh~G19S0j)frFhy^QuHYIpF!!C9m>+=cfkyfDU(jU+O3S>B%jx@-CNm@(y?W z<#{^kf0_B{l{-34wI`@!r>ocxH$QvB_V;kPIlH-huj7!nP*7VqH}}OWTCSKBHtp`R U$2p?$AIeKO_9AI<;aKmY&$ diff --git a/tests/pcap/quic-29.pcapng b/tests/pcap/quic-29.pcapng deleted file mode 100644 index c0034b2c9ff5df9f990967dcf2585d97f55926e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11356 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 diff --git a/tests/result/quic-28.pcap.out b/tests/result/quic-28.pcap.out new file mode 100644 index 000000000..7cf2e4ac3 --- /dev/null +++ b/tests/result/quic-28.pcap.out @@ -0,0 +1,8 @@ +Cloudflare 253 246793 1 + +JA3 Host Stats: + IP Address # JA3C + 1 10.9.0.2 1 + + + 1 UDP 10.9.0.2:60106 <-> 104.26.11.240:443 [proto: 188.220/QUIC.Cloudflare][cat: Web/5][34 pkts/6856 bytes <-> 219 pkts/239937 bytes][Goodput ratio: 79/96][2.76 sec][ALPN: h3-28;h3-27][TLS Supported Versions: TLSv1.3][bytes ratio: -0.944 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/0 77/14 1007/1023 229/91][Pkt Len c2s/s2c min/avg/max/stddev: 85/84 202/1096 1242/1242 325/364][TLSv1.3][Client: www.wireshark.org][JA3C: 1e022f87823477abd6a79c31d70062d7][PLAIN TEXT (tGLddu)][Plen Bins: 0,16,2,1,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,80,0,0,0,0,0,0,0,0,0,0] diff --git a/tests/result/ietf_quic.pcap.out b/tests/result/quic-29.pcap.out similarity index 100% rename from tests/result/ietf_quic.pcap.out rename to tests/result/quic-29.pcap.out