OpenFlow: Have a function for each message type.

[tcpdump] / print-tipc.c

diff --git a/print-tipc.c b/print-tipc.c
index ec81d92516ea3980b8dc5da840a443d5a315c80a..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)
@@ -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);
 }