diff options
Diffstat (limited to 'usr.sbin/tcpdump/print-ether.c')
| -rw-r--r-- | usr.sbin/tcpdump/print-ether.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/usr.sbin/tcpdump/print-ether.c b/usr.sbin/tcpdump/print-ether.c index 9c8211e7dce..ab033274ec0 100644 --- a/usr.sbin/tcpdump/print-ether.c +++ b/usr.sbin/tcpdump/print-ether.c @@ -1,5 +1,3 @@ -/* $OpenBSD: print-ether.c,v 1.5 1996/11/12 08:31:57 mickey Exp $ */ - /* * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996 * The Regents of the University of California. All rights reserved. @@ -21,13 +19,12 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ #ifndef lint -static char rcsid[] = - "@(#) Header: print-ether.c,v 1.39 96/06/03 03:05:27 leres Exp (LBL)"; +static const char rcsid[] = + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-ether.c,v 1.6 1996/12/12 16:22:38 bitblt Exp $ (LBL)"; #endif #include <sys/param.h> #include <sys/time.h> -#include <sys/types.h> #include <sys/socket.h> #if __STDC__ @@ -57,7 +54,7 @@ const u_char *packetp; const u_char *snapend; static inline void -ether_print(register const u_char *bp, int length) +ether_print(register const u_char *bp, u_int length) { register const struct ether_header *ep; @@ -84,8 +81,8 @@ ether_print(register const u_char *bp, int length) void ether_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p) { - int caplen = h->caplen; - int length = h->len; + u_int caplen = h->caplen; + u_int length = h->len; struct ether_header *ep; u_short ether_type; extern u_short extracted_ethertype; @@ -158,7 +155,8 @@ ether_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p) u_short extracted_ethertype; int -ether_encap_print(u_short ethertype, const u_char *p, int length, int caplen) +ether_encap_print(u_short ethertype, const u_char *p, + u_int length, u_int caplen) { extracted_ethertype = ethertype; @@ -187,11 +185,8 @@ ether_encap_print(u_short ethertype, const u_char *p, int length, int caplen) aarp_print(p, length); return (1); - case ETHERTYPE_8022: - netbios_print(p, length); - return (1); - case ETHERTYPE_LAT: + case ETHERTYPE_SCA: case ETHERTYPE_MOPRC: case ETHERTYPE_MOPDL: /* default_print for now */ @@ -199,4 +194,3 @@ ether_encap_print(u_short ethertype, const u_char *p, int length, int caplen) return (0); } } - |