Update some tests files if the packet time is > 2038-01-19 03:14:07 UTC

[tcpdump] / print-macsec.c

diff --git a/print-macsec.c b/print-macsec.c
index 3c34e12dc1da781a61d0986d062fbb639af8dea3..3945904f605fab188ba521296e409a817e195820 100644 (file)
--- a/print-macsec.c
+++ b/print-macsec.c
@@ -25,13 +25,10 @@
 #include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
-
-#include <string.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "addrtoname.h"
-#include "ethertype.h"
 #include "extract.h"
 
 #define MACSEC_DEFAULT_ICV_LEN 16
@@ -219,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