Use more the EXTRACT_U_1() macro (40/n)

[tcpdump] / print-aoe.c

diff --git a/print-aoe.c b/print-aoe.c
index 02eda7d9b2a759a45ee4e79fdbc2f964e5fcbe96..75a67342d248af08063a84007de8e6cec914f307 100644 (file)
--- a/print-aoe.c
+++ b/print-aoe.c
@@ -1,8 +1,4 @@
 /*
- * This module implements decoding of the ATA over Ethernet (AoE) protocol
- * according to the following specification:
- * http://support.coraid.com/documents/AoEr11.txt
- *
  * Copyright (c) 2014 The TCPDUMP project
  * All rights reserved.
  *
@@ -29,11 +25,15 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+/* \summary: ATA over Ethernet (AoE) protocol printer */
+
+/* specification: http://brantleycoilecompany.com/AoEr11.pdf */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
 #include "netdissect.h"
 #include "extract.h"
@@ -41,7 +41,6 @@
 #include "ether.h"
 
 static const char tstr[] = " [|aoe]";
-static const char cstr[] = " (invalid)";
 
 #define AOE_V1 1
 #define ATA_SECTOR_SIZE 512
@@ -149,47 +148,47 @@ aoev1_issue_print(netdissect_options *ndo,
        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_TCHECK_1(cp);
+       ND_PRINT((ndo, "\n\tAFlags: [%s]", bittok2str(aoev1_aflag_str, "none", EXTRACT_U_1(cp))));
        cp += 1;
        /* Err/Feature */
-       ND_TCHECK2(*cp, 1);
-       ND_PRINT((ndo, ", Err/Feature: %u", *cp));
+       ND_TCHECK_1(cp);
+       ND_PRINT((ndo, ", Err/Feature: %u", EXTRACT_U_1(cp)));
        cp += 1;
        /* Sector Count (not correlated with the length) */
-       ND_TCHECK2(*cp, 1);
-       ND_PRINT((ndo, ", Sector Count: %u", *cp));
+       ND_TCHECK_1(cp);
+       ND_PRINT((ndo, ", Sector Count: %u", EXTRACT_U_1(cp)));
        cp += 1;
        /* Cmd/Status */
-       ND_TCHECK2(*cp, 1);
-       ND_PRINT((ndo, ", Cmd/Status: %u", *cp));
+       ND_TCHECK_1(cp);
+       ND_PRINT((ndo, ", Cmd/Status: %u", EXTRACT_U_1(cp)));
        cp += 1;
        /* lba0 */
-       ND_TCHECK2(*cp, 1);
-       ND_PRINT((ndo, "\n\tlba0: %u", *cp));
+       ND_TCHECK_1(cp);
+       ND_PRINT((ndo, "\n\tlba0: %u", EXTRACT_U_1(cp)));
        cp += 1;
        /* lba1 */
-       ND_TCHECK2(*cp, 1);
-       ND_PRINT((ndo, ", lba1: %u", *cp));
+       ND_TCHECK_1(cp);
+       ND_PRINT((ndo, ", lba1: %u", EXTRACT_U_1(cp)));
        cp += 1;
        /* lba2 */
-       ND_TCHECK2(*cp, 1);
-       ND_PRINT((ndo, ", lba2: %u", *cp));
+       ND_TCHECK_1(cp);
+       ND_PRINT((ndo, ", lba2: %u", EXTRACT_U_1(cp)));
        cp += 1;
        /* lba3 */
-       ND_TCHECK2(*cp, 1);
-       ND_PRINT((ndo, ", lba3: %u", *cp));
+       ND_TCHECK_1(cp);
+       ND_PRINT((ndo, ", lba3: %u", EXTRACT_U_1(cp)));
        cp += 1;
        /* lba4 */
-       ND_TCHECK2(*cp, 1);
-       ND_PRINT((ndo, ", lba4: %u", *cp));
+       ND_TCHECK_1(cp);
+       ND_PRINT((ndo, ", lba4: %u", EXTRACT_U_1(cp)));
        cp += 1;
        /* lba5 */
-       ND_TCHECK2(*cp, 1);
-       ND_PRINT((ndo, ", lba5: %u", *cp));
+       ND_TCHECK_1(cp);
+       ND_PRINT((ndo, ", lba5: %u", EXTRACT_U_1(cp)));
        cp += 1;
        /* Reserved */
-       ND_TCHECK2(*cp, 2);
+       ND_TCHECK_2(cp);
        cp += 2;
        /* Data */
        if (len > AOEV1_ISSUE_ARG_LEN)
@@ -197,7 +196,7 @@ aoev1_issue_print(netdissect_options *ndo,
        return;
 
 invalid:
-       ND_PRINT((ndo, "%s", cstr));
+       ND_PRINT((ndo, "%s", istr));
        ND_TCHECK2(*cp, ep - cp);
        return;
 trunc:
@@ -214,25 +213,25 @@ aoev1_query_print(netdissect_options *ndo,
        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_TCHECK_2(cp);
+       ND_PRINT((ndo, "\n\tBuffer Count: %u", EXTRACT_BE_U_2(cp)));
        cp += 2;
        /* Firmware Version */
-       ND_TCHECK2(*cp, 2);
-       ND_PRINT((ndo, ", Firmware Version: %u", EXTRACT_16BITS(cp)));
+       ND_TCHECK_2(cp);
+       ND_PRINT((ndo, ", Firmware Version: %u", EXTRACT_BE_U_2(cp)));
        cp += 2;
        /* Sector Count */
-       ND_TCHECK2(*cp, 1);
-       ND_PRINT((ndo, ", Sector Count: %u", *cp));
+       ND_TCHECK_1(cp);
+       ND_PRINT((ndo, ", Sector Count: %u", EXTRACT_U_1(cp)));
        cp += 1;
        /* 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_TCHECK_1(cp);
+       ND_PRINT((ndo, ", AoE: %u, CCmd: %s", (EXTRACT_U_1(cp) & 0xF0) >> 4,
+                 tok2str(aoev1_ccmd_str, "Unknown (0x02x)", EXTRACT_U_1(cp) & 0x0F)));
        cp += 1;
        /* Config String Length */
-       ND_TCHECK2(*cp, 2);
-       cslen = EXTRACT_16BITS(cp);
+       ND_TCHECK_2(cp);
+       cslen = EXTRACT_BE_U_2(cp);
        cp += 2;
        if (cslen > AOEV1_MAX_CONFSTR_LEN || AOEV1_QUERY_ARG_LEN + cslen > len)
                goto invalid;
@@ -246,7 +245,7 @@ aoev1_query_print(netdissect_options *ndo,
        return;
 
 invalid:
-       ND_PRINT((ndo, "%s", cstr));
+       ND_PRINT((ndo, "%s", istr));
        ND_TCHECK2(*cp, ep - cp);
        return;
 trunc:
@@ -263,18 +262,18 @@ aoev1_mac_print(netdissect_options *ndo,
        if (len < AOEV1_MAC_ARG_LEN)
                goto invalid;
        /* Reserved */
-       ND_TCHECK2(*cp, 1);
+       ND_TCHECK_1(cp);
        cp += 1;
        /* MCmd */
-       ND_TCHECK2(*cp, 1);
-       ND_PRINT((ndo, "\n\tMCmd: %s", tok2str(aoev1_mcmd_str, "Unknown (0x%02x)", *cp)));
+       ND_TCHECK_1(cp);
+       ND_PRINT((ndo, "\n\tMCmd: %s", tok2str(aoev1_mcmd_str, "Unknown (0x%02x)", EXTRACT_U_1(cp))));
        cp += 1;
        /* MError */
-       ND_TCHECK2(*cp, 1);
-       ND_PRINT((ndo, ", MError: %s", tok2str(aoev1_merror_str, "Unknown (0x%02x)", *cp)));
+       ND_TCHECK_1(cp);
+       ND_PRINT((ndo, ", MError: %s", tok2str(aoev1_merror_str, "Unknown (0x%02x)", EXTRACT_U_1(cp))));
        cp += 1;
        /* Dir Count */
-       ND_TCHECK2(*cp, 1);
+       ND_TCHECK_1(cp);
        dircount = *cp;
        cp += 1;
        ND_PRINT((ndo, ", Dir Count: %u", dircount));
@@ -283,11 +282,11 @@ aoev1_mac_print(netdissect_options *ndo,
        /* directives */
        for (i = 0; i < dircount; i++) {
                /* Reserved */
-               ND_TCHECK2(*cp, 1);
+               ND_TCHECK_1(cp);
                cp += 1;
                /* DCmd */
-               ND_TCHECK2(*cp, 1);
-               ND_PRINT((ndo, "\n\t DCmd: %s", tok2str(aoev1_dcmd_str, "Unknown (0x%02x)", *cp)));
+               ND_TCHECK_1(cp);
+               ND_PRINT((ndo, "\n\t DCmd: %s", tok2str(aoev1_dcmd_str, "Unknown (0x%02x)", EXTRACT_U_1(cp))));
                cp += 1;
                /* Ethernet Address */
                ND_TCHECK2(*cp, ETHER_ADDR_LEN);
@@ -297,7 +296,7 @@ aoev1_mac_print(netdissect_options *ndo,
        return;
 
 invalid:
-       ND_PRINT((ndo, "%s", cstr));
+       ND_PRINT((ndo, "%s", istr));
        ND_TCHECK2(*cp, ep - cp);
        return;
 trunc:
@@ -314,11 +313,11 @@ aoev1_reserve_print(netdissect_options *ndo,
        if (len < AOEV1_RESERVE_ARG_LEN || (len - AOEV1_RESERVE_ARG_LEN) % ETHER_ADDR_LEN)
                goto invalid;
        /* RCmd */
-       ND_TCHECK2(*cp, 1);
-       ND_PRINT((ndo, "\n\tRCmd: %s", tok2str(aoev1_rcmd_str, "Unknown (0x%02x)", *cp)));
+       ND_TCHECK_1(cp);
+       ND_PRINT((ndo, "\n\tRCmd: %s", tok2str(aoev1_rcmd_str, "Unknown (0x%02x)", EXTRACT_U_1(cp))));
        cp += 1;
        /* NMacs (correlated with the length) */
-       ND_TCHECK2(*cp, 1);
+       ND_TCHECK_1(cp);
        nmacs = *cp;
        cp += 1;
        ND_PRINT((ndo, ", NMacs: %u", nmacs));
@@ -332,7 +331,7 @@ aoev1_reserve_print(netdissect_options *ndo,
        return;
 
 invalid:
-       ND_PRINT((ndo, "%s", cstr));
+       ND_PRINT((ndo, "%s", istr));
        ND_TCHECK2(*cp, ep - cp);
        return;
 trunc:
@@ -351,32 +350,32 @@ aoev1_print(netdissect_options *ndo,
        if (len < AOEV1_COMMON_HDR_LEN)
                goto invalid;
        /* Flags */
-       flags = *cp & 0x0F;
+       flags = EXTRACT_U_1(cp) & 0x0F;
        ND_PRINT((ndo, ", Flags: [%s]", bittok2str(aoev1_flag_str, "none", flags)));
        cp += 1;
        if (! ndo->ndo_vflag)
                return;
        /* Error */
-       ND_TCHECK2(*cp, 1);
+       ND_TCHECK_1(cp);
        if (flags & AOEV1_FLAG_E)
-               ND_PRINT((ndo, "\n\tError: %s", tok2str(aoev1_errcode_str, "Invalid (%u)", *cp)));
+               ND_PRINT((ndo, "\n\tError: %s", tok2str(aoev1_errcode_str, "Invalid (%u)", EXTRACT_U_1(cp))));
        cp += 1;
        /* Major */
-       ND_TCHECK2(*cp, 2);
-       ND_PRINT((ndo, "\n\tMajor: 0x%04x", EXTRACT_16BITS(cp)));
+       ND_TCHECK_2(cp);
+       ND_PRINT((ndo, "\n\tMajor: 0x%04x", EXTRACT_BE_U_2(cp)));
        cp += 2;
        /* Minor */
-       ND_TCHECK2(*cp, 1);
-       ND_PRINT((ndo, ", Minor: 0x%02x", *cp));
+       ND_TCHECK_1(cp);
+       ND_PRINT((ndo, ", Minor: 0x%02x", EXTRACT_U_1(cp)));
        cp += 1;
        /* Command */
-       ND_TCHECK2(*cp, 1);
+       ND_TCHECK_1(cp);
        command = *cp;
        cp += 1;
        ND_PRINT((ndo, ", Command: %s", tok2str(cmdcode_str, "Unknown (0x%02x)", command)));
        /* Tag */
-       ND_TCHECK2(*cp, 4);
-       ND_PRINT((ndo, ", Tag: 0x%08x", EXTRACT_32BITS(cp)));
+       ND_TCHECK_4(cp);
+       ND_PRINT((ndo, ", Tag: 0x%08x", EXTRACT_BE_U_4(cp)));
        cp += 4;
        /* Arg */
        cmd_decoder =
@@ -390,7 +389,7 @@ aoev1_print(netdissect_options *ndo,
        return;
 
 invalid:
-       ND_PRINT((ndo, "%s", cstr));
+       ND_PRINT((ndo, "%s", istr));
        ND_TCHECK2(*cp, ep - cp);
        return;
 trunc:
@@ -409,8 +408,8 @@ aoe_print(netdissect_options *ndo,
        if (len < 1)
                goto invalid;
        /* Ver/Flags */
-       ND_TCHECK2(*cp, 1);
-       ver = (*cp & 0xF0) >> 4;
+       ND_TCHECK_1(cp);
+       ver = (EXTRACT_U_1(cp) & 0xF0) >> 4;
        /* Don't advance cp yet: low order 4 bits are version-specific. */
        ND_PRINT((ndo, ", Ver %u", ver));
 
@@ -422,7 +421,7 @@ aoe_print(netdissect_options *ndo,
        return;
 
 invalid:
-       ND_PRINT((ndo, "%s", cstr));
+       ND_PRINT((ndo, "%s", istr));
        ND_TCHECK2(*cp, ep - cp);
        return;
 trunc: