More nd_ification of structures.

[tcpdump] / print-token.c

diff --git a/print-token.c b/print-token.c
index b88bcf7925207540c90547ae18c4f8c6a8cfe813..730c155d75f0e08569188a9cbe0c4628e8a2e50e 100644 (file)
--- a/print-token.c
+++ b/print-token.c
@@ -24,16 +24,17 @@
  *     Guy Harris <[email protected]>
  */
 
-#define NETDISSECT_REWORKED
+/* \summary: Token Ring printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 #include "ether.h"
@@ -73,12 +74,12 @@
 #define FRAME_TYPE(trp)                (((trp)->token_fc & 0xC0) >> 6)
 #define TOKEN_FC_LLC           1
 
-#define BROADCAST(trp)         ((EXTRACT_16BITS(&(trp)->token_rcf) & 0xE000) >> 13)
-#define RIF_LENGTH(trp)                ((EXTRACT_16BITS(&(trp)->token_rcf) & 0x1f00) >> 8)
-#define DIRECTION(trp)         ((EXTRACT_16BITS(&(trp)->token_rcf) & 0x0080) >> 7)
-#define LARGEST_FRAME(trp)     ((EXTRACT_16BITS(&(trp)->token_rcf) & 0x0070) >> 4)
-#define RING_NUMBER(trp, x)    ((EXTRACT_16BITS(&(trp)->token_rseg[x]) & 0xfff0) >> 4)
-#define BRIDGE_NUMBER(trp, x)  ((EXTRACT_16BITS(&(trp)->token_rseg[x]) & 0x000f))
+#define BROADCAST(trp)         ((EXTRACT_BE_U_2(&(trp)->token_rcf) & 0xE000) >> 13)
+#define RIF_LENGTH(trp)                ((EXTRACT_BE_U_2(&(trp)->token_rcf) & 0x1f00) >> 8)
+#define DIRECTION(trp)         ((EXTRACT_BE_U_2(&(trp)->token_rcf) & 0x0080) >> 7)
+#define LARGEST_FRAME(trp)     ((EXTRACT_BE_U_2(&(trp)->token_rcf) & 0x0070) >> 4)
+#define RING_NUMBER(trp, x)    ((EXTRACT_BE_U_2(&(trp)->token_rseg[x]) & 0xfff0) >> 4)
+#define BRIDGE_NUMBER(trp, x)  ((EXTRACT_BE_U_2(&(trp)->token_rseg[x]) & 0x000f))
 #define SEGMENT_COUNT(trp)     ((int)((RIF_LENGTH(trp) - 2) / 2))
 
 struct token_header {
@@ -113,14 +114,13 @@ token_hdr_print(netdissect_options *ndo,
        srcname = etheraddr_string(ndo, fsrc);
        dstname = etheraddr_string(ndo, fdst);
 
-       if (ndo->ndo_vflag)
-               ND_PRINT((ndo, "%02x %02x %s %s %d: ",
+       if (!ndo->ndo_qflag)
+               ND_PRINT((ndo, "%02x %02x ",
                       trp->token_ac,
-                      trp->token_fc,
-                      srcname, dstname,
-                      length));
-       else
-               ND_PRINT((ndo, "%s %s %d: ", srcname, dstname, length));
+                      trp->token_fc));
+       ND_PRINT((ndo, "%s > %s, length %u: ",
+              srcname, dstname,
+              length));
 }
 
 static const char *broadcast_indicator[] = {
@@ -149,8 +149,9 @@ u_int
 token_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
 {
        const struct token_header *trp;
-       u_short extracted_ethertype;
+       int llc_hdrlen;
        struct ether_header ehdr;
+       struct lladdr_info src, dst;
        u_int route_len = 0, hdr_len = TOKEN_HDRLEN;
        int seg;
 
@@ -192,10 +193,10 @@ token_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
                                ND_PRINT((ndo, " [%d:%d]", RING_NUMBER(trp, seg),
                                    BRIDGE_NUMBER(trp, seg)));
                } else {
-                       ND_PRINT((ndo, "rt = %x", EXTRACT_16BITS(&trp->token_rcf)));
+                       ND_PRINT((ndo, "rt = %x", EXTRACT_BE_U_2(&trp->token_rcf)));
 
                        for (seg = 0; seg < SEGMENT_COUNT(trp); seg++)
-                               ND_PRINT((ndo, ":%x", EXTRACT_16BITS(&trp->token_rseg[seg])));
+                               ND_PRINT((ndo, ":%x", EXTRACT_BE_U_2(&trp->token_rseg[seg])));
                }
                ND_PRINT((ndo, " (%s) ", largest_frame[LARGEST_FRAME(trp)]));
        } else {
@@ -203,6 +204,11 @@ token_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
                        token_hdr_print(ndo, trp, length, ESRC(&ehdr), EDST(&ehdr));
        }
 
+       src.addr = ESRC(&ehdr);
+       src.addr_string = etheraddr_string;
+       dst.addr = EDST(&ehdr);
+       dst.addr_string = etheraddr_string;
+
        /* Skip over token ring MAC header and routing information */
        length -= hdr_len;
        p += hdr_len;
@@ -211,20 +217,14 @@ token_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
        /* Frame Control field determines interpretation of packet */
        if (FRAME_TYPE(trp) == TOKEN_FC_LLC) {
                /* Try to print the LLC-layer header & higher layers */
-               if (llc_print(ndo, p, length, caplen, ESRC(&ehdr), EDST(&ehdr),
-                   &extracted_ethertype) == 0) {
-                       /* ether_type not known, print raw packet */
-                       if (!ndo->ndo_eflag)
-                               token_hdr_print(ndo, trp,
-                                   length + TOKEN_HDRLEN + route_len,
-                                   ESRC(&ehdr), EDST(&ehdr));
-                       if (extracted_ethertype) {
-                               ND_PRINT((ndo, "(LLC %s) ",
-                       etherproto_string(htons(extracted_ethertype))));
-                       }
+               llc_hdrlen = llc_print(ndo, p, length, caplen, &src, &dst);
+               if (llc_hdrlen < 0) {
+                       /* packet type not known, print raw packet */
                        if (!ndo->ndo_suppress_default_print)
                                ND_DEFAULTPRINT(p, caplen);
+                       llc_hdrlen = -llc_hdrlen;
                }
+               hdr_len += llc_hdrlen;
        } else {
                /* Some kinds of TR packet we cannot handle intelligently */
                /* XXX - dissect MAC packets if frame type is 0 */