VQP: Do not print unknown error codes twice. [skip ci]

[tcpdump] / print-macsec.c

diff --git a/print-macsec.c b/print-macsec.c
index 431ae42c59fcbb6c70b658cc1ae9e492cd64a18b..607f696ef2654e7bcf6b0173f035e45afc1dc461 100644 (file)
--- a/print-macsec.c
+++ b/print-macsec.c
@@ -25,9 +25,7 @@
 #include <config.h>
 #endif
 
 #include <config.h>
 #endif
 

-#include <netdissect-stdinc.h>
-
-#include <string.h>
+#include "netdissect-stdinc.h"

 
 #include "netdissect.h"
 #include "addrtoname.h"
 
 #include "netdissect.h"
 #include "addrtoname.h"


@@ -104,7 +102,7 @@ static void macsec_print_header(netdissect_options *ndo,
 
        if (GET_U_1(sectag->tci_an) & MACSEC_TCI_SC)
                ND_PRINT(", sci " SCI_FMT, GET_BE_U_8(sectag->secure_channel_id));
 
        if (GET_U_1(sectag->tci_an) & MACSEC_TCI_SC)
                ND_PRINT(", sci " SCI_FMT, GET_BE_U_8(sectag->secure_channel_id));

-               
+

        ND_PRINT(", ");
 }
 
        ND_PRINT(", ");
 }
 


@@ -123,7 +121,7 @@ int macsec_print(netdissect_options *ndo, const u_char **bp,
        u_int short_length;
 
        save_protocol = ndo->ndo_protocol;
        u_int short_length;
 
        save_protocol = ndo->ndo_protocol;

-       ndo->ndo_protocol = "MACsec";
+       ndo->ndo_protocol = "macsec";

 
        /* we need the full MACsec header in the capture */
        if (caplen < MACSEC_SECTAG_LEN_NOSCI) {
 
        /* we need the full MACsec header in the capture */
        if (caplen < MACSEC_SECTAG_LEN_NOSCI) {


@@ -152,7 +150,7 @@ int macsec_print(netdissect_options *ndo, const u_char **bp,
        } else
                sectag_len = MACSEC_SECTAG_LEN_NOSCI;
 
        } else
                sectag_len = MACSEC_SECTAG_LEN_NOSCI;
 

-       if ((GET_U_1(sectag->short_length) & ~MACSEC_SL_MASK) != 0 || 
+       if ((GET_U_1(sectag->short_length) & ~MACSEC_SL_MASK) != 0 ||

            GET_U_1(sectag->tci_an) & MACSEC_TCI_VERSION) {
                nd_print_invalid(ndo);
                ndo->ndo_protocol = save_protocol;
            GET_U_1(sectag->tci_an) & MACSEC_TCI_VERSION) {
                nd_print_invalid(ndo);
                ndo->ndo_protocol = save_protocol;


@@ -219,6 +217,13 @@ int macsec_print(netdissect_options *ndo, const u_char **bp,
        }
        *lengthp -= MACSEC_DEFAULT_ICV_LEN;
        *caplenp -= MACSEC_DEFAULT_ICV_LEN;
        }
        *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
 
        /*
         * If the SL field is non-zero, then it's the length of the


@@ -245,7 +250,7 @@ int macsec_print(netdissect_options *ndo, const u_char **bp,
                if (*caplenp > short_length)
                        *caplenp = short_length;
        }
                if (*caplenp > short_length)
                        *caplenp = short_length;
        }

-               
+

        ndo->ndo_protocol = save_protocol;
        return -1;
 }
        ndo->ndo_protocol = save_protocol;
        return -1;
 }