CI: Add warning exemptions for Sun C (suncc-5.14) on Solaris 10

[tcpdump] / print-macsec.c

diff --git a/print-macsec.c b/print-macsec.c
index d409ddbb1a957f9eb1bb40481a1c78e6175d0869..5fca392279451252eee6f2d43a73d672a03466cc 100644 (file)
--- a/print-macsec.c
+++ b/print-macsec.c
@@ -21,17 +21,12 @@
 
 /* \summary: MACsec printer */
 
 
 /* \summary: MACsec printer */
 

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>

 
 

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

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

-#include "ethertype.h"

 #include "extract.h"
 
 #define MACSEC_DEFAULT_ICV_LEN 16
 #include "extract.h"
 
 #define MACSEC_DEFAULT_ICV_LEN 16


@@ -89,9 +84,10 @@ static const struct tok macsec_flag_values[] = {
        { 0, NULL }
 };
 
        { 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,
 {
        ND_PRINT("an %u, pn %u, flags %s",
                 GET_U_1(sectag->tci_an) & MACSEC_AN_MASK,


@@ -104,14 +100,15 @@ 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(", ");
 }
 
 /* returns < 0 iff the packet can be decoded completely */
        ND_PRINT(", ");
 }
 
 /* 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;
 {
        const char *save_protocol;
        const u_char *p = *bp;


@@ -123,7 +120,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 +149,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 +216,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 +249,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;
 }