EIGRP: Modernize packet parsing style.

[tcpdump] / print-macsec.c

diff --git a/print-macsec.c b/print-macsec.c
index 431ae42c59fcbb6c70b658cc1ae9e492cd64a18b..0cf8cd67385987a47d3de2e5cc821b55bb7a5767 100644 (file)
--- a/print-macsec.c
+++ b/print-macsec.c
@@ -27,8 +27,6 @@
 
 #include <netdissect-stdinc.h>
 
-#include <string.h>
-
 #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;
 }