Put the when-printing and when-saving-to-a-file descriptions of "-v"

[tcpdump] / print-arcnet.c

diff --git a/print-arcnet.c b/print-arcnet.c
index 50d7bf833389c0602d6b8b61b2be9fd841c5bcad..2c9d4e8e667548e384a1a6a83127243a6b4de391 100644 (file)
--- a/print-arcnet.c
+++ b/print-arcnet.c
@@ -21,8 +21,8 @@
  * From: NetBSD: print-arcnet.c,v 1.2 2000/04/24 13:02:28 itojun Exp
  */
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-arcnet.c,v 1.13 2002-12-19 09:39:10 guy Exp $ (LBL)";
+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
@@ -151,11 +151,11 @@ arcnet_if_print(const struct pcap_pkthdr *h, const u_char *p)
                                return (caplen);
                        }
                        flag = ap->arc_flag2;
-                       seqid = ap->arc_seqid2;
+                       seqid = ntohs(ap->arc_seqid2);
                        archdrlen = ARC_HDRNEWLEN_EXC;
                } else {
                        flag = ap->arc_flag;
-                       seqid = ap->arc_seqid;
+                       seqid = ntohs(ap->arc_seqid);
                        archdrlen = ARC_HDRNEWLEN;
                }
        }
@@ -171,8 +171,71 @@ arcnet_if_print(const struct pcap_pkthdr *h, const u_char *p)
        caplen -= archdrlen;
        p += archdrlen;
 
-       if (phds && flag && (flag & 1) == 0)
+       if (phds && flag && (flag & 1) == 0) {
+               /*
+                * This is a middle fragment.
+                */
                return (archdrlen);
+       }
+
+       if (!arcnet_encap_print(arc_type, p, length, caplen))
+               default_print(p, caplen);
+
+       return (archdrlen);
+}
+
+/*
+ * 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'
+ * 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
+ * reassembled packets rather than raw frames, and headers have an
+ * 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)
+{
+       u_int caplen = h->caplen;
+       u_int length = h->len;
+       const struct arc_linux_header *ap;
+
+       int archdrlen = 0;
+       u_char arc_type;
+
+       if (caplen < ARC_LINUX_HDRLEN) {
+               printf("[|arcnet]");
+               return (caplen);
+       }
+
+       ap = (const struct arc_linux_header *)p;
+       arc_type = ap->arc_type;
+
+       switch (arc_type) {
+       default:
+               archdrlen = ARC_LINUX_HDRNEWLEN;
+               if (caplen < ARC_LINUX_HDRNEWLEN) {
+                       printf("[|arcnet]");
+                       return (caplen);
+               }
+               break;
+       case ARCTYPE_IP_OLD:
+       case ARCTYPE_ARP_OLD:
+       case ARCTYPE_DIAGNOSE:
+               archdrlen = ARC_LINUX_HDRLEN;
+               break;
+       }
+
+       if (eflag)
+               arcnet_print(p, length, 0, 0, 0);
+
+       /*
+        * Go past the ARCNET header.
+        */
+       length -= archdrlen;
+       caplen -= archdrlen;
+       p += archdrlen;
 
        if (!arcnet_encap_print(arc_type, p, length, caplen))
                default_print(p, caplen);
@@ -217,6 +280,10 @@ arcnet_encap_print(u_char arctype, const u_char *p,
                atalk_print(p, length);
                return (1);
 
+       case ARCTYPE_IPX:
+               ipx_print(p, length);
+               return (1);
+
        default:
                return (0);
        }