X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/4e67f5b8391f7dc8be736611c5e5e5d35a2f5f1e..d27628f311b9afcf5ed6e4b0068e8ba6d6324b14:/print-macsec.c diff --git a/print-macsec.c b/print-macsec.c index d409ddbb..0cf8cd67 100644 --- a/print-macsec.c +++ b/print-macsec.c @@ -22,13 +22,11 @@ /* \summary: MACsec printer */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include -#include - #include "netdissect.h" #include "addrtoname.h" #include "ethertype.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)); - + 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; - ndo->ndo_protocol = "MACsec"; + ndo->ndo_protocol = "macsec"; /* 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; - 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; @@ -245,7 +243,7 @@ int macsec_print(netdissect_options *ndo, const u_char **bp, if (*caplenp > short_length) *caplenp = short_length; } - + ndo->ndo_protocol = save_protocol; return -1; }