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 97e93df2eab545f04deda9fd32bddce59d92cb4a..0759ef38ef6cbad48cad11723b81ac784c8b9407 100644 (file)
--- a/print-aoe.c
+++ b/print-aoe.c
@@ -27,20 +27,19 @@
 
 /* \summary: ATA over Ethernet (AoE) protocol printer */
 
 
 /* \summary: ATA over Ethernet (AoE) protocol printer */
 

-/* specification: http://brantleycoilecompany.com/AoEr11.pdf */
+/* specification:
+ * https://web.archive.org/web/20161025044402/http://brantleycoilecompany.com/AoEr11.pdf
+ */

 
 

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

 
 

-#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"

-#include "ether.h"

 
 

-static const char tstr[] = " [|aoe]";

 
 #define AOE_V1 1
 #define ATA_SECTOR_SIZE 512
 
 #define AOE_V1 1
 #define ATA_SECTOR_SIZE 512


@@ -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,242 +140,231 @@ 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 = cp + len;
-

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

-       ND_TCHECK2(*cp, 1);
-       ND_PRINT((ndo, "\n\tAFlags: [%s]", bittok2str(aoev1_aflag_str, "none", *cp)));
+       ND_PRINT("\n\tAFlags: [%s]",
+                bittok2str(aoev1_aflag_bitmap_str, "none", GET_U_1(cp)));

        cp += 1;
        cp += 1;

+       len -= 1;

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

-       ND_TCHECK2(*cp, 1);
-       ND_PRINT((ndo, ", Err/Feature: %u", *cp));
+       ND_PRINT(", Err/Feature: %u", GET_U_1(cp));

        cp += 1;
        cp += 1;

+       len -= 1;

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

-       ND_TCHECK2(*cp, 1);
-       ND_PRINT((ndo, ", Sector Count: %u", *cp));
+       ND_PRINT(", Sector Count: %u", GET_U_1(cp));

        cp += 1;
        cp += 1;

+       len -= 1;

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

-       ND_TCHECK2(*cp, 1);
-       ND_PRINT((ndo, ", Cmd/Status: %u", *cp));
+       ND_PRINT(", Cmd/Status: %u", GET_U_1(cp));

        cp += 1;
        cp += 1;

+       len -= 1;

        /* lba0 */
        /* lba0 */

-       ND_TCHECK2(*cp, 1);
-       ND_PRINT((ndo, "\n\tlba0: %u", *cp));
+       ND_PRINT("\n\tlba0: %u", GET_U_1(cp));

        cp += 1;
        cp += 1;

+       len -= 1;

        /* lba1 */
        /* lba1 */

-       ND_TCHECK2(*cp, 1);
-       ND_PRINT((ndo, ", lba1: %u", *cp));
+       ND_PRINT(", lba1: %u", GET_U_1(cp));

        cp += 1;
        cp += 1;

+       len -= 1;

        /* lba2 */
        /* lba2 */

-       ND_TCHECK2(*cp, 1);
-       ND_PRINT((ndo, ", lba2: %u", *cp));
+       ND_PRINT(", lba2: %u", GET_U_1(cp));

        cp += 1;
        cp += 1;

+       len -= 1;

        /* lba3 */
        /* lba3 */

-       ND_TCHECK2(*cp, 1);
-       ND_PRINT((ndo, ", lba3: %u", *cp));
+       ND_PRINT(", lba3: %u", GET_U_1(cp));

        cp += 1;
        cp += 1;

+       len -= 1;

        /* lba4 */
        /* lba4 */

-       ND_TCHECK2(*cp, 1);
-       ND_PRINT((ndo, ", lba4: %u", *cp));
+       ND_PRINT(", lba4: %u", GET_U_1(cp));

        cp += 1;
        cp += 1;

+       len -= 1;

        /* lba5 */
        /* lba5 */

-       ND_TCHECK2(*cp, 1);
-       ND_PRINT((ndo, ", lba5: %u", *cp));
+       ND_PRINT(", lba5: %u", GET_U_1(cp));

        cp += 1;
        cp += 1;

+       len -= 1;

        /* Reserved */
        /* Reserved */

-       ND_TCHECK2(*cp, 2);
+       ND_TCHECK_2(cp);

        cp += 2;
        cp += 2;

+       len -= 2;

        /* Data */
        /* Data */

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

        return;
 
 invalid:
        return;
 
 invalid:

-       ND_PRINT((ndo, "%s", istr));
-       ND_TCHECK2(*cp, ep - cp);
-       return;
-trunc:
-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_invalid(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 = cp + len;

        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_TCHECK2(*cp, 2);
-       ND_PRINT((ndo, "\n\tBuffer Count: %u", EXTRACT_16BITS(cp)));
+       ND_PRINT("\n\tBuffer Count: %u", GET_BE_U_2(cp));

        cp += 2;
        cp += 2;

+       len -= 2;

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

-       ND_TCHECK2(*cp, 2);
-       ND_PRINT((ndo, ", Firmware Version: %u", EXTRACT_16BITS(cp)));
+       ND_PRINT(", Firmware Version: %u", GET_BE_U_2(cp));

        cp += 2;
        cp += 2;

+       len -= 2;

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

-       ND_TCHECK2(*cp, 1);
-       ND_PRINT((ndo, ", Sector Count: %u", *cp));
+       ND_PRINT(", Sector Count: %u", GET_U_1(cp));

        cp += 1;
        cp += 1;

+       len -= 1;

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

-       ND_TCHECK2(*cp, 1);
-       ND_PRINT((ndo, ", AoE: %u, CCmd: %s", (*cp & 0xF0) >> 4,
-                 tok2str(aoev1_ccmd_str, "Unknown (0x02x)", *cp & 0x0F)));
+       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;
        cp += 1;

+       len -= 1;

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

-       ND_TCHECK2(*cp, 2);
-       cslen = EXTRACT_16BITS(cp);
+       cslen = GET_BE_U_2(cp);

        cp += 2;
        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 */
                goto invalid;
        /* Config String */

-       ND_TCHECK2(*cp, cslen);

        if (cslen) {
        if (cslen) {

-               ND_PRINT((ndo, "\n\tConfig String (length %u): ", cslen));
-               if (fn_printn(ndo, cp, cslen, ndo->ndo_snapend))
-                       goto trunc;
+               ND_PRINT("\n\tConfig String (length %u): ", cslen);
+               nd_printjn(ndo, cp, cslen);

        }
        return;
 
 invalid:
        }
        return;
 
 invalid:

-       ND_PRINT((ndo, "%s", istr));
-       ND_TCHECK2(*cp, ep - cp);
-       return;
-trunc:
-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_invalid(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 = cp + len;

        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_TCHECK2(*cp, 1);

        cp += 1;
        cp += 1;

+       len -= 1;

        /* MCmd */
        /* MCmd */

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

        cp += 1;
        cp += 1;

+       len -= 1;

        /* MError */
        /* MError */

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

        cp += 1;
        cp += 1;

+       len -= 1;

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

-       ND_TCHECK2(*cp, 1);
-       dircount = *cp;
+       dircount = GET_U_1(cp);

        cp += 1;
        cp += 1;

-       ND_PRINT((ndo, ", Dir Count: %u", dircount));
-       if (AOEV1_MAC_ARG_LEN + dircount * 8 > len)
+       len -= 1;
+       ND_PRINT(", Dir Count: %u", dircount);
+       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_TCHECK2(*cp, 1);

                cp += 1;
                cp += 1;

+               len -= 1;

                /* DCmd */
                /* DCmd */

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

                cp += 1;
                cp += 1;

+               len -= 1;

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

-               ND_TCHECK2(*cp, ETHER_ADDR_LEN);
-               ND_PRINT((ndo, ", Ethernet Address: %s", etheraddr_string(ndo, cp)));
-               cp += ETHER_ADDR_LEN;
+               ND_PRINT(", Ethernet Address: %s", GET_MAC48_STRING(cp));
+               cp += MAC48_LEN;
+               len -= MAC48_LEN;

        }
        return;
 
 invalid:
        }
        return;
 
 invalid:

-       ND_PRINT((ndo, "%s", istr));
-       ND_TCHECK2(*cp, ep - cp);
-       return;
-trunc:
-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_invalid(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 = cp + len;

        uint8_t nmacs, i;
 
        uint8_t nmacs, i;
 

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

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

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

        cp += 1;
        cp += 1;

+       len -= 1;

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

-       ND_TCHECK2(*cp, 1);
-       nmacs = *cp;
+       nmacs = GET_U_1(cp);

        cp += 1;
        cp += 1;

-       ND_PRINT((ndo, ", NMacs: %u", nmacs));
-       if (AOEV1_RESERVE_ARG_LEN + nmacs * ETHER_ADDR_LEN != len)
+       len -= 1;
+       ND_PRINT(", NMacs: %u", nmacs);
+       if (nmacs * MAC48_LEN != len)

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

-               ND_PRINT((ndo, "\n\tEthernet Address %u: %s", i, etheraddr_string(ndo, cp)));
-               cp += ETHER_ADDR_LEN;
+               ND_PRINT("\n\tEthernet Address %u: %s", i, GET_MAC48_STRING(cp));
+               cp += MAC48_LEN;
+               len -= MAC48_LEN;

        }
        return;
 
 invalid:
        }
        return;
 
 invalid:

-       ND_PRINT((ndo, "%s", istr));
-       ND_TCHECK2(*cp, ep - cp);
-       return;
-trunc:
-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_invalid(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 = cp + len;

        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;
        /* Flags */
 
        if (len < AOEV1_COMMON_HDR_LEN)
                goto invalid;
        /* Flags */

-       flags = *cp & 0x0F;
-       ND_PRINT((ndo, ", Flags: [%s]", bittok2str(aoev1_flag_str, "none", flags)));
+       flags = GET_U_1(cp) & 0x0F;
+       ND_PRINT(", Flags: [%s]", bittok2str(aoev1_flag_str, "none", flags));

        cp += 1;
        cp += 1;

+       len -= 1;

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

-       ND_TCHECK2(*cp, 1);

        if (flags & AOEV1_FLAG_E)
        if (flags & AOEV1_FLAG_E)

-               ND_PRINT((ndo, "\n\tError: %s", tok2str(aoev1_errcode_str, "Invalid (%u)", *cp)));
+               ND_PRINT("\n\tError: %s",
+                        tok2str(aoev1_errcode_str, "Invalid (%u)", GET_U_1(cp)));

        cp += 1;
        cp += 1;

+       len -= 1;

        /* Major */
        /* Major */

-       ND_TCHECK2(*cp, 2);
-       ND_PRINT((ndo, "\n\tMajor: 0x%04x", EXTRACT_16BITS(cp)));
+       ND_PRINT("\n\tMajor: 0x%04x", GET_BE_U_2(cp));

        cp += 2;
        cp += 2;

+       len -= 2;

        /* Minor */
        /* Minor */

-       ND_TCHECK2(*cp, 1);
-       ND_PRINT((ndo, ", Minor: 0x%02x", *cp));
+       ND_PRINT(", Minor: 0x%02x", GET_U_1(cp));

        cp += 1;
        cp += 1;

+       len -= 1;

        /* Command */
        /* Command */

-       ND_TCHECK2(*cp, 1);
-       command = *cp;
+       command = GET_U_1(cp);

        cp += 1;
        cp += 1;

-       ND_PRINT((ndo, ", Command: %s", tok2str(cmdcode_str, "Unknown (0x%02x)", command)));
+       len -= 1;
+       ND_PRINT(", Command: %s", tok2str(cmdcode_str, "Unknown (0x%02x)", command));

        /* Tag */
        /* Tag */

-       ND_TCHECK2(*cp, 4);
-       ND_PRINT((ndo, ", Tag: 0x%08x", EXTRACT_32BITS(cp)));
+       ND_PRINT(", Tag: 0x%08x", GET_BE_U_4(cp));

        cp += 4;
        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 :


@@ -385,33 +373,29 @@ 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:
        return;
 
 invalid:

-       ND_PRINT((ndo, "%s", istr));
-       ND_TCHECK2(*cp, ep - cp);
-       return;
-trunc:
-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_invalid(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 = cp + len;

        uint8_t ver;
 
        uint8_t ver;
 

-       ND_PRINT((ndo, "AoE length %u", len));
+       ndo->ndo_protocol = "aoe";
+       ND_PRINT("AoE length %u", len);

 
        if (len < 1)
                goto invalid;
        /* Ver/Flags */
 
        if (len < 1)
                goto invalid;
        /* Ver/Flags */

-       ND_TCHECK2(*cp, 1);
-       ver = (*cp & 0xF0) >> 4;
+       ver = (GET_U_1(cp) & 0xF0) >> 4;

        /* Don't advance cp yet: low order 4 bits are version-specific. */
        /* Don't advance cp yet: low order 4 bits are version-specific. */

-       ND_PRINT((ndo, ", Ver %u", ver));
+       ND_PRINT(", Ver %u", ver);

 
        switch (ver) {
                case AOE_V1:
 
        switch (ver) {
                case AOE_V1:


@@ -421,10 +405,7 @@ aoe_print(netdissect_options *ndo,
        return;
 
 invalid:
        return;
 
 invalid:

-       ND_PRINT((ndo, "%s", istr));
-       ND_TCHECK2(*cp, ep - cp);
-       return;
-trunc:
-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_invalid(ndo);
+       ND_TCHECK_LEN(cp, len);

 }
 
 }