There's no link-layer header on Linux ARPHRD_ATM packets; there's

[tcpdump] / print-arcnet.c

diff --git a/print-arcnet.c b/print-arcnet.c
index 1e6b2308821460784d6859136ce2bb0e285477c5..4250c3a1656aafed5e18a6cabb3ad1bb5d099cc3 100644 (file)
--- a/print-arcnet.c
+++ b/print-arcnet.c
@@ -22,7 +22,11 @@
  */
 #ifndef lint
 static const char rcsid[] =
  */
 #ifndef lint
 static const char rcsid[] =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-arcnet.c,v 1.1 2001-04-17 08:39:19 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-arcnet.c,v 1.6 2001-09-17 21:57:54 fenner Exp $ (LBL)";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"

 #endif
 
 #include <sys/param.h>
 #endif
 
 #include <sys/param.h>


@@ -40,16 +44,10 @@ struct rtentry;
 #include "interface.h"
 #include "arcnet.h"
 
 #include "interface.h"
 #include "arcnet.h"
 

-const u_char *packetp;
-const u_char *snapend;
-

 int arcnet_encap_print(u_char arctype, const u_char *p,
     u_int length, u_int caplen);
 
 int arcnet_encap_print(u_char arctype, const u_char *p,
     u_int length, u_int caplen);
 

-struct arctype_map {
-       const int arctype;
-       char * const name;
-} arctypemap[] = {
+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" },


@@ -67,9 +65,7 @@ static inline void
 arcnet_print(const u_char *bp, u_int length, int phds, int flag, u_int seqid)
 {
        const struct arc_header *ap;
 arcnet_print(const u_char *bp, u_int length, int phds, int flag, u_int seqid)
 {
        const struct arc_header *ap;

-       struct arctype_map *atmp;
-       char *arctypename;
-       char typebuf[3];
+       const char *arctypename;

 
 
        ap = (const struct arc_header *)bp;
 
 
        ap = (const struct arc_header *)bp;


@@ -83,16 +79,7 @@ arcnet_print(const u_char *bp, u_int length, int phds, int flag, u_int seqid)
                return;
        }
 
                return;
        }
 

-       for (arctypename = NULL, atmp = arctypemap; atmp->arctype; atmp++) {
-               if (atmp->arctype == ap->arc_type) {
-                       arctypename = atmp->name;
-                       break;
-               }
-       }
-       if (!arctypename) {
-               arctypename = typebuf;
-               (void)snprintf(typebuf, sizeof(typebuf), "%02x", ap->arc_type);
-       }
+       arctypename = tok2str(arctypemap, "%02x", ap->arc_type);

 
        if (!phds) {
                (void)printf("%02x %02x %s %d: ",
 
        if (!phds) {
                (void)printf("%02x %02x %s %d: ",


@@ -131,12 +118,13 @@ arcnet_if_print(u_char *user, 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;

-       struct arc_header *ap;
+       const struct arc_header *ap;

 
 

-       int phds, flag = 0, archdrlen;
+       int phds, flag = 0, archdrlen = 0;

        u_int seqid = 0;
        u_char arc_type;
 
        u_int seqid = 0;
        u_char arc_type;
 

+       ++infodelay;

        ts_print(&h->ts);
 
        if (caplen < ARC_HDRLEN) {
        ts_print(&h->ts);
 
        if (caplen < ARC_HDRLEN) {


@@ -144,7 +132,7 @@ arcnet_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
                goto out;
        }
 
                goto out;
        }
 

-       ap = (struct arc_header *)p;
+       ap = (const struct arc_header *)p;

        arc_type = ap->arc_type;
 
        switch (arc_type) {
        arc_type = ap->arc_type;
 
        switch (arc_type) {


@@ -212,6 +200,9 @@ arcnet_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
 
  out:
        putchar('\n');
 
  out:
        putchar('\n');

+       --infodelay;
+       if (infoprint)
+               info(0);

 }
 
 /*
 }
 
 /*