X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/f49e6a51f99c93fd9236658f848e01858edcc7e3..HEAD:/print-macsec.c

diff --git a/print-macsec.c b/print-macsec.c
index 0cf8cd67..5fca3922 100644
--- a/print-macsec.c
+++ b/print-macsec.c
@@ -21,15 +21,12 @@
 
 /* \summary: MACsec printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "addrtoname.h"
-#include "ethertype.h"
 #include "extract.h"
 
 #define MACSEC_DEFAULT_ICV_LEN 16
@@ -87,9 +84,10 @@ static const struct tok macsec_flag_values[] = {
 	{ 0, NULL }
 };
 
-static void macsec_print_header(netdissect_options *ndo,
-				const struct macsec_sectag *sectag,
-				u_int short_length)
+static void
+macsec_print_header(netdissect_options *ndo,
+		    const struct macsec_sectag *sectag,
+		    u_int short_length)
 {
 	ND_PRINT("an %u, pn %u, flags %s",
 		 GET_U_1(sectag->tci_an) & MACSEC_AN_MASK,
@@ -107,9 +105,10 @@ static void macsec_print_header(netdissect_options *ndo,
 }
 
 /* returns < 0 iff the packet can be decoded completely */
-int macsec_print(netdissect_options *ndo, const u_char **bp,
-		 u_int *lengthp, u_int *caplenp, u_int *hdrlenp,
-		 const struct lladdr_info *src, const struct lladdr_info *dst)
+int
+macsec_print(netdissect_options *ndo, const u_char **bp,
+	     u_int *lengthp, u_int *caplenp, u_int *hdrlenp,
+	     const struct lladdr_info *src, const struct lladdr_info *dst)
 {
 	const char *save_protocol;
 	const u_char *p = *bp;
@@ -217,6 +216,13 @@ int macsec_print(netdissect_options *ndo, const u_char **bp,
 	}
 	*lengthp -= MACSEC_DEFAULT_ICV_LEN;
 	*caplenp -= MACSEC_DEFAULT_ICV_LEN;
+	/*
+	 * Update the snapend thus the ICV field is not in the payload for
+	 * the caller.
+	 * The ICV (Integrity Check Value) is at the end of the frame, after
+	 * the secure data.
+	 */
+	ndo->ndo_snapend -= MACSEC_DEFAULT_ICV_LEN;
 
 	/*
 	 * If the SL field is non-zero, then it's the length of the