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

[tcpdump] / print-aoe.c

diff --git a/print-aoe.c b/print-aoe.c
index 97b09f28a86e9f8ce7e4bbc22828080bc36acd80..0759ef38ef6cbad48cad11723b81ac784c8b9407 100644 (file)
--- a/print-aoe.c
+++ b/print-aoe.c
@@ -31,12 +31,11 @@
  * https://web.archive.org/web/20161025044402/http://brantleycoilecompany.com/AoEr11.pdf
  */
 
  * https://web.archive.org/web/20161025044402/http://brantleycoilecompany.com/AoEr11.pdf
  */
 

-#ifdef HAVE_CONFIG_H

 #include <config.h>
 #include <config.h>

-#endif

 
 #include "netdissect-stdinc.h"
 
 
 #include "netdissect-stdinc.h"
 

+#define ND_LONGJMP_FROM_TCHECK

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


@@ -71,8 +70,8 @@ static const struct tok cmdcode_str[] = {
 static const struct tok aoev1_flag_str[] = {
        { AOEV1_FLAG_R, "Response" },
        { AOEV1_FLAG_E, "Error"    },
 static const struct tok aoev1_flag_str[] = {
        { AOEV1_FLAG_R, "Response" },
        { AOEV1_FLAG_E, "Error"    },

-       { 0x02,         "MBZ-0x02" },
-       { 0x01,         "MBZ-0x01" },
+       { 0x02,         "MBZ-1"    },
+       { 0x01,         "MBZ-0"    },

        { 0, NULL }
 };
 
        { 0, NULL }
 };
 


@@ -91,13 +90,13 @@ static const struct tok aoev1_errcode_str[] = {
 #define AOEV1_AFLAG_A 0x02
 #define AOEV1_AFLAG_W 0x01
 
 #define AOEV1_AFLAG_A 0x02
 #define AOEV1_AFLAG_W 0x01
 

-static const struct tok aoev1_aflag_str[] = {
-       { 0x08,          "MBZ-0x08" },
+static const struct tok aoev1_aflag_bitmap_str[] = {
+       { 0x80,          "MBZ-7"    },

        { AOEV1_AFLAG_E, "Ext48"    },
        { AOEV1_AFLAG_E, "Ext48"    },

-       { 0x06,          "MBZ-0x06" },
+       { 0x20,          "MBZ-5"    },

        { AOEV1_AFLAG_D, "Device"   },
        { AOEV1_AFLAG_D, "Device"   },

-       { 0x04,          "MBZ-0x04" },
-       { 0x03,          "MBZ-0x03" },
+       { 0x08,          "MBZ-3"    },
+       { 0x04,          "MBZ-2"    },

        { AOEV1_AFLAG_A, "Async"    },
        { AOEV1_AFLAG_W, "Write"    },
        { 0, NULL }
        { AOEV1_AFLAG_A, "Async"    },
        { AOEV1_AFLAG_W, "Write"    },
        { 0, NULL }


@@ -141,217 +140,198 @@ static const struct tok aoev1_rcmd_str[] = {
 
 static void
 aoev1_issue_print(netdissect_options *ndo,
 
 static void
 aoev1_issue_print(netdissect_options *ndo,

-                  const u_char *cp, const u_int len)
+                  const u_char *cp, u_int len)

 {
 {

-       const u_char *ep = ndo->ndo_snapend;
-

        if (len < AOEV1_ISSUE_ARG_LEN)
                goto invalid;
        /* AFlags */
        if (len < AOEV1_ISSUE_ARG_LEN)
                goto invalid;
        /* AFlags */

-       ND_TCHECK_1(cp);

        ND_PRINT("\n\tAFlags: [%s]",
        ND_PRINT("\n\tAFlags: [%s]",

-                bittok2str(aoev1_aflag_str, "none", GET_U_1(cp)));
+                bittok2str(aoev1_aflag_bitmap_str, "none", GET_U_1(cp)));

        cp += 1;
        cp += 1;

+       len -= 1;

        /* Err/Feature */
        /* Err/Feature */

-       ND_TCHECK_1(cp);

        ND_PRINT(", Err/Feature: %u", GET_U_1(cp));
        cp += 1;
        ND_PRINT(", Err/Feature: %u", GET_U_1(cp));
        cp += 1;

+       len -= 1;

        /* Sector Count (not correlated with the length) */
        /* Sector Count (not correlated with the length) */

-       ND_TCHECK_1(cp);

        ND_PRINT(", Sector Count: %u", GET_U_1(cp));
        cp += 1;
        ND_PRINT(", Sector Count: %u", GET_U_1(cp));
        cp += 1;

+       len -= 1;

        /* Cmd/Status */
        /* Cmd/Status */

-       ND_TCHECK_1(cp);

        ND_PRINT(", Cmd/Status: %u", GET_U_1(cp));
        cp += 1;
        ND_PRINT(", Cmd/Status: %u", GET_U_1(cp));
        cp += 1;

+       len -= 1;

        /* lba0 */
        /* lba0 */

-       ND_TCHECK_1(cp);

        ND_PRINT("\n\tlba0: %u", GET_U_1(cp));
        cp += 1;
        ND_PRINT("\n\tlba0: %u", GET_U_1(cp));
        cp += 1;

+       len -= 1;

        /* lba1 */
        /* lba1 */

-       ND_TCHECK_1(cp);

        ND_PRINT(", lba1: %u", GET_U_1(cp));
        cp += 1;
        ND_PRINT(", lba1: %u", GET_U_1(cp));
        cp += 1;

+       len -= 1;

        /* lba2 */
        /* lba2 */

-       ND_TCHECK_1(cp);

        ND_PRINT(", lba2: %u", GET_U_1(cp));
        cp += 1;
        ND_PRINT(", lba2: %u", GET_U_1(cp));
        cp += 1;

+       len -= 1;

        /* lba3 */
        /* lba3 */

-       ND_TCHECK_1(cp);

        ND_PRINT(", lba3: %u", GET_U_1(cp));
        cp += 1;
        ND_PRINT(", lba3: %u", GET_U_1(cp));
        cp += 1;

+       len -= 1;

        /* lba4 */
        /* lba4 */

-       ND_TCHECK_1(cp);

        ND_PRINT(", lba4: %u", GET_U_1(cp));
        cp += 1;
        ND_PRINT(", lba4: %u", GET_U_1(cp));
        cp += 1;

+       len -= 1;

        /* lba5 */
        /* lba5 */

-       ND_TCHECK_1(cp);

        ND_PRINT(", lba5: %u", GET_U_1(cp));
        cp += 1;
        ND_PRINT(", lba5: %u", GET_U_1(cp));
        cp += 1;

+       len -= 1;

        /* Reserved */
        ND_TCHECK_2(cp);
        cp += 2;
        /* Reserved */
        ND_TCHECK_2(cp);
        cp += 2;

+       len -= 2;

        /* Data */
        /* Data */

-       if (len > AOEV1_ISSUE_ARG_LEN)
-               ND_PRINT("\n\tData: %u bytes", len - AOEV1_ISSUE_ARG_LEN);
+       if (len)
+               ND_PRINT("\n\tData: %u bytes", len);

        return;
 
 invalid:
        nd_print_invalid(ndo);
        return;
 
 invalid:
        nd_print_invalid(ndo);

-       ND_TCHECK_LEN(cp, ep - cp);
-       return;
-trunc:
-       nd_print_trunc(ndo);
+       ND_TCHECK_LEN(cp, len);

 }
 
 static void
 aoev1_query_print(netdissect_options *ndo,
 }
 
 static void
 aoev1_query_print(netdissect_options *ndo,

-                  const u_char *cp, const u_int len)
+                  const u_char *cp, u_int len)

 {
 {

-       const u_char *ep = ndo->ndo_snapend;

        uint16_t cslen;
 
        if (len < AOEV1_QUERY_ARG_LEN)
                goto invalid;
        /* Buffer Count */
        uint16_t cslen;
 
        if (len < AOEV1_QUERY_ARG_LEN)
                goto invalid;
        /* Buffer Count */

-       ND_TCHECK_2(cp);

        ND_PRINT("\n\tBuffer Count: %u", GET_BE_U_2(cp));
        cp += 2;
        ND_PRINT("\n\tBuffer Count: %u", GET_BE_U_2(cp));
        cp += 2;

+       len -= 2;

        /* Firmware Version */
        /* Firmware Version */

-       ND_TCHECK_2(cp);

        ND_PRINT(", Firmware Version: %u", GET_BE_U_2(cp));
        cp += 2;
        ND_PRINT(", Firmware Version: %u", GET_BE_U_2(cp));
        cp += 2;

+       len -= 2;

        /* Sector Count */
        /* Sector Count */

-       ND_TCHECK_1(cp);

        ND_PRINT(", Sector Count: %u", GET_U_1(cp));
        cp += 1;
        ND_PRINT(", Sector Count: %u", GET_U_1(cp));
        cp += 1;

+       len -= 1;

        /* AoE/CCmd */
        /* AoE/CCmd */

-       ND_TCHECK_1(cp);

        ND_PRINT(", AoE: %u, CCmd: %s", (GET_U_1(cp) & 0xF0) >> 4,
                  tok2str(aoev1_ccmd_str, "Unknown (0x02x)", GET_U_1(cp) & 0x0F));
        cp += 1;
        ND_PRINT(", AoE: %u, CCmd: %s", (GET_U_1(cp) & 0xF0) >> 4,
                  tok2str(aoev1_ccmd_str, "Unknown (0x02x)", GET_U_1(cp) & 0x0F));
        cp += 1;

+       len -= 1;

        /* Config String Length */
        /* Config String Length */

-       ND_TCHECK_2(cp);

        cslen = GET_BE_U_2(cp);
        cp += 2;
        cslen = GET_BE_U_2(cp);
        cp += 2;

-       if (cslen > AOEV1_MAX_CONFSTR_LEN || AOEV1_QUERY_ARG_LEN + cslen > len)
+       len -= 2;
+       if (cslen > AOEV1_MAX_CONFSTR_LEN || cslen > len)

                goto invalid;
        /* Config String */
        if (cslen) {
                goto invalid;
        /* Config String */
        if (cslen) {

-               ND_TCHECK_LEN(cp, cslen);

                ND_PRINT("\n\tConfig String (length %u): ", cslen);
                ND_PRINT("\n\tConfig String (length %u): ", cslen);

-               if (nd_printn(ndo, cp, cslen, ndo->ndo_snapend))
-                       goto trunc;
+               nd_printjn(ndo, cp, cslen);

        }
        return;
 
 invalid:
        nd_print_invalid(ndo);
        }
        return;
 
 invalid:
        nd_print_invalid(ndo);

-       ND_TCHECK_LEN(cp, ep - cp);
-       return;
-trunc:
-       nd_print_trunc(ndo);
+       ND_TCHECK_LEN(cp, len);

 }
 
 static void
 aoev1_mac_print(netdissect_options *ndo,
 }
 
 static void
 aoev1_mac_print(netdissect_options *ndo,

-                const u_char *cp, const u_int len)
+                const u_char *cp, u_int len)

 {
 {

-       const u_char *ep = ndo->ndo_snapend;

        uint8_t dircount, i;
 
        if (len < AOEV1_MAC_ARG_LEN)
                goto invalid;
        /* Reserved */
        uint8_t dircount, i;
 
        if (len < AOEV1_MAC_ARG_LEN)
                goto invalid;
        /* Reserved */

-       ND_TCHECK_1(cp);

        cp += 1;
        cp += 1;

+       len -= 1;

        /* MCmd */
        /* MCmd */

-       ND_TCHECK_1(cp);

        ND_PRINT("\n\tMCmd: %s",
                 tok2str(aoev1_mcmd_str, "Unknown (0x%02x)", GET_U_1(cp)));
        cp += 1;
        ND_PRINT("\n\tMCmd: %s",
                 tok2str(aoev1_mcmd_str, "Unknown (0x%02x)", GET_U_1(cp)));
        cp += 1;

+       len -= 1;

        /* MError */
        /* MError */

-       ND_TCHECK_1(cp);

        ND_PRINT(", MError: %s",
                 tok2str(aoev1_merror_str, "Unknown (0x%02x)", GET_U_1(cp)));
        cp += 1;
        ND_PRINT(", MError: %s",
                 tok2str(aoev1_merror_str, "Unknown (0x%02x)", GET_U_1(cp)));
        cp += 1;

+       len -= 1;

        /* Dir Count */
        /* Dir Count */

-       ND_TCHECK_1(cp);

        dircount = GET_U_1(cp);
        cp += 1;
        dircount = GET_U_1(cp);
        cp += 1;

+       len -= 1;

        ND_PRINT(", Dir Count: %u", dircount);
        ND_PRINT(", Dir Count: %u", dircount);

-       if (AOEV1_MAC_ARG_LEN + dircount * 8 > len)
+       if (dircount * 8U > len)

                goto invalid;
        /* directives */
        for (i = 0; i < dircount; i++) {
                /* Reserved */
                goto invalid;
        /* directives */
        for (i = 0; i < dircount; i++) {
                /* Reserved */

-               ND_TCHECK_1(cp);

                cp += 1;
                cp += 1;

+               len -= 1;

                /* DCmd */
                /* DCmd */

-               ND_TCHECK_1(cp);

                ND_PRINT("\n\t DCmd: %s",
                         tok2str(aoev1_dcmd_str, "Unknown (0x%02x)", GET_U_1(cp)));
                cp += 1;
                ND_PRINT("\n\t DCmd: %s",
                         tok2str(aoev1_dcmd_str, "Unknown (0x%02x)", GET_U_1(cp)));
                cp += 1;

+               len -= 1;

                /* Ethernet Address */
                /* Ethernet Address */

-               ND_TCHECK_LEN(cp, MAC_ADDR_LEN);
-               ND_PRINT(", Ethernet Address: %s", GET_ETHERADDR_STRING(cp));
-               cp += MAC_ADDR_LEN;
+               ND_PRINT(", Ethernet Address: %s", GET_MAC48_STRING(cp));
+               cp += MAC48_LEN;
+               len -= MAC48_LEN;

        }
        return;
 
 invalid:
        nd_print_invalid(ndo);
        }
        return;
 
 invalid:
        nd_print_invalid(ndo);

-       ND_TCHECK_LEN(cp, ep - cp);
-       return;
-trunc:
-       nd_print_trunc(ndo);
+       ND_TCHECK_LEN(cp, len);

 }
 
 static void
 aoev1_reserve_print(netdissect_options *ndo,
 }
 
 static void
 aoev1_reserve_print(netdissect_options *ndo,

-                    const u_char *cp, const u_int len)
+                    const u_char *cp, u_int len)

 {
 {

-       const u_char *ep = ndo->ndo_snapend;

        uint8_t nmacs, i;
 
        uint8_t nmacs, i;
 

-       if (len < AOEV1_RESERVE_ARG_LEN || (len - AOEV1_RESERVE_ARG_LEN) % MAC_ADDR_LEN)
+       if (len < AOEV1_RESERVE_ARG_LEN || (len - AOEV1_RESERVE_ARG_LEN) % MAC48_LEN)

                goto invalid;
        /* RCmd */
                goto invalid;
        /* RCmd */

-       ND_TCHECK_1(cp);

        ND_PRINT("\n\tRCmd: %s",
                 tok2str(aoev1_rcmd_str, "Unknown (0x%02x)", GET_U_1(cp)));
        cp += 1;
        ND_PRINT("\n\tRCmd: %s",
                 tok2str(aoev1_rcmd_str, "Unknown (0x%02x)", GET_U_1(cp)));
        cp += 1;

+       len -= 1;

        /* NMacs (correlated with the length) */
        /* NMacs (correlated with the length) */

-       ND_TCHECK_1(cp);

        nmacs = GET_U_1(cp);
        cp += 1;
        nmacs = GET_U_1(cp);
        cp += 1;

+       len -= 1;

        ND_PRINT(", NMacs: %u", nmacs);
        ND_PRINT(", NMacs: %u", nmacs);

-       if (AOEV1_RESERVE_ARG_LEN + nmacs * MAC_ADDR_LEN != len)
+       if (nmacs * MAC48_LEN != len)

                goto invalid;
        /* addresses */
        for (i = 0; i < nmacs; i++) {
                goto invalid;
        /* addresses */
        for (i = 0; i < nmacs; i++) {

-               ND_TCHECK_LEN(cp, MAC_ADDR_LEN);
-               ND_PRINT("\n\tEthernet Address %u: %s", i, GET_ETHERADDR_STRING(cp));
-               cp += MAC_ADDR_LEN;
+               ND_PRINT("\n\tEthernet Address %u: %s", i, GET_MAC48_STRING(cp));
+               cp += MAC48_LEN;
+               len -= MAC48_LEN;

        }
        return;
 
 invalid:
        nd_print_invalid(ndo);
        }
        return;
 
 invalid:
        nd_print_invalid(ndo);

-       ND_TCHECK_LEN(cp, ep - cp);
-       return;
-trunc:
-       nd_print_trunc(ndo);
+       ND_TCHECK_LEN(cp, len);

 }
 
 /* cp points to the Ver/Flags octet */
 static void
 aoev1_print(netdissect_options *ndo,
 }
 
 /* cp points to the Ver/Flags octet */
 static void
 aoev1_print(netdissect_options *ndo,

-            const u_char *cp, const u_int len)
+            const u_char *cp, u_int len)

 {
 {

-       const u_char *ep = ndo->ndo_snapend;

        uint8_t flags, command;
        uint8_t flags, command;

-       void (*cmd_decoder)(netdissect_options *, const u_char *, const u_int);
+       void (*cmd_decoder)(netdissect_options *, const u_char *, u_int);

 
        if (len < AOEV1_COMMON_HDR_LEN)
                goto invalid;
 
        if (len < AOEV1_COMMON_HDR_LEN)
                goto invalid;


@@ -359,31 +339,32 @@ aoev1_print(netdissect_options *ndo,
        flags = GET_U_1(cp) & 0x0F;
        ND_PRINT(", Flags: [%s]", bittok2str(aoev1_flag_str, "none", flags));
        cp += 1;
        flags = GET_U_1(cp) & 0x0F;
        ND_PRINT(", Flags: [%s]", bittok2str(aoev1_flag_str, "none", flags));
        cp += 1;

+       len -= 1;

        if (! ndo->ndo_vflag)
                return;
        /* Error */
        if (! ndo->ndo_vflag)
                return;
        /* Error */

-       ND_TCHECK_1(cp);

        if (flags & AOEV1_FLAG_E)
                ND_PRINT("\n\tError: %s",
                         tok2str(aoev1_errcode_str, "Invalid (%u)", GET_U_1(cp)));
        cp += 1;
        if (flags & AOEV1_FLAG_E)
                ND_PRINT("\n\tError: %s",
                         tok2str(aoev1_errcode_str, "Invalid (%u)", GET_U_1(cp)));
        cp += 1;

+       len -= 1;

        /* Major */
        /* Major */

-       ND_TCHECK_2(cp);

        ND_PRINT("\n\tMajor: 0x%04x", GET_BE_U_2(cp));
        cp += 2;
        ND_PRINT("\n\tMajor: 0x%04x", GET_BE_U_2(cp));
        cp += 2;

+       len -= 2;

        /* Minor */
        /* Minor */

-       ND_TCHECK_1(cp);

        ND_PRINT(", Minor: 0x%02x", GET_U_1(cp));
        cp += 1;
        ND_PRINT(", Minor: 0x%02x", GET_U_1(cp));
        cp += 1;

+       len -= 1;

        /* Command */
        /* Command */

-       ND_TCHECK_1(cp);

        command = GET_U_1(cp);
        cp += 1;
        command = GET_U_1(cp);
        cp += 1;

+       len -= 1;

        ND_PRINT(", Command: %s", tok2str(cmdcode_str, "Unknown (0x%02x)", command));
        /* Tag */
        ND_PRINT(", Command: %s", tok2str(cmdcode_str, "Unknown (0x%02x)", command));
        /* Tag */

-       ND_TCHECK_4(cp);

        ND_PRINT(", Tag: 0x%08x", GET_BE_U_4(cp));
        cp += 4;
        ND_PRINT(", Tag: 0x%08x", GET_BE_U_4(cp));
        cp += 4;

+       len -= 4;

        /* Arg */
        cmd_decoder =
                command == AOEV1_CMD_ISSUE_ATA_COMMAND        ? aoev1_issue_print :
        /* Arg */
        cmd_decoder =
                command == AOEV1_CMD_ISSUE_ATA_COMMAND        ? aoev1_issue_print :


@@ -392,22 +373,18 @@ aoev1_print(netdissect_options *ndo,
                command == AOEV1_CMD_RESERVE_RELEASE          ? aoev1_reserve_print :
                NULL;
        if (cmd_decoder != NULL)
                command == AOEV1_CMD_RESERVE_RELEASE          ? aoev1_reserve_print :
                NULL;
        if (cmd_decoder != NULL)

-               cmd_decoder(ndo, cp, len - AOEV1_COMMON_HDR_LEN);
+               cmd_decoder(ndo, cp, len);

        return;
 
 invalid:
        nd_print_invalid(ndo);
        return;
 
 invalid:
        nd_print_invalid(ndo);

-       ND_TCHECK_LEN(cp, ep - cp);
-       return;
-trunc:
-       nd_print_trunc(ndo);
+       ND_TCHECK_LEN(cp, len);

 }
 
 void
 aoe_print(netdissect_options *ndo,
           const u_char *cp, const u_int len)
 {
 }
 
 void
 aoe_print(netdissect_options *ndo,
           const u_char *cp, const u_int len)
 {

-       const u_char *ep = ndo->ndo_snapend;

        uint8_t ver;
 
        ndo->ndo_protocol = "aoe";
        uint8_t ver;
 
        ndo->ndo_protocol = "aoe";


@@ -416,7 +393,6 @@ aoe_print(netdissect_options *ndo,
        if (len < 1)
                goto invalid;
        /* Ver/Flags */
        if (len < 1)
                goto invalid;
        /* Ver/Flags */

-       ND_TCHECK_1(cp);

        ver = (GET_U_1(cp) & 0xF0) >> 4;
        /* Don't advance cp yet: low order 4 bits are version-specific. */
        ND_PRINT(", Ver %u", ver);
        ver = (GET_U_1(cp) & 0xF0) >> 4;
        /* Don't advance cp yet: low order 4 bits are version-specific. */
        ND_PRINT(", Ver %u", ver);


@@ -430,9 +406,6 @@ aoe_print(netdissect_options *ndo,
 
 invalid:
        nd_print_invalid(ndo);
 
 invalid:
        nd_print_invalid(ndo);

-       ND_TCHECK_LEN(cp, ep - cp);
-       return;
-trunc:
-       nd_print_trunc(ndo);
+       ND_TCHECK_LEN(cp, len);

 }
 
 }