More UNALIGNED_MEM{CPY,CMP} on IP addresses.

[tcpdump] / print-arcnet.c

diff --git a/print-arcnet.c b/print-arcnet.c
index 2c9d4e8e667548e384a1a6a83127243a6b4de391..d3d92938c3a509787cb5a15b5a56cd9f74a1e00b 100644 (file)
--- a/print-arcnet.c
+++ b/print-arcnet.c
@@ -20,10 +20,6 @@
  *
  * 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
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -35,12 +31,81 @@ static const char rcsid[] _U_ =
 #include <pcap.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 {
+       u_int8_t  arc_shost;
+       u_int8_t  arc_dhost;
+       u_int8_t  arc_type;
+       /*
+        * 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;
+
+       /*
+        * 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 */
+};
+
+#define        ARC_HDRLEN              3
+#define        ARC_HDRNEWLEN           6
+#define        ARC_HDRNEWLEN_EXC       10
+
+/* 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 {
+       u_int8_t  arc_shost;
+       u_int8_t  arc_dhost;
+       u_int16_t arc_offset;
+       u_int8_t  arc_type;
+       /*
+        * 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;
+};
+
+#define        ARC_LINUX_HDRLEN        5
+#define        ARC_LINUX_HDRNEWLEN     8
 
 static int arcnet_encap_print(u_char arctype, const u_char *p,
     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" },
@@ -103,7 +168,7 @@ arcnet_print(const u_char *bp, u_int length, int phds, int flag, u_int seqid)
 /*
  * 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
@@ -151,11 +216,11 @@ arcnet_if_print(const struct pcap_pkthdr *h, const u_char *p)
                                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;
-                       seqid = ntohs(ap->arc_seqid);
+                       seqid = EXTRACT_16BITS(&ap->arc_seqid);
                        archdrlen = ARC_HDRNEWLEN;
                }
        }
@@ -187,7 +252,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,
- * '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
@@ -259,19 +324,19 @@ arcnet_encap_print(u_char arctype, const u_char *p,
 
        case ARCTYPE_IP_OLD:
        case ARCTYPE_IP:
-               ip_print(p, length);
+               ip_print(gndo, p, length);
                return (1);
 
 #ifdef INET6
        case ARCTYPE_INET6:
-               ip6_print(p, length);
+               ip6_print(gndo, p, length);
                return (1);
 #endif /*INET6*/
 
        case ARCTYPE_ARP_OLD:
        case ARCTYPE_ARP:
        case ARCTYPE_REVARP:
-               arp_print(p, length, caplen);
+               arp_print(gndo, p, length, caplen);
                return (1);
 
        case ARCTYPE_ATALK:     /* XXX was this ever used? */
@@ -288,3 +353,10 @@ arcnet_encap_print(u_char arctype, const u_char *p,
                return (0);
        }
 }
+
+/*
+ * Local Variables:
+ * c-style: bsd
+ * End:
+ */
+