diff options
Diffstat (limited to 'print-aoe.c')
| -rw-r--r-- | print-aoe.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/print-aoe.c b/print-aoe.c index 97b09f28..0915f3af 100644 --- a/print-aoe.c +++ b/print-aoe.c @@ -148,44 +148,34 @@ aoev1_issue_print(netdissect_options *ndo, if (len < AOEV1_ISSUE_ARG_LEN) goto invalid; /* AFlags */ - ND_TCHECK_1(cp); ND_PRINT("\n\tAFlags: [%s]", bittok2str(aoev1_aflag_str, "none", GET_U_1(cp))); cp += 1; /* Err/Feature */ - ND_TCHECK_1(cp); ND_PRINT(", Err/Feature: %u", GET_U_1(cp)); cp += 1; /* Sector Count (not correlated with the length) */ - ND_TCHECK_1(cp); ND_PRINT(", Sector Count: %u", GET_U_1(cp)); cp += 1; /* Cmd/Status */ - ND_TCHECK_1(cp); ND_PRINT(", Cmd/Status: %u", GET_U_1(cp)); cp += 1; /* lba0 */ - ND_TCHECK_1(cp); ND_PRINT("\n\tlba0: %u", GET_U_1(cp)); cp += 1; /* lba1 */ - ND_TCHECK_1(cp); ND_PRINT(", lba1: %u", GET_U_1(cp)); cp += 1; /* lba2 */ - ND_TCHECK_1(cp); ND_PRINT(", lba2: %u", GET_U_1(cp)); cp += 1; /* lba3 */ - ND_TCHECK_1(cp); ND_PRINT(", lba3: %u", GET_U_1(cp)); cp += 1; /* lba4 */ - ND_TCHECK_1(cp); ND_PRINT(", lba4: %u", GET_U_1(cp)); cp += 1; /* lba5 */ - ND_TCHECK_1(cp); ND_PRINT(", lba5: %u", GET_U_1(cp)); cp += 1; /* Reserved */ @@ -214,24 +204,19 @@ aoev1_query_print(netdissect_options *ndo, 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; /* Firmware Version */ - ND_TCHECK_2(cp); ND_PRINT(", Firmware Version: %u", GET_BE_U_2(cp)); cp += 2; /* Sector Count */ - ND_TCHECK_1(cp); ND_PRINT(", Sector Count: %u", GET_U_1(cp)); cp += 1; /* 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; /* Config String Length */ - ND_TCHECK_2(cp); cslen = GET_BE_U_2(cp); cp += 2; if (cslen > AOEV1_MAX_CONFSTR_LEN || AOEV1_QUERY_ARG_LEN + cslen > len) @@ -266,17 +251,14 @@ aoev1_mac_print(netdissect_options *ndo, ND_TCHECK_1(cp); cp += 1; /* MCmd */ - ND_TCHECK_1(cp); ND_PRINT("\n\tMCmd: %s", tok2str(aoev1_mcmd_str, "Unknown (0x%02x)", GET_U_1(cp))); cp += 1; /* MError */ - ND_TCHECK_1(cp); ND_PRINT(", MError: %s", tok2str(aoev1_merror_str, "Unknown (0x%02x)", GET_U_1(cp))); cp += 1; /* Dir Count */ - ND_TCHECK_1(cp); dircount = GET_U_1(cp); cp += 1; ND_PRINT(", Dir Count: %u", dircount); @@ -288,7 +270,6 @@ aoev1_mac_print(netdissect_options *ndo, ND_TCHECK_1(cp); cp += 1; /* DCmd */ - ND_TCHECK_1(cp); ND_PRINT("\n\t DCmd: %s", tok2str(aoev1_dcmd_str, "Unknown (0x%02x)", GET_U_1(cp))); cp += 1; @@ -317,12 +298,10 @@ aoev1_reserve_print(netdissect_options *ndo, if (len < AOEV1_RESERVE_ARG_LEN || (len - AOEV1_RESERVE_ARG_LEN) % MAC_ADDR_LEN) 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; /* NMacs (correlated with the length) */ - ND_TCHECK_1(cp); nmacs = GET_U_1(cp); cp += 1; ND_PRINT(", NMacs: %u", nmacs); @@ -362,26 +341,21 @@ aoev1_print(netdissect_options *ndo, 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; /* Major */ - ND_TCHECK_2(cp); ND_PRINT("\n\tMajor: 0x%04x", GET_BE_U_2(cp)); cp += 2; /* Minor */ - ND_TCHECK_1(cp); ND_PRINT(", Minor: 0x%02x", GET_U_1(cp)); cp += 1; /* Command */ - ND_TCHECK_1(cp); command = GET_U_1(cp); cp += 1; 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; /* Arg */ @@ -416,7 +390,6 @@ aoe_print(netdissect_options *ndo, 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); |