diff options
| author | fenner <fenner@FreeBSD.org> | 2002-06-21 00:49:02 +0000 |
|---|---|---|
| committer | fenner <fenner@FreeBSD.org> | 2002-06-21 00:49:02 +0000 |
| commit | 6d9538de202e4b8787f1b1a2ee8dce6273a43dc2 (patch) | |
| tree | cf4df09e1e89ebd11358792543230083e577ad0f /contrib/tcpdump/print-ether.c | |
| parent | d832be42ce7cc0a492cddc15e8429bc29fb46462 (diff) | |
| download | FreeBSD-src-6d9538de202e4b8787f1b1a2ee8dce6273a43dc2.zip FreeBSD-src-6d9538de202e4b8787f1b1a2ee8dce6273a43dc2.tar.gz | |
Merge tcpdump 3.7.1
MFC after: 2 weeks
Diffstat (limited to 'contrib/tcpdump/print-ether.c')
| -rw-r--r-- | contrib/tcpdump/print-ether.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/contrib/tcpdump/print-ether.c b/contrib/tcpdump/print-ether.c index 3c165c5..6ca59fd 100644 --- a/contrib/tcpdump/print-ether.c +++ b/contrib/tcpdump/print-ether.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 + * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -22,7 +22,7 @@ */ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.61 2000/12/22 22:45:10 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.65 2001/07/04 22:03:14 fenner Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -84,6 +84,7 @@ ether_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p) u_short ether_type; u_short extracted_ethertype; + ++infodelay; ts_print(&h->ts); if (caplen < ETHER_HDRLEN) { @@ -139,6 +140,9 @@ ether_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p) default_print(p, caplen); out: putchar('\n'); + --infodelay; + if (infoprint) + info(0); } /* @@ -230,6 +234,19 @@ ether_encap_print(u_short ethertype, const u_char *p, pppoe_print(p, length); return (1); + case ETHERTYPE_PPP: + printf("ppp"); + if (length) { + printf(": "); + ppp_print(p, length); + } + return (1); + + case ETHERTYPE_MPLS: + case ETHERTYPE_MPLS_MULTI: + mpls_print(p, length); + return (1); + case ETHERTYPE_LAT: case ETHERTYPE_SCA: case ETHERTYPE_MOPRC: |
