diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:52:31 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:52:31 +0000 |
| commit | 31cd589d20ba8d3d6b3fc4fccacc40d38a163c5d (patch) | |
| tree | 99d6c086833d530e5d1d33a8128961f8149843f0 /print-sflow.c | |
| parent | Adding upstream version 4.99.4. (diff) | |
| download | tcpdump-upstream.tar.xz tcpdump-upstream.zip | |
Adding upstream version 4.99.5.upstream/4.99.5upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'print-sflow.c')
| -rw-r--r-- | print-sflow.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/print-sflow.c b/print-sflow.c index f508ccc..22de02b 100644 --- a/print-sflow.c +++ b/print-sflow.c @@ -21,9 +21,7 @@ /* specification: https://sflow.org/developers/specifications.php */ -#ifdef HAVE_CONFIG_H #include <config.h> -#endif #include "netdissect-stdinc.h" @@ -690,7 +688,7 @@ sflow_print_flow_records(netdissect_options *ndo, sflow_flow_record = (const struct sflow_flow_record_t *)tptr; - /* so, the funky encoding means we cannot blythly mask-off + /* so, the funky encoding means we cannot blithely mask-off bits, we must also check the enterprise. */ enterprise = GET_BE_U_4(sflow_flow_record->format); @@ -876,7 +874,7 @@ sflow_print(netdissect_options *ndo, len); /* skip Common header */ - ND_LCHECK_ZU(tlen, sizeof(struct sflow_datagram_t)); + ND_ICHECK_ZU(tlen, <, sizeof(struct sflow_datagram_t)); tptr += sizeof(struct sflow_datagram_t); tlen -= sizeof(struct sflow_datagram_t); } else { @@ -892,7 +890,7 @@ sflow_print(netdissect_options *ndo, len); /* skip Common header */ - ND_LCHECK_ZU(tlen, sizeof(struct sflow_v6_datagram_t)); + ND_ICHECK_ZU(tlen, <, sizeof(struct sflow_v6_datagram_t)); tptr += sizeof(struct sflow_v6_datagram_t); tlen -= sizeof(struct sflow_v6_datagram_t); } |