Fix warnings when building for 32-bit and defining _TIME_BITS=64

[tcpdump] / print-fddi.c

diff --git a/print-fddi.c b/print-fddi.c
index 2a47ad65404aae7eacbc1ab939ec6bf20ee7ca92..75a1055fc4832c51d83af4f5e67960c076574cfc 100644 (file)
--- a/print-fddi.c
+++ b/print-fddi.c
@@ -19,27 +19,28 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED
+/* \summary: Fiber Distributed Data Interface (FDDI) printer */
+

 #ifdef HAVE_CONFIG_H
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

-#include <tcpdump-stdinc.h>
+#include "netdissect-stdinc.h"

 
 #include <string.h>
 
 
 #include <string.h>
 

-#include "interface.h"
+#include "netdissect.h"
+#include "extract.h"

 #include "addrtoname.h"
 #include "addrtoname.h"

-#include "ether.h"

 
 /*
  * Based on Ultrix if_fddi.h
  */
 
 struct fddi_header {
 
 /*
  * Based on Ultrix if_fddi.h
  */
 
 struct fddi_header {

-       u_char  fddi_fc;                /* frame control */
-       u_char  fddi_dhost[6];
-       u_char  fddi_shost[6];
+       nd_uint8_t  fddi_fc;            /* frame control */
+       nd_mac_addr fddi_dhost;
+       nd_mac_addr fddi_shost;

 };
 
 /*
 };
 
 /*


@@ -84,9 +85,9 @@ struct fddi_header {
  * Some FDDI interfaces use bit-swapped addresses.
  */
 #if defined(ultrix) || defined(__alpha) || defined(__bsdi) || defined(__NetBSD__) || defined(__linux__)
  * Some FDDI interfaces use bit-swapped addresses.
  */
 #if defined(ultrix) || defined(__alpha) || defined(__bsdi) || defined(__NetBSD__) || defined(__linux__)

-int    fddi_bitswap = 0;
+static int fddi_bitswap = 0;

 #else
 #else

-int    fddi_bitswap = 1;
+static int fddi_bitswap = 1;

 #endif
 
 /*
 #endif
 
 /*


@@ -157,78 +158,78 @@ static const u_char fddi_bit_swap[] = {
 /*
  * Print FDDI frame-control bits
  */
 /*
  * Print FDDI frame-control bits
  */

-static inline void
+static void

 print_fddi_fc(netdissect_options *ndo, u_char fc)
 {
        switch (fc) {
 
        case FDDIFC_VOID:                         /* Void frame */
 print_fddi_fc(netdissect_options *ndo, u_char fc)
 {
        switch (fc) {
 
        case FDDIFC_VOID:                         /* Void frame */

-               ND_PRINT((ndo, "void "));
+               ND_PRINT("void ");

                break;
 
        case FDDIFC_NRT:                          /* Nonrestricted token */
                break;
 
        case FDDIFC_NRT:                          /* Nonrestricted token */

-               ND_PRINT((ndo, "nrt "));
+               ND_PRINT("nrt ");

                break;
 
        case FDDIFC_RT:                           /* Restricted token */
                break;
 
        case FDDIFC_RT:                           /* Restricted token */

-               ND_PRINT((ndo, "rt "));
+               ND_PRINT("rt ");

                break;
 
        case FDDIFC_SMT_INFO:                     /* SMT Info */
                break;
 
        case FDDIFC_SMT_INFO:                     /* SMT Info */

-               ND_PRINT((ndo, "info "));
+               ND_PRINT("info ");

                break;
 
        case FDDIFC_SMT_NSA:                      /* SMT Next station adrs */
                break;
 
        case FDDIFC_SMT_NSA:                      /* SMT Next station adrs */

-               ND_PRINT((ndo, "nsa "));
+               ND_PRINT("nsa ");

                break;
 
        case FDDIFC_MAC_BEACON:                   /* MAC Beacon frame */
                break;
 
        case FDDIFC_MAC_BEACON:                   /* MAC Beacon frame */

-               ND_PRINT((ndo, "beacon "));
+               ND_PRINT("beacon ");

                break;
 
        case FDDIFC_MAC_CLAIM:                    /* MAC Claim frame */
                break;
 
        case FDDIFC_MAC_CLAIM:                    /* MAC Claim frame */

-               ND_PRINT((ndo, "claim "));
+               ND_PRINT("claim ");

                break;
 
        default:
                switch (fc & FDDIFC_CLFF) {
 
                case FDDIFC_MAC:
                break;
 
        default:
                switch (fc & FDDIFC_CLFF) {
 
                case FDDIFC_MAC:

-                       ND_PRINT((ndo, "mac%1x ", fc & FDDIFC_ZZZZ));
+                       ND_PRINT("mac%1x ", fc & FDDIFC_ZZZZ);

                        break;
 
                case FDDIFC_SMT:
                        break;
 
                case FDDIFC_SMT:

-                       ND_PRINT((ndo, "smt%1x ", fc & FDDIFC_ZZZZ));
+                       ND_PRINT("smt%1x ", fc & FDDIFC_ZZZZ);

                        break;
 
                case FDDIFC_LLC_ASYNC:
                        break;
 
                case FDDIFC_LLC_ASYNC:

-                       ND_PRINT((ndo, "async%1x ", fc & FDDIFC_ZZZZ));
+                       ND_PRINT("async%1x ", fc & FDDIFC_ZZZZ);

                        break;
 
                case FDDIFC_LLC_SYNC:
                        break;
 
                case FDDIFC_LLC_SYNC:

-                       ND_PRINT((ndo, "sync%1x ", fc & FDDIFC_ZZZZ));
+                       ND_PRINT("sync%1x ", fc & FDDIFC_ZZZZ);

                        break;
 
                case FDDIFC_IMP_ASYNC:
                        break;
 
                case FDDIFC_IMP_ASYNC:

-                       ND_PRINT((ndo, "imp_async%1x ", fc & FDDIFC_ZZZZ));
+                       ND_PRINT("imp_async%1x ", fc & FDDIFC_ZZZZ);

                        break;
 
                case FDDIFC_IMP_SYNC:
                        break;
 
                case FDDIFC_IMP_SYNC:

-                       ND_PRINT((ndo, "imp_sync%1x ", fc & FDDIFC_ZZZZ));
+                       ND_PRINT("imp_sync%1x ", fc & FDDIFC_ZZZZ);

                        break;
 
                default:
                        break;
 
                default:

-                       ND_PRINT((ndo, "%02x ", fc));
+                       ND_PRINT("%02x ", fc);

                        break;
                }
        }
 }
 
 /* Extract src, dst addresses */
                        break;
                }
        }
 }
 
 /* Extract src, dst addresses */

-static inline void
+static void

 extract_fddi_addrs(const struct fddi_header *fddip, char *fsrc, char *fdst)
 {
 extract_fddi_addrs(const struct fddi_header *fddip, char *fsrc, char *fdst)
 {

-       register int i;
+       int i;

 
        if (fddi_bitswap) {
                /*
 
        if (fddi_bitswap) {
                /*


@@ -239,8 +240,7 @@ extract_fddi_addrs(const struct fddi_header *fddip, char *fsrc, char *fdst)
                        fdst[i] = fddi_bit_swap[fddip->fddi_dhost[i]];
                for (i = 0; i < 6; ++i)
                        fsrc[i] = fddi_bit_swap[fddip->fddi_shost[i]];
                        fdst[i] = fddi_bit_swap[fddip->fddi_dhost[i]];
                for (i = 0; i < 6; ++i)
                        fsrc[i] = fddi_bit_swap[fddip->fddi_shost[i]];

-       }
-       else {
+       } else {

                memcpy(fdst, (const char *)fddip->fddi_dhost, 6);
                memcpy(fsrc, (const char *)fddip->fddi_shost, 6);
        }
                memcpy(fdst, (const char *)fddip->fddi_dhost, 6);
                memcpy(fsrc, (const char *)fddip->fddi_shost, 6);
        }


@@ -249,54 +249,58 @@ extract_fddi_addrs(const struct fddi_header *fddip, char *fsrc, char *fdst)
 /*
  * Print the FDDI MAC header
  */
 /*
  * Print the FDDI MAC header
  */

-static inline void
+static void

 fddi_hdr_print(netdissect_options *ndo,
 fddi_hdr_print(netdissect_options *ndo,

-               register const struct fddi_header *fddip, register u_int length,
-               register const u_char *fsrc, register const u_char *fdst)
+               const struct fddi_header *fddip, u_int length,
+               const u_char *fsrc, const u_char *fdst)

 {
        const char *srcname, *dstname;
 
 {
        const char *srcname, *dstname;
 

-       srcname = etheraddr_string(fsrc);
-       dstname = etheraddr_string(fdst);
-
-       if (ndo->ndo_vflag)
-               ND_PRINT((ndo, "%02x %s %s %d: ",
-                      fddip->fddi_fc,
-                      srcname, dstname,
-                      length));
-       else if (ndo->ndo_qflag)
-               ND_PRINT((ndo, "%s %s %d: ", srcname, dstname, length));
-       else {
-               print_fddi_fc(ndo, fddip->fddi_fc);
-               ND_PRINT((ndo, "%s %s %d: ", srcname, dstname, length));
-       }
+       srcname = etheraddr_string(ndo, fsrc);
+       dstname = etheraddr_string(ndo, fdst);
+
+       if (!ndo->ndo_qflag)
+               print_fddi_fc(ndo, GET_U_1(fddip->fddi_fc));
+       ND_PRINT("%s > %s, length %u: ",
+              srcname, dstname,
+              length);

 }
 
 }
 

-static inline void
+static void

 fddi_smt_print(netdissect_options *ndo, const u_char *p _U_, u_int length _U_)
 {
 fddi_smt_print(netdissect_options *ndo, const u_char *p _U_, u_int length _U_)
 {

-       ND_PRINT((ndo, "<SMT printer not yet implemented>"));
+       ND_PRINT("<SMT printer not yet implemented>");

 }
 
 }
 

-void
+u_int

 fddi_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
 {
        const struct fddi_header *fddip = (const struct fddi_header *)p;
 fddi_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
 {
        const struct fddi_header *fddip = (const struct fddi_header *)p;

-       struct ether_header ehdr;
-       u_short extracted_ethertype;
+       uint8_t fc;
+       nd_mac_addr srcmac, dstmac;
+       struct lladdr_info src, dst;
+       int llc_hdrlen;

 
 

+       ndo->ndo_protocol = "fddi";

        if (caplen < FDDI_HDRLEN) {
        if (caplen < FDDI_HDRLEN) {

-               ND_PRINT((ndo, "[|fddi]"));
-               return;
+               nd_print_trunc(ndo);
+               return (caplen);

        }
 
        }
 

+       fc = GET_U_1(fddip->fddi_fc);
+

        /*
         * Get the FDDI addresses into a canonical form
         */
        /*
         * Get the FDDI addresses into a canonical form
         */

-       extract_fddi_addrs(fddip, (char *)ESRC(&ehdr), (char *)EDST(&ehdr));
+       extract_fddi_addrs(fddip, (char *)srcmac, (char *)dstmac);

 
        if (ndo->ndo_eflag)
 
        if (ndo->ndo_eflag)

-               fddi_hdr_print(ndo, fddip, length, ESRC(&ehdr), EDST(&ehdr));
+               fddi_hdr_print(ndo, fddip, length, srcmac, dstmac);
+
+       src.addr = srcmac;
+       src.addr_string = etheraddr_string;
+       dst.addr = dstmac;
+       dst.addr_string = etheraddr_string;

 
        /* Skip over FDDI MAC header */
        length -= FDDI_HDRLEN;
 
        /* Skip over FDDI MAC header */
        length -= FDDI_HDRLEN;


@@ -304,34 +308,31 @@ fddi_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
        caplen -= FDDI_HDRLEN;
 
        /* Frame Control field determines interpretation of packet */
        caplen -= FDDI_HDRLEN;
 
        /* Frame Control field determines interpretation of packet */

-       if ((fddip->fddi_fc & FDDIFC_CLFF) == FDDIFC_LLC_ASYNC) {
+       if ((fc & FDDIFC_CLFF) == FDDIFC_LLC_ASYNC) {

                /* Try to print the LLC-layer header & higher layers */
                /* Try to print the LLC-layer header & higher layers */

-               if (llc_print(p, length, caplen, ESRC(&ehdr), EDST(&ehdr),
-                   &extracted_ethertype) == 0) {
+               llc_hdrlen = llc_print(ndo, p, length, caplen, &src, &dst);
+               if (llc_hdrlen < 0) {

                        /*
                         * Some kinds of LLC packet we cannot
                         * handle intelligently
                         */
                        /*
                         * Some kinds of LLC packet we cannot
                         * handle intelligently
                         */

-                       if (!ndo->ndo_eflag)
-                               fddi_hdr_print(ndo, fddip, length + FDDI_HDRLEN,
-                                   ESRC(&ehdr), EDST(&ehdr));
-                       if (extracted_ethertype) {
-                               ND_PRINT((ndo, "(LLC %s) ",
-                       etherproto_string(htons(extracted_ethertype))));
-                       }

                        if (!ndo->ndo_suppress_default_print)
                        if (!ndo->ndo_suppress_default_print)

-                               ndo->ndo_default_print(ndo, p, caplen);
+                               ND_DEFAULTPRINT(p, caplen);
+                       llc_hdrlen = -llc_hdrlen;

                }
                }

-       } else if ((fddip->fddi_fc & FDDIFC_CLFF) == FDDIFC_SMT)
+       } else if ((fc & FDDIFC_CLFF) == FDDIFC_SMT) {

                fddi_smt_print(ndo, p, caplen);
                fddi_smt_print(ndo, p, caplen);

-       else {
+               llc_hdrlen = 0;
+       } else {

                /* Some kinds of FDDI packet we cannot handle intelligently */
                if (!ndo->ndo_eflag)
                /* Some kinds of FDDI packet we cannot handle intelligently */
                if (!ndo->ndo_eflag)

-                       fddi_hdr_print(ndo, fddip, length + FDDI_HDRLEN, ESRC(&ehdr),
-                           EDST(&ehdr));
+                       fddi_hdr_print(ndo, fddip, length + FDDI_HDRLEN, srcmac,
+                           dstmac);

                if (!ndo->ndo_suppress_default_print)
                if (!ndo->ndo_suppress_default_print)

-                       ndo->ndo_default_print(ndo, p, caplen);
+                       ND_DEFAULTPRINT(p, caplen);
+               llc_hdrlen = 0;

        }
        }

+       return (FDDI_HDRLEN + llc_hdrlen);

 }
 
 /*
 }
 
 /*


@@ -340,10 +341,9 @@ fddi_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */

-u_int
-fddi_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, register const u_char *p)
+void
+fddi_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)

 {
 {

-       fddi_print(ndo, p, h->len, h->caplen);
-
-       return (FDDI_HDRLEN);
+       ndo->ndo_protocol = "fddi";
+       ndo->ndo_ll_hdr_len += fddi_print(ndo, p, h->len, h->caplen);

 }
 }