Add CAP_FCNTL and use cap_fcntls_limit().

[tcpdump] / print-arcnet.c

diff --git a/print-arcnet.c b/print-arcnet.c
index 2c9d4e8e667548e384a1a6a83127243a6b4de391..0ffb9220709b6253b372d3ccb59b0284dbffa7f7 100644 (file)
--- a/print-arcnet.c
+++ b/print-arcnet.c
@@ -20,27 +20,90 @@
  *
  * 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
  */

-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-arcnet.c,v 1.17 2003-11-16 09:36:12 guy Exp $ (LBL)";
-#endif

 
 

+#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 

-#include <stdio.h>
-#include <pcap.h>
-

 #include "interface.h"
 #include "interface.h"

-#include "arcnet.h"
+#include "extract.h"
+
+/*
+ * from: NetBSD: if_arc.h,v 1.13 1999/11/19 20:41:19 thorpej Exp
+ */
+
+/*
+ * Structure of a 2.5MB/s Arcnet header on the BSDs,
+ * as given to interface code.
+ */
+struct arc_header {
+       uint8_t  arc_shost;
+       uint8_t  arc_dhost;
+       uint8_t  arc_type;
+       /*
+        * only present for newstyle encoding with LL fragmentation.
+        * Don't use sizeof(anything), use ARC_HDR{,NEW}LEN instead.
+        */
+       uint8_t  arc_flag;
+       uint16_t arc_seqid;
+
+       /*
+        * only present in exception packets (arc_flag == 0xff)
+        */
+       uint8_t  arc_type2;     /* same as arc_type */
+       uint8_t  arc_flag2;     /* real flag value */
+       uint16_t arc_seqid2;    /* real seqid value */
+};
+
+#define        ARC_HDRLEN              3
+#define        ARC_HDRNEWLEN           6
+#define        ARC_HDRNEWLEN_EXC       10

 
 

-static int arcnet_encap_print(u_char arctype, const u_char *p,
+/* RFC 1051 */
+#define        ARCTYPE_IP_OLD          240     /* IP protocol */
+#define        ARCTYPE_ARP_OLD         241     /* address resolution protocol */
+
+/* RFC 1201 */
+#define        ARCTYPE_IP              212     /* IP protocol */
+#define        ARCTYPE_ARP             213     /* address resolution protocol */
+#define        ARCTYPE_REVARP          214     /* reverse addr resolution protocol */
+
+#define        ARCTYPE_ATALK           221     /* Appletalk */
+#define        ARCTYPE_BANIAN          247     /* Banyan Vines */
+#define        ARCTYPE_IPX             250     /* Novell IPX */
+
+#define ARCTYPE_INET6          0xc4    /* IPng */
+#define ARCTYPE_DIAGNOSE       0x80    /* as per ANSI/ATA 878.1 */
+
+/*
+ * Structure of a 2.5MB/s Arcnet header on Linux.  Linux has
+ * an extra "offset" field when given to interface code, and
+ * never presents packets that look like exception frames.
+ */
+struct arc_linux_header {
+       uint8_t  arc_shost;
+       uint8_t  arc_dhost;
+       uint16_t arc_offset;
+       uint8_t  arc_type;
+       /*
+        * only present for newstyle encoding with LL fragmentation.
+        * Don't use sizeof(anything), use ARC_LINUX_HDR{,NEW}LEN
+        * instead.
+        */
+       uint8_t  arc_flag;
+       uint16_t arc_seqid;
+};
+
+#define        ARC_LINUX_HDRLEN        5
+#define        ARC_LINUX_HDRNEWLEN     8
+
+static int arcnet_encap_print(netdissect_options *, u_char arctype, const u_char *p,

     u_int length, u_int caplen);
 
     u_int length, u_int caplen);
 

-struct tok arctypemap[] = {
+static const struct tok arctypemap[] = {

        { ARCTYPE_IP_OLD,       "oldip" },
        { ARCTYPE_ARP_OLD,      "oldarp" },
        { ARCTYPE_IP,           "ip" },
        { ARCTYPE_IP_OLD,       "oldip" },
        { ARCTYPE_ARP_OLD,      "oldarp" },
        { ARCTYPE_IP,           "ip" },


@@ -55,7 +118,8 @@ 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;


@@ -64,50 +128,50 @@ 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: ",
+       if (ndo->ndo_qflag) {
+               ND_PRINT((ndo, "%02x %02x %d: ",

                             ap->arc_shost,
                             ap->arc_dhost,
                             ap->arc_shost,
                             ap->arc_dhost,

-                            length);
+                            length));

                return;
        }
 
        arctypename = tok2str(arctypemap, "%02x", ap->arc_type);
 
        if (!phds) {
                return;
        }
 
        arctypename = tok2str(arctypemap, "%02x", ap->arc_type);
 
        if (!phds) {

-               (void)printf("%02x %02x %s %d: ",
+               ND_PRINT((ndo, "%02x %02x %s %d: ",

                             ap->arc_shost, ap->arc_dhost, arctypename,
                             ap->arc_shost, ap->arc_dhost, arctypename,

-                            length);
+                            length));

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

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

                        ap->arc_shost, ap->arc_dhost, arctypename, seqid,
                        ap->arc_shost, ap->arc_dhost, arctypename, seqid,

-                       length);
+                       length));

                        return;
        }
 
        if (flag & 1)
                        return;
        }
 
        if (flag & 1)

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

                        "(first of %d fragments) %d: ",
                        ap->arc_shost, ap->arc_dhost, arctypename, seqid,
                        "(first of %d fragments) %d: ",
                        ap->arc_shost, ap->arc_dhost, arctypename, seqid,

-                       (flag + 3) / 2, length);
+                       (flag + 3) / 2, length));

        else
        else

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

                        "(fragment %d) %d: ",
                        ap->arc_shost, ap->arc_dhost, arctypename, seqid,
                        "(fragment %d) %d: ",
                        ap->arc_shost, ap->arc_dhost, arctypename, seqid,

-                       flag/2 + 1, length);
+                       flag/2 + 1, length));

 }
 
 /*
  * This is the top level routine of the printer.  'p' points
  * to the ARCNET header of the packet, 'h->ts' is the timestamp,
 }
 
 /*
  * This is the top level routine of the printer.  'p' points
  * to the ARCNET header of the packet, 'h->ts' is the timestamp,

- * 'h->length' is the length of the packet off the wire, and 'h->caplen'
+ * 'h->len' is the length of the packet off the wire, and 'h->caplen'

  * 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;


@@ -117,8 +181,8 @@ 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);
        }
 
                return (caplen);
        }
 


@@ -138,31 +202,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);
                }
 
                if (ap->arc_flag == 0xff) {
                        return (caplen);
                }
 
                if (ap->arc_flag == 0xff) {

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

                                return (caplen);
                        }
                        flag = ap->arc_flag2;
                                return (caplen);
                        }
                        flag = ap->arc_flag2;

-                       seqid = ntohs(ap->arc_seqid2);
+                       seqid = EXTRACT_16BITS(&ap->arc_seqid2);

                        archdrlen = ARC_HDRNEWLEN_EXC;
                } else {
                        flag = ap->arc_flag;
                        archdrlen = ARC_HDRNEWLEN_EXC;
                } else {
                        flag = ap->arc_flag;

-                       seqid = ntohs(ap->arc_seqid);
+                       seqid = EXTRACT_16BITS(&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.


@@ -178,8 +242,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);
 }


@@ -187,7 +251,7 @@ arcnet_if_print(const struct pcap_pkthdr *h, const u_char *p)
 /*
  * This is the top level routine of the printer.  'p' points
  * to the ARCNET header of the packet, 'h->ts' is the timestamp,
 /*
  * This is the top level routine of the printer.  'p' points
  * to the ARCNET header of the packet, 'h->ts' is the timestamp,

- * 'h->length' is the length of the packet off the wire, and 'h->caplen'
+ * 'h->len' is the length of the packet off the wire, and 'h->caplen'

  * is the number of bytes actually captured.  It is quite similar
  * to the non-Linux style printer except that Linux doesn't ever
  * supply packets that look like exception frames, it always supplies
  * is the number of bytes actually captured.  It is quite similar
  * to the non-Linux style printer except that Linux doesn't ever
  * supply packets that look like exception frames, it always supplies


@@ -195,7 +259,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;


@@ -204,8 +268,8 @@ 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);
        }
 
                return (caplen);
        }
 


@@ -215,8 +279,8 @@ arcnet_linux_if_print(const struct pcap_pkthdr *h, const u_char *p)
        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;


@@ -227,8 +291,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.


@@ -237,8 +301,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);
 }


@@ -252,39 +316,44 @@ 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(p, length);
+               ip_print(ndo, p, length);

                return (1);
 
                return (1);
 

-#ifdef INET6

        case ARCTYPE_INET6:
        case ARCTYPE_INET6:

-               ip6_print(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(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 (0);
        }
 }
                return (1);
 
        default:
                return (0);
        }
 }

+
+/*
+ * Local Variables:
+ * c-style: bsd
+ * End:
+ */
+