Add changes in 4.2.1.

[tcpdump] / print-arcnet.c

diff --git a/print-arcnet.c b/print-arcnet.c
index 5bedcba69d7540197b69dabb933278369f4d2ce4..9531f346bff70e1610536a4f68c0f2fa4a4347ba 100644 (file)
--- a/print-arcnet.c
+++ b/print-arcnet.c
@@ -22,7 +22,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-arcnet.c,v 1.18 2004-03-17 23:24:35 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-arcnet.c,v 1.20 2005-04-06 21:32:38 mcr Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -35,6 +35,7 @@ static const char rcsid[] _U_ =
 #include <pcap.h>
 
 #include "interface.h"
+#include "extract.h"
 #include "arcnet.h"
 
 static int arcnet_encap_print(u_char arctype, const u_char *p,
@@ -151,11 +152,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;
                }
        }
@@ -259,19 +260,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 +289,10 @@ arcnet_encap_print(u_char arctype, const u_char *p,
                return (0);
        }
 }
+
+/*
+ * Local Variables:
+ * c-style: bsd
+ * End:
+ */
+