Use nd_ types, add EXTRACT_ calls.

[tcpdump] / print-arcnet.c

diff --git a/print-arcnet.c b/print-arcnet.c
index d3d92938c3a509787cb5a15b5a56cd9f74a1e00b..4dccf4a9c593bf56289d5bd416ccd99160f7e670 100644 (file)
--- a/print-arcnet.c
+++ b/print-arcnet.c
@@ -21,16 +21,15 @@
  * From: NetBSD: print-arcnet.c,v 1.2 2000/04/24 13:02:28 itojun Exp
  */
 
  * From: NetBSD: print-arcnet.c,v 1.2 2000/04/24 13:02:28 itojun Exp
  */
 

+/* \summary: Attached Resource Computer NETwork (ARCNET) printer */
+

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

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

 
 

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

 #include "extract.h"
 
 /*
 #include "extract.h"
 
 /*


@@ -42,22 +41,22 @@
  * as given to interface code.
  */
 struct arc_header {
  * as given to interface code.
  */
 struct arc_header {

-       u_int8_t  arc_shost;
-       u_int8_t  arc_dhost;
-       u_int8_t  arc_type;
+       nd_uint8_t  arc_shost;
+       nd_uint8_t  arc_dhost;
+       nd_uint8_t  arc_type;

        /*
         * only present for newstyle encoding with LL fragmentation.
         * Don't use sizeof(anything), use ARC_HDR{,NEW}LEN instead.
         */
        /*
         * only present for newstyle encoding with LL fragmentation.
         * Don't use sizeof(anything), use ARC_HDR{,NEW}LEN instead.
         */

-       u_int8_t  arc_flag;
-       u_int16_t arc_seqid;
+       nd_uint8_t  arc_flag;
+       nd_uint16_t arc_seqid;

 
        /*
         * only present in exception packets (arc_flag == 0xff)
         */
 
        /*
         * only present in exception packets (arc_flag == 0xff)
         */

-       u_int8_t  arc_type2;    /* same as arc_type */
-       u_int8_t  arc_flag2;    /* real flag value */
-       u_int16_t arc_seqid2;   /* real seqid value */
+       nd_uint8_t  arc_type2;  /* same as arc_type */
+       nd_uint8_t  arc_flag2;  /* real flag value */
+       nd_uint16_t arc_seqid2; /* real seqid value */

 };
 
 #define        ARC_HDRLEN              3
 };
 
 #define        ARC_HDRLEN              3


@@ -86,23 +85,23 @@ struct      arc_header {
  * never presents packets that look like exception frames.
  */
 struct arc_linux_header {
  * never presents packets that look like exception frames.
  */
 struct arc_linux_header {

-       u_int8_t  arc_shost;
-       u_int8_t  arc_dhost;
-       u_int16_t arc_offset;
-       u_int8_t  arc_type;
+       nd_uint8_t  arc_shost;
+       nd_uint8_t  arc_dhost;
+       nd_uint16_t arc_offset;
+       nd_uint8_t  arc_type;

        /*
         * only present for newstyle encoding with LL fragmentation.
         * Don't use sizeof(anything), use ARC_LINUX_HDR{,NEW}LEN
         * instead.
         */
        /*
         * only present for newstyle encoding with LL fragmentation.
         * Don't use sizeof(anything), use ARC_LINUX_HDR{,NEW}LEN
         * instead.
         */

-       u_int8_t  arc_flag;
-       u_int16_t arc_seqid;
+       nd_uint8_t  arc_flag;
+       nd_uint16_t arc_seqid;

 };
 
 #define        ARC_LINUX_HDRLEN        5
 #define        ARC_LINUX_HDRNEWLEN     8
 
 };
 
 #define        ARC_LINUX_HDRLEN        5
 #define        ARC_LINUX_HDRNEWLEN     8
 

-static int arcnet_encap_print(u_char arctype, const u_char *p,
+static int arcnet_encap_print(netdissect_options *, u_char arctype, const u_char *p,

     u_int length, u_int caplen);
 
 static const struct tok arctypemap[] = {
     u_int length, u_int caplen);
 
 static const struct tok arctypemap[] = {


@@ -120,7 +119,8 @@ static const struct tok arctypemap[] = {
 };
 
 static inline void
 };
 
 static inline void

-arcnet_print(const u_char *bp, u_int length, int phds, int flag, u_int seqid)
+arcnet_print(netdissect_options *ndo, const u_char *bp, u_int length, int phds,
+             int flag, u_int seqid)

 {
        const struct arc_header *ap;
        const char *arctypename;
 {
        const struct arc_header *ap;
        const char *arctypename;


@@ -129,40 +129,48 @@ arcnet_print(const u_char *bp, u_int length, int phds, int flag, u_int seqid)
        ap = (const struct arc_header *)bp;
 
 
        ap = (const struct arc_header *)bp;
 
 

-       if (qflag) {
-               (void)printf("%02x %02x %d: ",
-                            ap->arc_shost,
-                            ap->arc_dhost,
-                            length);
+       if (ndo->ndo_qflag) {
+               ND_PRINT((ndo, "%02x %02x %u: ",
+                            EXTRACT_U_1(ap->arc_shost),
+                            EXTRACT_U_1(ap->arc_dhost),
+                            length));

                return;
        }
 
                return;
        }
 

-       arctypename = tok2str(arctypemap, "%02x", ap->arc_type);
+       arctypename = tok2str(arctypemap, "%02x", EXTRACT_U_1(ap->arc_type));

 
        if (!phds) {
 
        if (!phds) {

-               (void)printf("%02x %02x %s %d: ",
-                            ap->arc_shost, ap->arc_dhost, arctypename,
-                            length);
-                            return;
+               ND_PRINT((ndo, "%02x %02x %s %d: ",
+                            EXTRACT_U_1(ap->arc_shost),
+                            EXTRACT_U_1(ap->arc_dhost),
+                            arctypename,
+                            length));
+               return;

        }
 
        if (flag == 0) {
        }
 
        if (flag == 0) {

-               (void)printf("%02x %02x %s seqid %04x %d: ",
-                       ap->arc_shost, ap->arc_dhost, arctypename, seqid,
-                       length);
-                       return;
+               ND_PRINT((ndo, "%02x %02x %s seqid %04x %d: ",
+                       EXTRACT_U_1(ap->arc_shost),
+                       EXTRACT_U_1(ap->arc_dhost),
+                       arctypename, seqid,
+                       length));
+               return;

        }
 
        if (flag & 1)
        }
 
        if (flag & 1)

-               (void)printf("%02x %02x %s seqid %04x "
+               ND_PRINT((ndo, "%02x %02x %s seqid %04x "

                        "(first of %d fragments) %d: ",
                        "(first of %d fragments) %d: ",

-                       ap->arc_shost, ap->arc_dhost, arctypename, seqid,
-                       (flag + 3) / 2, length);
+                       EXTRACT_U_1(ap->arc_shost),
+                       EXTRACT_U_1(ap->arc_dhost),
+                       arctypename, seqid,
+                       (flag + 3) / 2, length));

        else
        else

-               (void)printf("%02x %02x %s seqid %04x "
+               ND_PRINT((ndo, "%02x %02x %s seqid %04x "

                        "(fragment %d) %d: ",
                        "(fragment %d) %d: ",

-                       ap->arc_shost, ap->arc_dhost, arctypename, seqid,
-                       flag/2 + 1, length);
+                       EXTRACT_U_1(ap->arc_shost),
+                       EXTRACT_U_1(ap->arc_dhost),
+                       arctypename, seqid,
+                       flag/2 + 1, length));

 }
 
 /*
 }
 
 /*


@@ -172,7 +180,7 @@ arcnet_print(const u_char *bp, u_int length, int phds, int flag, u_int seqid)
  * is the number of bytes actually captured.
  */
 u_int
  * is the number of bytes actually captured.
  */
 u_int

-arcnet_if_print(const struct pcap_pkthdr *h, const u_char *p)
+arcnet_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)

 {
        u_int caplen = h->caplen;
        u_int length = h->len;
 {
        u_int caplen = h->caplen;
        u_int length = h->len;


@@ -182,13 +190,13 @@ arcnet_if_print(const struct pcap_pkthdr *h, const u_char *p)
        u_int seqid = 0;
        u_char arc_type;
 
        u_int seqid = 0;
        u_char arc_type;
 

-       if (caplen < ARC_HDRLEN) {
-               printf("[|arcnet]");
+       if (caplen < ARC_HDRLEN || length < ARC_HDRLEN) {
+               ND_PRINT((ndo, "[|arcnet]"));

                return (caplen);
        }
 
        ap = (const struct arc_header *)p;
                return (caplen);
        }
 
        ap = (const struct arc_header *)p;

-       arc_type = ap->arc_type;
+       arc_type = EXTRACT_U_1(ap->arc_type);

 
        switch (arc_type) {
        default:
 
        switch (arc_type) {
        default:


@@ -203,31 +211,31 @@ arcnet_if_print(const struct pcap_pkthdr *h, const u_char *p)
        }
 
        if (phds) {
        }
 
        if (phds) {

-               if (caplen < ARC_HDRNEWLEN) {
-                       arcnet_print(p, length, 0, 0, 0);
-                       printf("[|phds]");
+               if (caplen < ARC_HDRNEWLEN || length < ARC_HDRNEWLEN) {
+                       arcnet_print(ndo, p, length, 0, 0, 0);
+                       ND_PRINT((ndo, "[|phds]"));

                        return (caplen);
                }
 
                        return (caplen);
                }
 

-               if (ap->arc_flag == 0xff) {
-                       if (caplen < ARC_HDRNEWLEN_EXC) {
-                               arcnet_print(p, length, 0, 0, 0);
-                               printf("[|phds extended]");
+               flag = EXTRACT_U_1(ap->arc_flag);
+               if (flag == 0xff) {
+                       if (caplen < ARC_HDRNEWLEN_EXC || length < ARC_HDRNEWLEN_EXC) {
+                               arcnet_print(ndo, p, length, 0, 0, 0);
+                               ND_PRINT((ndo, "[|phds extended]"));

                                return (caplen);
                        }
                                return (caplen);
                        }

-                       flag = ap->arc_flag2;
-                       seqid = EXTRACT_16BITS(&ap->arc_seqid2);
+                       flag = EXTRACT_U_1(ap->arc_flag2);
+                       seqid = EXTRACT_BE_U_2(ap->arc_seqid2);

                        archdrlen = ARC_HDRNEWLEN_EXC;
                } else {
                        archdrlen = ARC_HDRNEWLEN_EXC;
                } else {

-                       flag = ap->arc_flag;
-                       seqid = EXTRACT_16BITS(&ap->arc_seqid);
+                       seqid = EXTRACT_BE_U_2(ap->arc_seqid);

                        archdrlen = ARC_HDRNEWLEN;
                }
        }
 
 
                        archdrlen = ARC_HDRNEWLEN;
                }
        }
 
 

-       if (eflag)
-               arcnet_print(p, length, phds, flag, seqid);
+       if (ndo->ndo_eflag)
+               arcnet_print(ndo, p, length, phds, flag, seqid);

 
        /*
         * Go past the ARCNET header.
 
        /*
         * Go past the ARCNET header.


@@ -243,8 +251,8 @@ arcnet_if_print(const struct pcap_pkthdr *h, const u_char *p)
                return (archdrlen);
        }
 
                return (archdrlen);
        }
 

-       if (!arcnet_encap_print(arc_type, p, length, caplen))
-               default_print(p, caplen);
+       if (!arcnet_encap_print(ndo, arc_type, p, length, caplen))
+               ND_DEFAULTPRINT(p, caplen);

 
        return (archdrlen);
 }
 
        return (archdrlen);
 }


@@ -260,7 +268,7 @@ arcnet_if_print(const struct pcap_pkthdr *h, const u_char *p)
  * extra "offset" field between the src/dest and packet type.
  */
 u_int
  * extra "offset" field between the src/dest and packet type.
  */
 u_int

-arcnet_linux_if_print(const struct pcap_pkthdr *h, const u_char *p)
+arcnet_linux_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)

 {
        u_int caplen = h->caplen;
        u_int length = h->len;
 {
        u_int caplen = h->caplen;
        u_int length = h->len;


@@ -269,19 +277,19 @@ arcnet_linux_if_print(const struct pcap_pkthdr *h, const u_char *p)
        int archdrlen = 0;
        u_char arc_type;
 
        int archdrlen = 0;
        u_char arc_type;
 

-       if (caplen < ARC_LINUX_HDRLEN) {
-               printf("[|arcnet]");
+       if (caplen < ARC_LINUX_HDRLEN || length < ARC_LINUX_HDRLEN) {
+               ND_PRINT((ndo, "[|arcnet]"));

                return (caplen);
        }
 
        ap = (const struct arc_linux_header *)p;
                return (caplen);
        }
 
        ap = (const struct arc_linux_header *)p;

-       arc_type = ap->arc_type;
+       arc_type = EXTRACT_U_1(ap->arc_type);

 
        switch (arc_type) {
        default:
                archdrlen = ARC_LINUX_HDRNEWLEN;
 
        switch (arc_type) {
        default:
                archdrlen = ARC_LINUX_HDRNEWLEN;

-               if (caplen < ARC_LINUX_HDRNEWLEN) {
-                       printf("[|arcnet]");
+               if (caplen < ARC_LINUX_HDRNEWLEN || length < ARC_LINUX_HDRNEWLEN) {
+                       ND_PRINT((ndo, "[|arcnet]"));

                        return (caplen);
                }
                break;
                        return (caplen);
                }
                break;


@@ -292,8 +300,8 @@ arcnet_linux_if_print(const struct pcap_pkthdr *h, const u_char *p)
                break;
        }
 
                break;
        }
 

-       if (eflag)
-               arcnet_print(p, length, 0, 0, 0);
+       if (ndo->ndo_eflag)
+               arcnet_print(ndo, p, length, 0, 0, 0);

 
        /*
         * Go past the ARCNET header.
 
        /*
         * Go past the ARCNET header.


@@ -302,8 +310,8 @@ arcnet_linux_if_print(const struct pcap_pkthdr *h, const u_char *p)
        caplen -= archdrlen;
        p += archdrlen;
 
        caplen -= archdrlen;
        p += archdrlen;
 

-       if (!arcnet_encap_print(arc_type, p, length, caplen))
-               default_print(p, caplen);
+       if (!arcnet_encap_print(ndo, arc_type, p, length, caplen))
+               ND_DEFAULTPRINT(p, caplen);

 
        return (archdrlen);
 }
 
        return (archdrlen);
 }


@@ -317,36 +325,34 @@ arcnet_linux_if_print(const struct pcap_pkthdr *h, const u_char *p)
 
 
 static int
 
 
 static int

-arcnet_encap_print(u_char arctype, const u_char *p,
+arcnet_encap_print(netdissect_options *ndo, u_char arctype, const u_char *p,

     u_int length, u_int caplen)
 {
        switch (arctype) {
 
        case ARCTYPE_IP_OLD:
        case ARCTYPE_IP:
     u_int length, u_int caplen)
 {
        switch (arctype) {
 
        case ARCTYPE_IP_OLD:
        case ARCTYPE_IP:

-               ip_print(gndo, p, length);
+               ip_print(ndo, p, length);

                return (1);
 
                return (1);
 

-#ifdef INET6

        case ARCTYPE_INET6:
        case ARCTYPE_INET6:

-               ip6_print(gndo, p, length);
+               ip6_print(ndo, p, length);

                return (1);
                return (1);

-#endif /*INET6*/

 
        case ARCTYPE_ARP_OLD:
        case ARCTYPE_ARP:
        case ARCTYPE_REVARP:
 
        case ARCTYPE_ARP_OLD:
        case ARCTYPE_ARP:
        case ARCTYPE_REVARP:

-               arp_print(gndo, p, length, caplen);
+               arp_print(ndo, p, length, caplen);

                return (1);
 
        case ARCTYPE_ATALK:     /* XXX was this ever used? */
                return (1);
 
        case ARCTYPE_ATALK:     /* XXX was this ever used? */

-               if (vflag)
-                       fputs("et1 ", stdout);
-               atalk_print(p, length);
+               if (ndo->ndo_vflag)
+                       ND_PRINT((ndo, "et1 "));
+               atalk_print(ndo, p, length);

                return (1);
 
        case ARCTYPE_IPX:
                return (1);
 
        case ARCTYPE_IPX:

-               ipx_print(p, length);
+               ipx_print(ndo, p, length);

                return (1);
 
        default:
                return (1);
 
        default: