remove redundant ND_TCHECK, let GET_ routines handle checks

[tcpdump] / print-tipc.c

diff --git a/print-tipc.c b/print-tipc.c
index 45de7387638fdf66b243ebcd856ef2945fa2f954..6bb150e0d83fa590332dc5d90d592a1f727b1722 100644 (file)
--- a/print-tipc.c
+++ b/print-tipc.c
@@ -23,8 +23,8 @@
 
 /*
  * specification:
- *     http://tipc.sourceforge.net/doc/draft-spec-tipc-07.html
- *     http://tipc.sourceforge.net/doc/tipc_message_formats.html
+ *     https://web.archive.org/web/20150302152944/http://tipc.sourceforge.net/doc/draft-spec-tipc-07.html
+ *     https://web.archive.org/web/20161025110514/http://tipc.sourceforge.net/doc/tipc_message_formats.html
  */
 
 #ifdef HAVE_CONFIG_H
@@ -68,7 +68,7 @@ struct tipc_pkthdr {
 #define TIPC_VER(w0)           (((w0) >> 29) & 0x07)
 #define TIPC_USER(w0)          (((w0) >> 25) & 0x0F)
 #define TIPC_HSIZE(w0)         (((w0) >> 21) & 0x0F)
-#define TIPC_MSIZE(w0)         (((w0) >> 0) & 0xFFFF)
+#define TIPC_MSIZE(w0)         (((w0) >> 0) & 0x1FFFF)
 #define TIPC_MTYPE(w1)         (((w1) >> 29) & 0x07)
 #define TIPC_BROADCAST_ACK(w1) (((w1) >> 0) & 0xFFFF)
 #define TIPC_LINK_ACK(w2)      (((w2) >> 16) & 0xFFFF)
@@ -171,15 +171,15 @@ print_payload(netdissect_options *ndo, const struct payload_tipc_pkthdr *ap)
        u_int dest_node;
 
        ND_TCHECK_4(ap->dest_port);
-       w0 = EXTRACT_BE_U_4(ap->w0);
+       w0 = GET_BE_U_4(ap->w0);
        user = TIPC_USER(w0);
        hsize = TIPC_HSIZE(w0);
        msize = TIPC_MSIZE(w0);
-       w1 = EXTRACT_BE_U_4(ap->w1);
+       w1 = GET_BE_U_4(ap->w1);
        mtype = TIPC_MTYPE(w1);
-       prev_node = EXTRACT_BE_U_4(ap->prev_node);
-       orig_port = EXTRACT_BE_U_4(ap->orig_port);
-       dest_port = EXTRACT_BE_U_4(ap->dest_port);
+       prev_node = GET_BE_U_4(ap->prev_node);
+       orig_port = GET_BE_U_4(ap->orig_port);
+       dest_port = GET_BE_U_4(ap->dest_port);
        if (hsize <= 6) {
                ND_PRINT("TIPC v%u.0 %u.%u.%u:%u > %u, headerlength %u bytes, MessageSize %u bytes, %s, messageType %s",
                    TIPC_VER(w0),
@@ -189,9 +189,8 @@ 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 = EXTRACT_BE_U_4(ap->orig_node);
-               dest_node = EXTRACT_BE_U_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",
                    TIPC_VER(w0),
                    TIPC_ZONE(orig_node), TIPC_CLUSTER(orig_node), TIPC_NODE(orig_node),
@@ -204,7 +203,7 @@ print_payload(netdissect_options *ndo, const struct payload_tipc_pkthdr *ap)
 
                if (ndo->ndo_vflag) {
                        broadcast_ack = TIPC_BROADCAST_ACK(w1);
-                       w2 = EXTRACT_BE_U_4(ap->w2);
+                       w2 = GET_BE_U_4(ap->w2);
                        link_ack = TIPC_LINK_ACK(w2);
                        link_seq = TIPC_LINK_SEQ(w2);
                        ND_PRINT("\n\tPrevious Node %u.%u.%u, Broadcast Ack %u, Link Ack %u, Link Sequence %u",
@@ -241,14 +240,14 @@ print_internal(netdissect_options *ndo, const struct internal_tipc_pkthdr *ap)
        u_int link_tol;
 
        ND_TCHECK_4(ap->dest_node);
-       w0 = EXTRACT_BE_U_4(ap->w0);
+       w0 = GET_BE_U_4(ap->w0);
        user = TIPC_USER(w0);
        hsize = TIPC_HSIZE(w0);
        msize = TIPC_MSIZE(w0);
-       w1 = EXTRACT_BE_U_4(ap->w1);
+       w1 = GET_BE_U_4(ap->w1);
        mtype = TIPC_MTYPE(w1);
-       orig_node = EXTRACT_BE_U_4(ap->orig_node);
-       dest_node = EXTRACT_BE_U_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, headerlength %u bytes, MessageSize %u bytes, %s, messageType %s (0x%08x)",
            TIPC_VER(w0),
            TIPC_ZONE(orig_node), TIPC_CLUSTER(orig_node), TIPC_NODE(orig_node),
@@ -261,17 +260,17 @@ print_internal(netdissect_options *ndo, const struct internal_tipc_pkthdr *ap)
                ND_TCHECK_SIZE(ap);
                seq_gap = TIPC_SEQ_GAP(w1);
                broadcast_ack = TIPC_BROADCAST_ACK(w1);
-               w2 = EXTRACT_BE_U_4(ap->w2);
+               w2 = GET_BE_U_4(ap->w2);
                bc_gap_after = TIPC_BC_GAP_AFTER(w2);
                bc_gap_to = TIPC_BC_GAP_TO(w2);
-               prev_node = EXTRACT_BE_U_4(ap->prev_node);
-               w4 = EXTRACT_BE_U_4(ap->w4);
+               prev_node = GET_BE_U_4(ap->prev_node);
+               w4 = GET_BE_U_4(ap->w4);
                last_sent_frag = TIPC_LAST_SENT_FRAG(w4);
                next_sent_frag = TIPC_NEXT_SENT_FRAG(w4);
-               w5 = EXTRACT_BE_U_4(ap->w5);
+               w5 = GET_BE_U_4(ap->w5);
                sess_no = TIPC_SESS_NO(w5);
-               trans_seq = EXTRACT_BE_U_4(ap->trans_seq);
-               w9 = EXTRACT_BE_U_4(ap->w9);
+               trans_seq = GET_BE_U_4(ap->trans_seq);
+               w9 = GET_BE_U_4(ap->w9);
                msg_cnt = TIPC_MSG_CNT(w9);
                link_tol = TIPC_LINK_TOL(w9);
                ND_PRINT("\n\tPrevious Node %u.%u.%u, Session No. %u, Broadcast Ack %u, Sequence Gap %u,  Broadcast Gap After %u, Broadcast Gap To %u, Last Sent Packet No. %u, Next sent Packet No. %u, Transport Sequence %u, msg_count %u, Link Tolerance %u",
@@ -301,14 +300,14 @@ print_link_conf(netdissect_options *ndo, const struct link_conf_tipc_pkthdr *ap)
        u_int media_id;
 
        ND_TCHECK_4(ap->prev_node);
-       w0 = EXTRACT_BE_U_4(ap->w0);
+       w0 = GET_BE_U_4(ap->w0);
        user = TIPC_USER(w0);
        hsize = TIPC_HSIZE(w0);
        msize = TIPC_MSIZE(w0);
-       w1 = EXTRACT_BE_U_4(ap->w1);
+       w1 = GET_BE_U_4(ap->w1);
        mtype = TIPC_MTYPE(w1);
-       dest_domain = EXTRACT_BE_U_4(ap->dest_domain);
-       prev_node = EXTRACT_BE_U_4(ap->prev_node);
+       dest_domain = GET_BE_U_4(ap->dest_domain);
+       prev_node = GET_BE_U_4(ap->prev_node);
 
        ND_PRINT("TIPC v%u.0 %u.%u.%u > %u.%u.%u, headerlength %u bytes, MessageSize %u bytes, %s, messageType %s",
            TIPC_VER(w0),
@@ -318,10 +317,9 @@ 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 = EXTRACT_BE_U_4(ap->ntwrk_id);
-               w5 = EXTRACT_BE_U_4(ap->w5);
+               ntwrk_id = GET_BE_U_4(ap->ntwrk_id);
+               w5 = GET_BE_U_4(ap->w5);
                media_id = TIPC_MEDIA_ID(w5);
                ND_PRINT("\n\tNodeSignature %u, network_id %u, media_id %u",
                    node_sig, ntwrk_id, media_id);
@@ -342,8 +340,7 @@ 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 = EXTRACT_BE_U_4(ap->w0);
+       w0 = GET_BE_U_4(ap->w0);
        user = TIPC_USER(w0);
 
        switch (user)
@@ -370,8 +367,4 @@ tipc_print(netdissect_options *ndo, const u_char *bp, u_int length _U_,
                        break;
 
        }
-       return;
-
-trunc:
-       nd_print_trunc(ndo);
 }