Rename EXTRACT_ macros

[tcpdump] / print-tipc.c

diff --git a/print-tipc.c b/print-tipc.c
index 8f2f76914522f219e23026fc4976b301675fb79a..8c421ee35ae47da17b3ba2b74b6e5c606bea99c5 100644 (file)
--- a/print-tipc.c
+++ b/print-tipc.c
@@ -19,32 +19,26 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * 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
+/* \summary: Transparent Inter-Process Communication (TIPC) protocol printer */
+
+/*
+ * specification:
+ *     http://tipc.sourceforge.net/doc/draft-spec-tipc-07.html
+ *     http://tipc.sourceforge.net/doc/tipc_message_formats.html
+ */

 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <tcpdump-stdinc.h>
-
-#include <stdio.h>
-#include <string.h>
+#include <netdissect-stdinc.h>

 
 #include "netdissect.h"
 
 #include "netdissect.h"

-#include "addrtoname.h"

 #include "ether.h"
 #include "ethertype.h"
 #include "ether.h"
 #include "ethertype.h"

-#include "extract.h"                   /* must come after interface.h */
+#include "extract.h"

 
 

-/*
- * Transparent Inter-Process Communication (TIPC) protocol.
- *
- *     http://tipc.sourceforge.net/doc/draft-spec-tipc-07.html
- *     http://tipc.sourceforge.net/doc/tipc_message_formats.html
- */
+static const char tstr[] = "[|TIPC]";

 
 #define TIPC_USER_LOW_IMPORTANCE       0
 #define TIPC_USER_MEDIUM_IMPORTANCE    1
 
 #define TIPC_USER_LOW_IMPORTANCE       0
 #define TIPC_USER_MEDIUM_IMPORTANCE    1


@@ -69,8 +63,8 @@ static const char rcsid[] _U_ =
 #define TIPC_NODE(addr)                (((addr) >> 0) & 0xFFF)
 
 struct tipc_pkthdr {
 #define TIPC_NODE(addr)                (((addr) >> 0) & 0xFFF)
 
 struct tipc_pkthdr {

-       u_int32_t w0;
-       u_int32_t w1;
+       uint32_t w0;
+       uint32_t w1;

 };
 
 #define TIPC_VER(w0)           (((w0) >> 29) & 0x07)
 };
 
 #define TIPC_VER(w0)           (((w0) >> 29) & 0x07)


@@ -113,30 +107,30 @@ static const struct tok tipc_linkconf_mtype_values[] = {
 };
 
 struct payload_tipc_pkthdr {
 };
 
 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 {
 };
 
 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)
 };
 
 #define TIPC_SEQ_GAP(w1)       (((w1) >> 16) & 0x1FFF)


@@ -149,13 +143,13 @@ struct  internal_tipc_pkthdr {
 #define TIPC_LINK_TOL(w9)      (((w9) >> 0) & 0xFFFF)
 
 struct link_conf_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_NODE_SIG(w1)      (((w1) >> 0) & 0xFFFF)


@@ -164,7 +158,7 @@ struct link_conf_tipc_pkthdr {
 static void
 print_payload(netdissect_options *ndo, const struct payload_tipc_pkthdr *ap)
 {
 static void
 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;
        u_int user;
        u_int hsize;
        u_int msize;


@@ -179,15 +173,15 @@ print_payload(netdissect_options *ndo, const struct payload_tipc_pkthdr *ap)
        u_int dest_node;
 
        ND_TCHECK(ap->dest_port);
        u_int dest_node;
 
        ND_TCHECK(ap->dest_port);

-       w0 = EXTRACT_32BITS(&ap->w0);
+       w0 = EXTRACT_BE_U_4(&ap->w0);

        user = TIPC_USER(w0);
        hsize = TIPC_HSIZE(w0);
        msize = TIPC_MSIZE(w0);
        user = TIPC_USER(w0);
        hsize = TIPC_HSIZE(w0);
        msize = TIPC_MSIZE(w0);

-       w1 = EXTRACT_32BITS(&ap->w1);
+       w1 = EXTRACT_BE_U_4(&ap->w1);

        mtype = TIPC_MTYPE(w1);
        mtype = TIPC_MTYPE(w1);

-       prev_node = EXTRACT_32BITS(&ap->prev_node);
-       orig_port = EXTRACT_32BITS(&ap->orig_port);
-       dest_port = EXTRACT_32BITS(&ap->dest_port);
+       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);

        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),
        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),


@@ -198,8 +192,8 @@ print_payload(netdissect_options *ndo, const struct payload_tipc_pkthdr *ap)
                    tok2str(tipcmtype_values, "Unknown", mtype)));
        } else {
                ND_TCHECK(ap->dest_node);
                    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);
+               orig_node = EXTRACT_BE_U_4(&ap->orig_node);
+               dest_node = EXTRACT_BE_U_4(&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),
                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),


@@ -212,7 +206,7 @@ print_payload(netdissect_options *ndo, const struct payload_tipc_pkthdr *ap)
 
                if (ndo->ndo_vflag) {
                        broadcast_ack = TIPC_BROADCAST_ACK(w1);
 
                if (ndo->ndo_vflag) {
                        broadcast_ack = TIPC_BROADCAST_ACK(w1);

-                       w2 = EXTRACT_32BITS(&ap->w2);
+                       w2 = EXTRACT_BE_U_4(&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",
                        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",


@@ -223,13 +217,13 @@ print_payload(netdissect_options *ndo, const struct payload_tipc_pkthdr *ap)
        return;
 
 trunc:
        return;
 
 trunc:

-       ND_PRINT((ndo, "[|TIPC]"));
+       ND_PRINT((ndo, "%s", tstr));

 }
 }

-        
+

 static void
 print_internal(netdissect_options *ndo, const struct internal_tipc_pkthdr *ap)
 {
 static void
 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;
        u_int user;
        u_int hsize;
        u_int msize;


@@ -249,14 +243,14 @@ print_internal(netdissect_options *ndo, const struct internal_tipc_pkthdr *ap)
        u_int link_tol;
 
        ND_TCHECK(ap->dest_node);
        u_int link_tol;
 
        ND_TCHECK(ap->dest_node);

-       w0 = EXTRACT_32BITS(&ap->w0);
+       w0 = EXTRACT_BE_U_4(&ap->w0);

        user = TIPC_USER(w0);
        hsize = TIPC_HSIZE(w0);
        msize = TIPC_MSIZE(w0);
        user = TIPC_USER(w0);
        hsize = TIPC_HSIZE(w0);
        msize = TIPC_MSIZE(w0);

-       w1 = EXTRACT_32BITS(&ap->w1);
+       w1 = EXTRACT_BE_U_4(&ap->w1);

        mtype = TIPC_MTYPE(w1);
        mtype = TIPC_MTYPE(w1);

-       orig_node = EXTRACT_32BITS(&ap->orig_node);
-       dest_node = EXTRACT_32BITS(&ap->dest_node);
+       orig_node = EXTRACT_BE_U_4(&ap->orig_node);
+       dest_node = EXTRACT_BE_U_4(&ap->dest_node);

        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),
        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),


@@ -269,17 +263,17 @@ print_internal(netdissect_options *ndo, const struct internal_tipc_pkthdr *ap)
                ND_TCHECK(*ap);
                seq_gap = TIPC_SEQ_GAP(w1);
                broadcast_ack = TIPC_BROADCAST_ACK(w1);
                ND_TCHECK(*ap);
                seq_gap = TIPC_SEQ_GAP(w1);
                broadcast_ack = TIPC_BROADCAST_ACK(w1);

-               w2 = EXTRACT_32BITS(&ap->w2);
+               w2 = EXTRACT_BE_U_4(&ap->w2);

                bc_gap_after = TIPC_BC_GAP_AFTER(w2);
                bc_gap_to = TIPC_BC_GAP_TO(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);
+               prev_node = EXTRACT_BE_U_4(&ap->prev_node);
+               w4 = EXTRACT_BE_U_4(&ap->w4);

                last_sent_frag = TIPC_LAST_SENT_FRAG(w4);
                next_sent_frag = TIPC_NEXT_SENT_FRAG(w4);
                last_sent_frag = TIPC_LAST_SENT_FRAG(w4);
                next_sent_frag = TIPC_NEXT_SENT_FRAG(w4);

-               w5 = EXTRACT_32BITS(&ap->w5);
+               w5 = EXTRACT_BE_U_4(&ap->w5);

                sess_no = TIPC_SESS_NO(w5);
                sess_no = TIPC_SESS_NO(w5);

-               trans_seq = EXTRACT_32BITS(&ap->trans_seq);
-               w9 = EXTRACT_32BITS(&ap->w9);
+               trans_seq = EXTRACT_BE_U_4(&ap->trans_seq);
+               w9 = EXTRACT_BE_U_4(&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",
                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",


@@ -291,13 +285,13 @@ print_internal(netdissect_options *ndo, const struct internal_tipc_pkthdr *ap)
        return;
 
 trunc:
        return;
 
 trunc:

-       ND_PRINT((ndo, "[|TIPC]"));
+       ND_PRINT((ndo, "%s", tstr));

 }
 
 static void
 print_link_conf(netdissect_options *ndo, const struct link_conf_tipc_pkthdr *ap)
 {
 }
 
 static void
 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;
        u_int user;
        u_int hsize;
        u_int msize;


@@ -309,15 +303,14 @@ print_link_conf(netdissect_options *ndo, const struct link_conf_tipc_pkthdr *ap)
        u_int media_id;
 
        ND_TCHECK(ap->prev_node);
        u_int media_id;
 
        ND_TCHECK(ap->prev_node);

-       w0 = EXTRACT_32BITS(&ap->w0);
+       w0 = EXTRACT_BE_U_4(&ap->w0);

        user = TIPC_USER(w0);
        hsize = TIPC_HSIZE(w0);
        msize = TIPC_MSIZE(w0);
        user = TIPC_USER(w0);
        hsize = TIPC_HSIZE(w0);
        msize = TIPC_MSIZE(w0);

-       w1 = EXTRACT_32BITS(&ap->w1);
+       w1 = EXTRACT_BE_U_4(&ap->w1);

        mtype = TIPC_MTYPE(w1);
        mtype = TIPC_MTYPE(w1);

-       prev_node = EXTRACT_32BITS(&ap->prev_node);
-       dest_domain = EXTRACT_32BITS(&ap->dest_domain);
-       prev_node = EXTRACT_32BITS(&ap->prev_node);
+       dest_domain = EXTRACT_BE_U_4(&ap->dest_domain);
+       prev_node = EXTRACT_BE_U_4(&ap->prev_node);

 
        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),
 
        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),


@@ -329,8 +322,8 @@ print_link_conf(netdissect_options *ndo, const struct link_conf_tipc_pkthdr *ap)
        if (ndo->ndo_vflag) {
                ND_TCHECK(ap->w5);
                node_sig = TIPC_NODE_SIG(w1);
        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);
+               ntwrk_id = EXTRACT_BE_U_4(&ap->ntwrk_id);
+               w5 = EXTRACT_BE_U_4(&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));
                media_id = TIPC_MEDIA_ID(w5);
                ND_PRINT((ndo, "\n\tNodeSignature %u, network_id %u, media_id %u",
                    node_sig, ntwrk_id, media_id));


@@ -338,7 +331,7 @@ print_link_conf(netdissect_options *ndo, const struct link_conf_tipc_pkthdr *ap)
        return;
 
 trunc:
        return;
 
 trunc:

-       ND_PRINT((ndo, "[|TIPC]"));
+       ND_PRINT((ndo, "%s", tstr));

 }
 
 void
 }
 
 void


@@ -346,12 +339,12 @@ tipc_print(netdissect_options *ndo, const u_char *bp, u_int length _U_,
     u_int caplen _U_)
 {
        const struct tipc_pkthdr *ap;
     u_int caplen _U_)
 {
        const struct tipc_pkthdr *ap;

-       u_int32_t w0;
+       uint32_t w0;

        u_int user;
 
        u_int user;
 

-       ap = (struct tipc_pkthdr *)bp;
+       ap = (const struct tipc_pkthdr *)bp;

        ND_TCHECK(ap->w0);
        ND_TCHECK(ap->w0);

-       w0 = EXTRACT_32BITS(&ap->w0);
+       w0 = EXTRACT_BE_U_4(&ap->w0);

        user = TIPC_USER(w0);
 
        switch (user)
        user = TIPC_USER(w0);
 
        switch (user)


@@ -362,11 +355,11 @@ tipc_print(netdissect_options *ndo, const u_char *bp, u_int length _U_,
                case TIPC_USER_CRITICAL_IMPORTANCE:
                case TIPC_USER_NAME_DISTRIBUTOR:
                case TIPC_USER_CONN_MANAGER:
                case TIPC_USER_CRITICAL_IMPORTANCE:
                case TIPC_USER_NAME_DISTRIBUTOR:
                case TIPC_USER_CONN_MANAGER:

-                       print_payload(ndo, (struct payload_tipc_pkthdr *)bp);
-                       break;                   
+                       print_payload(ndo, (const struct payload_tipc_pkthdr *)bp);
+                       break;

 
                case TIPC_USER_LINK_CONFIG:
 
                case TIPC_USER_LINK_CONFIG:

-                       print_link_conf(ndo, (struct link_conf_tipc_pkthdr *)bp);
+                       print_link_conf(ndo, (const struct link_conf_tipc_pkthdr *)bp);

                        break;
 
                case TIPC_USER_BCAST_PROTOCOL:
                        break;
 
                case TIPC_USER_BCAST_PROTOCOL:


@@ -374,14 +367,14 @@ tipc_print(netdissect_options *ndo, const u_char *bp, u_int length _U_,
                case TIPC_USER_LINK_PROTOCOL:
                case TIPC_USER_CHANGEOVER_PROTOCOL:
                case TIPC_USER_MSG_FRAGMENTER:
                case TIPC_USER_LINK_PROTOCOL:
                case TIPC_USER_CHANGEOVER_PROTOCOL:
                case TIPC_USER_MSG_FRAGMENTER:

-                       print_internal(ndo, (struct internal_tipc_pkthdr *)bp);
+                       print_internal(ndo, (const struct internal_tipc_pkthdr *)bp);

                        break;
 
        }
        return;
 
 trunc:
                        break;
 
        }
        return;
 
 trunc:

-       ND_PRINT((ndo, "[|TIPC]"));
+       ND_PRINT((ndo, "%s", tstr));

 }
 
 /*
 }
 
 /*