remove redundant ND_TCHECK, let GET_ routines handle checks

[tcpdump] / print-tipc.c

diff --git a/print-tipc.c b/print-tipc.c
index cd52d2393330dfaf51a0841340f5138b13e60882..6bb150e0d83fa590332dc5d90d592a1f727b1722 100644 (file)
--- a/print-tipc.c
+++ b/print-tipc.c
@@ -189,7 +189,6 @@ print_payload(netdissect_options *ndo, const struct payload_tipc_pkthdr *ap)
                    tok2str(tipcuser_values, "unknown", user),
                    tok2str(tipcmtype_values, "Unknown", mtype));
        } else {
-               ND_TCHECK_4(ap->dest_node);
                orig_node = GET_BE_U_4(ap->orig_node);
                dest_node = GET_BE_U_4(ap->dest_node);
                ND_PRINT("TIPC v%u.0 %u.%u.%u:%u > %u.%u.%u:%u, headerlength %u bytes, MessageSize %u bytes, %s, messageType %s",
@@ -318,7 +317,6 @@ print_link_conf(netdissect_options *ndo, const struct link_conf_tipc_pkthdr *ap)
            tok2str(tipcuser_values, "unknown", user),
            tok2str(tipc_linkconf_mtype_values, "Unknown", mtype));
        if (ndo->ndo_vflag) {
-               ND_TCHECK_4(ap->w5);
                node_sig = TIPC_NODE_SIG(w1);
                ntwrk_id = GET_BE_U_4(ap->ntwrk_id);
                w5 = GET_BE_U_4(ap->w5);
@@ -342,7 +340,6 @@ tipc_print(netdissect_options *ndo, const u_char *bp, u_int length _U_,
 
        ndo->ndo_protocol = "tipc";
        ap = (const struct tipc_pkthdr *)bp;
-       ND_TCHECK_4(ap->w0);
        w0 = GET_BE_U_4(ap->w0);
        user = TIPC_USER(w0);
 
@@ -370,8 +367,4 @@ tipc_print(netdissect_options *ndo, const u_char *bp, u_int length _U_,
                        break;
 
        }
-       return;
-
-trunc:
-       nd_print_trunc(ndo);
 }