diff options
| author | Luca Deri <lucaderi@users.noreply.github.com> | 2020-08-24 14:45:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-24 14:45:04 +0200 |
| commit | b94e13da435af8bb0049eb09f71a1dba57ce9f46 (patch) | |
| tree | 65aca2a8734722d6387f169c6b74ba236951836a | |
| parent | b8307eb85513cd613f365efe44d22bcbddc17ae0 (diff) | |
| parent | 97b80a8838a5187163eef3a54a711a8c0cee8742 (diff) | |
Merge pull request #991 from IvanNardi/quic2
QUIC: minor fixes
| -rw-r--r-- | example/Makefile.dpdk.in | 2 | ||||
| -rw-r--r-- | src/lib/protocols/quic.c | 2 | ||||
| -rw-r--r-- | tests/pcap/quic-28.pcap (renamed from tests/pcap/quic-28.pcapng) | bin | 256428 -> 250865 bytes | |||
| -rw-r--r-- | tests/pcap/quic-29.pcap (renamed from tests/pcap/ietf_quic.pcap) | bin | 11356 -> 9650 bytes | |||
| -rw-r--r-- | tests/pcap/quic-29.pcapng | bin | 11356 -> 0 bytes | |||
| -rw-r--r-- | tests/result/quic-28.pcap.out | 8 | ||||
| -rw-r--r-- | tests/result/quic-29.pcap.out (renamed from tests/result/ietf_quic.pcap.out) | 0 |
7 files changed, 10 insertions, 2 deletions
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 Binary files differindex 733d665d7..e93354cea 100644 --- a/tests/pcap/quic-28.pcapng +++ b/tests/pcap/quic-28.pcap diff --git a/tests/pcap/ietf_quic.pcap b/tests/pcap/quic-29.pcap Binary files differindex c0034b2c9..4694660cd 100644 --- a/tests/pcap/ietf_quic.pcap +++ b/tests/pcap/quic-29.pcap diff --git a/tests/pcap/quic-29.pcapng b/tests/pcap/quic-29.pcapng Binary files differdeleted file mode 100644 index c0034b2c9..000000000 --- a/tests/pcap/quic-29.pcapng +++ /dev/null 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 index 5a1997a7c..5a1997a7c 100644 --- a/tests/result/ietf_quic.pcap.out +++ b/tests/result/quic-29.pcap.out |