X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/2c233065b663b176f8fd9679aa674aefe38c3dd4..refs/pull/433/head:/print-tipc.c diff --git a/print-tipc.c b/print-tipc.c index 48021174..b883fba9 100644 --- a/print-tipc.c +++ b/print-tipc.c @@ -19,26 +19,20 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-arp.c,v 1.66 2006-03-03 22:53:21 hannes Exp $ (LBL)"; -#endif - +#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif #include -#include -#include - -#include "netdissect.h" -#include "addrtoname.h" +#include "interface.h" #include "ether.h" #include "ethertype.h" #include "extract.h" /* must come after interface.h */ +static const char tstr[] = "[|TIPC]"; + /* * Transparent Inter-Process Communication (TIPC) protocol. * @@ -69,7 +63,8 @@ static const char rcsid[] _U_ = #define TIPC_NODE(addr) (((addr) >> 0) & 0xFFF) struct tipc_pkthdr { - u_int32_t w0; + uint32_t w0; + uint32_t w1; }; #define TIPC_VER(w0) (((w0) >> 29) & 0x07) @@ -105,31 +100,37 @@ static const struct tok tipcmtype_values[] = { { 0, NULL } }; +static const struct tok tipc_linkconf_mtype_values[] = { + { 0, "Link request" }, + { 1, "Link response" }, + { 0, NULL } +}; + struct payload_tipc_pkthdr { - u_int32_t w0; - u_int32_t w1; - u_int32_t w2; - u_int32_t prev_node; - u_int32_t orig_port; - u_int32_t dest_port; - u_int32_t orig_node; - u_int32_t dest_node; - u_int32_t name_type; - u_int32_t w9; - u_int32_t wA; + uint32_t w0; + uint32_t w1; + uint32_t w2; + uint32_t prev_node; + uint32_t orig_port; + uint32_t dest_port; + uint32_t orig_node; + uint32_t dest_node; + uint32_t name_type; + uint32_t w9; + uint32_t wA; }; struct internal_tipc_pkthdr { - u_int32_t w0; - u_int32_t w1; - u_int32_t w2; - u_int32_t prev_node; - u_int32_t w4; - u_int32_t w5; - u_int32_t orig_node; - u_int32_t dest_node; - u_int32_t trans_seq; - u_int32_t w9; + uint32_t w0; + uint32_t w1; + uint32_t w2; + uint32_t prev_node; + uint32_t w4; + uint32_t w5; + uint32_t orig_node; + uint32_t dest_node; + uint32_t trans_seq; + uint32_t w9; }; #define TIPC_SEQ_GAP(w1) (((w1) >> 16) & 0x1FFF) @@ -142,22 +143,22 @@ struct internal_tipc_pkthdr { #define TIPC_LINK_TOL(w9) (((w9) >> 0) & 0xFFFF) struct link_conf_tipc_pkthdr { - u_int32_t w0; - u_int32_t w1; - u_int32_t dest_domain; - u_int32_t prev_node; - u_int32_t ntwrk_id; - u_int32_t w5; - u_int8_t media_address[16]; + uint32_t w0; + uint32_t w1; + uint32_t dest_domain; + uint32_t prev_node; + uint32_t ntwrk_id; + uint32_t w5; + uint8_t media_address[16]; }; #define TIPC_NODE_SIG(w1) (((w1) >> 0) & 0xFFFF) #define TIPC_MEDIA_ID(w5) (((w5) >> 0) & 0xFF) static void -print_payload(netdissect_options *ndo, struct payload_tipc_pkthdr *ap) +print_payload(netdissect_options *ndo, const struct payload_tipc_pkthdr *ap) { - u_int32_t w0, w1, w2; + uint32_t w0, w1, w2; u_int user; u_int hsize; u_int msize; @@ -171,42 +172,58 @@ print_payload(netdissect_options *ndo, struct payload_tipc_pkthdr *ap) u_int orig_node; u_int dest_node; - ND_TCHECK(*ap); + ND_TCHECK(ap->dest_port); w0 = EXTRACT_32BITS(&ap->w0); user = TIPC_USER(w0); hsize = TIPC_HSIZE(w0); msize = TIPC_MSIZE(w0); w1 = EXTRACT_32BITS(&ap->w1); mtype = TIPC_MTYPE(w1); - broadcast_ack = TIPC_BROADCAST_ACK(w1); - w2 = EXTRACT_32BITS(&ap->w2); - link_ack = TIPC_LINK_ACK(w2); - link_seq = TIPC_LINK_SEQ(w2); - orig_node = EXTRACT_32BITS(&ap->orig_node); + prev_node = EXTRACT_32BITS(&ap->prev_node); orig_port = EXTRACT_32BITS(&ap->orig_port); - dest_node = EXTRACT_32BITS(&ap->dest_node); dest_port = EXTRACT_32BITS(&ap->dest_port); - prev_node = EXTRACT_32BITS(&ap->prev_node); - - ND_PRINT((ndo, "<%u.%u.%u> : %u > <%u.%u.%u> : %u, Previous Node <%u.%u.%u>, Broadcast Ack %u, Link Ack %u, Link Sequence %u, headerlength %u bytes, MessageSize %u bytes, %s messageType %s\n\n", - TIPC_ZONE(orig_node), TIPC_CLUSTER(orig_node), TIPC_NODE(orig_node), - orig_port, - TIPC_ZONE(dest_node), TIPC_CLUSTER(dest_node), TIPC_NODE(dest_node), - dest_port, - TIPC_ZONE(prev_node), TIPC_CLUSTER(prev_node), TIPC_NODE(prev_node), - broadcast_ack, link_ack, link_seq, hsize*4, msize, - tok2str(tipcuser_values, "unknown", user), - tok2str(tipcmtype_values, "Unknown", mtype))); + if (hsize <= 6) { + ND_PRINT((ndo, "TIPC v%u.0 %u.%u.%u:%u > %u, headerlength %u bytes, MessageSize %u bytes, %s, messageType %s", + TIPC_VER(w0), + TIPC_ZONE(prev_node), TIPC_CLUSTER(prev_node), TIPC_NODE(prev_node), + orig_port, dest_port, + hsize*4, msize, + tok2str(tipcuser_values, "unknown", user), + tok2str(tipcmtype_values, "Unknown", mtype))); + } else { + ND_TCHECK(ap->dest_node); + orig_node = EXTRACT_32BITS(&ap->orig_node); + dest_node = EXTRACT_32BITS(&ap->dest_node); + ND_PRINT((ndo, "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), + orig_port, + TIPC_ZONE(dest_node), TIPC_CLUSTER(dest_node), TIPC_NODE(dest_node), + dest_port, + hsize*4, msize, + tok2str(tipcuser_values, "unknown", user), + tok2str(tipcmtype_values, "Unknown", mtype))); + + if (ndo->ndo_vflag) { + broadcast_ack = TIPC_BROADCAST_ACK(w1); + w2 = EXTRACT_32BITS(&ap->w2); + link_ack = TIPC_LINK_ACK(w2); + link_seq = TIPC_LINK_SEQ(w2); + ND_PRINT((ndo, "\n\tPrevious Node %u.%u.%u, Broadcast Ack %u, Link Ack %u, Link Sequence %u", + TIPC_ZONE(prev_node), TIPC_CLUSTER(prev_node), TIPC_NODE(prev_node), + broadcast_ack, link_ack, link_seq)); + } + } return; trunc: - ND_PRINT((ndo, "[|TIPC]")); + ND_PRINT((ndo, "%s", tstr)); } - + static void -print_internal(netdissect_options *ndo, struct internal_tipc_pkthdr *ap) +print_internal(netdissect_options *ndo, const struct internal_tipc_pkthdr *ap) { - u_int32_t w0, w1, w2, w4, w5, w9; + uint32_t w0, w1, w2, w4, w5, w9; u_int user; u_int hsize; u_int msize; @@ -225,50 +242,56 @@ print_internal(netdissect_options *ndo, struct internal_tipc_pkthdr *ap) u_int msg_cnt; u_int link_tol; - ND_TCHECK(*ap); + ND_TCHECK(ap->dest_node); w0 = EXTRACT_32BITS(&ap->w0); user = TIPC_USER(w0); hsize = TIPC_HSIZE(w0); msize = TIPC_MSIZE(w0); w1 = EXTRACT_32BITS(&ap->w1); mtype = TIPC_MTYPE(w1); - seq_gap = TIPC_SEQ_GAP(w1); - broadcast_ack = TIPC_BROADCAST_ACK(w1); - w2 = EXTRACT_32BITS(&ap->w2); - bc_gap_after = TIPC_BC_GAP_AFTER(w2); - bc_gap_to = TIPC_BC_GAP_TO(w2); - prev_node = EXTRACT_32BITS(&ap->prev_node); - w4 = EXTRACT_32BITS(&ap->w4); - last_sent_frag = TIPC_LAST_SENT_FRAG(w4); - next_sent_frag = TIPC_NEXT_SENT_FRAG(w4); - w5 = EXTRACT_32BITS(&ap->w5); - sess_no = TIPC_SESS_NO(w5); orig_node = EXTRACT_32BITS(&ap->orig_node); dest_node = EXTRACT_32BITS(&ap->dest_node); - trans_seq = EXTRACT_32BITS(&ap->trans_seq); - w9 = EXTRACT_32BITS(&ap->w9); - msg_cnt = TIPC_MSG_CNT(w9); - link_tol = TIPC_LINK_TOL(w9); - - ND_PRINT((ndo, "<%u.%u.%u> > <%u.%u.%u>, Previous 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, headerlength %u bytes, MessageSize %u bytes, %s messageType %s\n\n", + ND_PRINT((ndo, "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), TIPC_ZONE(dest_node), TIPC_CLUSTER(dest_node), TIPC_NODE(dest_node), - TIPC_ZONE(prev_node), TIPC_CLUSTER(prev_node), TIPC_NODE(prev_node), - sess_no, broadcast_ack, seq_gap, bc_gap_after, bc_gap_to, - last_sent_frag, next_sent_frag, trans_seq, msg_cnt, link_tol, hsize*4, msize, tok2str(tipcuser_values, "unknown", user), - tok2str(tipcmtype_values, "Unknown", mtype))); + tok2str(tipcmtype_values, "Unknown", mtype), w1)); + + if (ndo->ndo_vflag) { + ND_TCHECK(*ap); + seq_gap = TIPC_SEQ_GAP(w1); + broadcast_ack = TIPC_BROADCAST_ACK(w1); + w2 = EXTRACT_32BITS(&ap->w2); + bc_gap_after = TIPC_BC_GAP_AFTER(w2); + bc_gap_to = TIPC_BC_GAP_TO(w2); + prev_node = EXTRACT_32BITS(&ap->prev_node); + w4 = EXTRACT_32BITS(&ap->w4); + last_sent_frag = TIPC_LAST_SENT_FRAG(w4); + next_sent_frag = TIPC_NEXT_SENT_FRAG(w4); + w5 = EXTRACT_32BITS(&ap->w5); + sess_no = TIPC_SESS_NO(w5); + trans_seq = EXTRACT_32BITS(&ap->trans_seq); + w9 = EXTRACT_32BITS(&ap->w9); + msg_cnt = TIPC_MSG_CNT(w9); + link_tol = TIPC_LINK_TOL(w9); + ND_PRINT((ndo, "\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", + TIPC_ZONE(prev_node), TIPC_CLUSTER(prev_node), TIPC_NODE(prev_node), + sess_no, broadcast_ack, seq_gap, bc_gap_after, bc_gap_to, + last_sent_frag, next_sent_frag, trans_seq, msg_cnt, + link_tol)); + } return; trunc: - ND_PRINT((ndo, "[|TIPC]")); + ND_PRINT((ndo, "%s", tstr)); } static void -print_link_conf(netdissect_options *ndo, struct link_conf_tipc_pkthdr *ap) +print_link_conf(netdissect_options *ndo, const struct link_conf_tipc_pkthdr *ap) { - u_int32_t w0, w1, w5; + uint32_t w0, w1, w5; u_int user; u_int hsize; u_int msize; @@ -279,50 +302,52 @@ print_link_conf(netdissect_options *ndo, struct link_conf_tipc_pkthdr *ap) u_int ntwrk_id; u_int media_id; - ND_TCHECK(*ap); + ND_TCHECK(ap->prev_node); w0 = EXTRACT_32BITS(&ap->w0); user = TIPC_USER(w0); hsize = TIPC_HSIZE(w0); msize = TIPC_MSIZE(w0); w1 = EXTRACT_32BITS(&ap->w1); mtype = TIPC_MTYPE(w1); - node_sig = TIPC_NODE_SIG(w1); - prev_node = EXTRACT_32BITS(&ap->prev_node); dest_domain = EXTRACT_32BITS(&ap->dest_domain); prev_node = EXTRACT_32BITS(&ap->prev_node); - ntwrk_id = EXTRACT_32BITS(&ap->ntwrk_id); - w5 = EXTRACT_32BITS(&ap->w5); - media_id = TIPC_MEDIA_ID(w5); - ND_PRINT((ndo, "<%u.%u.%u> > <%u.%u.%u> NodeSignature %u, network_id %u, %s, headerlength %u bytes, MessageSize %u bytes, messageType %s, media_id %u\n\n", + ND_PRINT((ndo, "TIPC v%u.0 %u.%u.%u > %u.%u.%u, headerlength %u bytes, MessageSize %u bytes, %s, messageType %s", + TIPC_VER(w0), TIPC_ZONE(prev_node), TIPC_CLUSTER(prev_node), TIPC_NODE(prev_node), TIPC_ZONE(dest_domain), TIPC_CLUSTER(dest_domain), TIPC_NODE(dest_domain), - node_sig, ntwrk_id, - tok2str(tipcuser_values, "unknown", user), hsize*4, msize, - tok2str(tipcmtype_values, "Unknown", mtype), - media_id)); + tok2str(tipcuser_values, "unknown", user), + tok2str(tipc_linkconf_mtype_values, "Unknown", mtype))); + if (ndo->ndo_vflag) { + ND_TCHECK(ap->w5); + node_sig = TIPC_NODE_SIG(w1); + ntwrk_id = EXTRACT_32BITS(&ap->ntwrk_id); + w5 = EXTRACT_32BITS(&ap->w5); + media_id = TIPC_MEDIA_ID(w5); + ND_PRINT((ndo, "\n\tNodeSignature %u, network_id %u, media_id %u", + node_sig, ntwrk_id, media_id)); + } return; trunc: - ND_PRINT((ndo, "[|TIPC]")); + ND_PRINT((ndo, "%s", tstr)); } void tipc_print(netdissect_options *ndo, const u_char *bp, u_int length _U_, u_int caplen _U_) { - struct tipc_pkthdr *ap; - u_int32_t w0; - u_int usr; + const struct tipc_pkthdr *ap; + uint32_t w0; + u_int user; ap = (struct tipc_pkthdr *)bp; ND_TCHECK(ap->w0); w0 = EXTRACT_32BITS(&ap->w0); - ND_PRINT((ndo, "TIPC Protocol Packet version %u.0\n", TIPC_VER(w0))); + user = TIPC_USER(w0); - usr = TIPC_USER(w0); - switch (usr) + switch (user) { case TIPC_USER_LOW_IMPORTANCE: case TIPC_USER_MEDIUM_IMPORTANCE: @@ -331,7 +356,7 @@ tipc_print(netdissect_options *ndo, const u_char *bp, u_int length _U_, case TIPC_USER_NAME_DISTRIBUTOR: case TIPC_USER_CONN_MANAGER: print_payload(ndo, (struct payload_tipc_pkthdr *)bp); - break; + break; case TIPC_USER_LINK_CONFIG: print_link_conf(ndo, (struct link_conf_tipc_pkthdr *)bp); @@ -349,7 +374,7 @@ tipc_print(netdissect_options *ndo, const u_char *bp, u_int length _U_, return; trunc: - ND_PRINT((ndo, "[|TIPC]")); + ND_PRINT((ndo, "%s", tstr)); } /*