OpenBSD CVS

CVS log for src/usr.sbin/tcpdump/print-ether.c


[BACK] Up to [local] / src / usr.sbin / tcpdump

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.42 / (download) - annotate - [select for diffs], Thu Jun 9 12:56:14 2022 UTC (2 years ago) by mbuhl
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5, OPENBSD_7_4_BASE, OPENBSD_7_4, OPENBSD_7_3_BASE, OPENBSD_7_3, OPENBSD_7_2_BASE, OPENBSD_7_2, HEAD
Changes since 1.41: +2 -1 lines
Diff to previous 1.41 (colored)

Readd ETHERTYPE_NHRPA case.
Found by Stefan Butz.
ok dlg@

Revision 1.41 / (download) - annotate - [select for diffs], Wed Jan 5 05:53:03 2022 UTC (2 years, 5 months ago) by dlg
Branch: MAIN
CVS Tags: OPENBSD_7_1_BASE, OPENBSD_7_1
Changes since 1.40: +89 -0 lines
Diff to previous 1.40 (colored)

add a basic printer for EAPOL packets.

EAPOL turns out to be a little container for a bunch of other types
of packets, including EAP for use with vanilla 802.1X, a kind of
capability announcement thing, and MACsec Key Agreement.

it's not worth adding a separately file for such a small chunk of
functionality, and it seems specific to ethernet. parsers/printers
for the sub protocols can come later if needed.

ok deraadt@ visa@

Revision 1.40 / (download) - annotate - [select for diffs], Wed Jan 5 05:47:53 2022 UTC (2 years, 5 months ago) by dlg
Branch: MAIN
Changes since 1.39: +1 -11 lines
Diff to previous 1.39 (colored)

ethertypes.h has now added the missing ethertypes we're looking at here.

Revision 1.39 / (download) - annotate - [select for diffs], Wed Dec 1 18:28:46 2021 UTC (2 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.38: +1 -3 lines
Diff to previous 1.38 (colored)

we do not need 'struct mbuf; struct rtentry;' to satisfy some ancient unix
variant that made a header file mistake.
ok jsg

Revision 1.38 / (download) - annotate - [select for diffs], Wed Apr 15 20:19:25 2020 UTC (4 years, 1 month ago) by remi
Branch: MAIN
CVS Tags: OPENBSD_7_0_BASE, OPENBSD_7_0, OPENBSD_6_9_BASE, OPENBSD_6_9, OPENBSD_6_8_BASE, OPENBSD_6_8, OPENBSD_6_7_BASE, OPENBSD_6_7
Changes since 1.37: +8 -1 lines
Diff to previous 1.37 (colored)

add support for printing RfC 2332 NBMA Next Hop Resolution Protocol (NHRP)

ok dlg@

Revision 1.37 / (download) - annotate - [select for diffs], Fri Jan 24 22:46:36 2020 UTC (4 years, 4 months ago) by procter
Branch: MAIN
Changes since 1.36: +11 -11 lines
Diff to previous 1.36 (colored)

- (void)printf() -> printf(); the cast adds clutter for little value.
- fprintf(stdout, ...) -> printf()
- fputs(x, stdout) -> printf(); for consistency.
fputs is twice as fast on atom x5-Z8300@1.44GHz but Amdahl sees a pure printf
tcpdump only 2% slower than a pure fputs (for constant strings) tcpdump
to /dev/null across a 20MB/~170k packet pcap file.

ok dlg@ for fputs and ok tedu@ krw@ deraadt@ a2k19 for the rest

Revision 1.36 / (download) - annotate - [select for diffs], Tue Dec 3 01:43:33 2019 UTC (4 years, 6 months ago) by dlg
Branch: MAIN
Changes since 1.35: +8 -1 lines
Diff to previous 1.35 (colored)

add support for printing RFC 8300 Network Service Header (NSH)

ok deraadt@

Revision 1.35 / (download) - annotate - [select for diffs], Sun Nov 18 08:55:51 2018 UTC (5 years, 6 months ago) by dlg
Branch: MAIN
CVS Tags: OPENBSD_6_6_BASE, OPENBSD_6_6, OPENBSD_6_5_BASE, OPENBSD_6_5
Changes since 1.34: +2 -2 lines
Diff to previous 1.34 (colored)

later versions of 802.1Q replaced the vlan CFI field with DEI

CFI stood for canonical format indicator, and basically said whether
the payload was ethernet of fddi (with 0 meaning ethernet).

DEI stands for drop eligibility indicator

Revision 1.34 / (download) - annotate - [select for diffs], Sun Nov 18 08:53:37 2018 UTC (5 years, 6 months ago) by dlg
Branch: MAIN
Changes since 1.33: +46 -1 lines
Diff to previous 1.33 (colored)

handle the 802.1Q i-tag format for provider backbone bridges.

Revision 1.33 / (download) - annotate - [select for diffs], Mon Oct 22 16:12:45 2018 UTC (5 years, 7 months ago) by kn
Branch: MAIN
Changes since 1.32: +2 -6 lines
Diff to previous 1.32 (colored)

Remove #ifdef INET6

There's not reason to build without IPv6 support, `-U INET6' builds were
broken anyway.

Fix an empty redefine for IPPROTO_IPV6 in print-ip.c while here.

No object change on amd64 and sparc64 with clang, gcc compiles differently
but behaviour stays the same.

OK denis deraadt

Revision 1.32 / (download) - annotate - [select for diffs], Tue Apr 3 01:57:31 2018 UTC (6 years, 2 months ago) by dlg
Branch: MAIN
CVS Tags: OPENBSD_6_4_BASE, OPENBSD_6_4
Changes since 1.31: +13 -5 lines
Diff to previous 1.31 (colored)

tweak vlan printing to properly decode the priority field.

the vlan specs have the priority of 0 and 1 swapped on the wire,
which is how the kernel handles them. eg, if you use pf to set prio
1, it will end up being 0 on the wire. this makes 0 on the wire
come out as 1 in tcpdump so it is consistent with the rest of the
tooling.

ok henning@

Revision 1.31 / (download) - annotate - [select for diffs], Mon Jul 11 00:27:50 2016 UTC (7 years, 11 months ago) by rzalamena
Branch: MAIN
CVS Tags: OPENBSD_6_3_BASE, OPENBSD_6_3, OPENBSD_6_2_BASE, OPENBSD_6_2, OPENBSD_6_1_BASE, OPENBSD_6_1, OPENBSD_6_0_BASE, OPENBSD_6_0
Changes since 1.30: +21 -15 lines
Diff to previous 1.30 (colored)

Teach tcpdump to recognize MPLS pseudowire with control words. Added
support to print encapsulated ethernet packets as well.

"Looks good" deraadt@

Revision 1.30 / (download) - annotate - [select for diffs], Mon Nov 16 00:16:39 2015 UTC (8 years, 6 months ago) by mmcc
Branch: MAIN
CVS Tags: OPENBSD_5_9_BASE, OPENBSD_5_9
Changes since 1.29: +3 -3 lines
Diff to previous 1.29 (colored)

Remove remaining instances of the register keyword.

ok deraadt@

Revision 1.29 / (download) - annotate - [select for diffs], Fri Jan 16 06:40:21 2015 UTC (9 years, 4 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE, OPENBSD_5_8, OPENBSD_5_7_BASE, OPENBSD_5_7
Changes since 1.28: +1 -2 lines
Diff to previous 1.28 (colored)

Replace <sys/param.h> with <limits.h> and other less dirty headers where
possible.  Annotate <sys/param.h> lines with their current reasons.  Switch
to PATH_MAX, NGROUPS_MAX, HOST_NAME_MAX+1, LOGIN_NAME_MAX, etc.  Change
MIN() and MAX() to local definitions of MINIMUM() and MAXIMUM() where
sensible to avoid pulling in the pollution.  These are the files confirmed
through binary verification.
ok guenther, millert, doug (helped with the verification protocol)

Revision 1.28 / (download) - annotate - [select for diffs], Thu Aug 14 12:44:44 2014 UTC (9 years, 9 months ago) by mpi
Branch: MAIN
Changes since 1.27: +1 -2 lines
Diff to previous 1.27 (colored)

No use for <netinet/in_systm.h> nor <netinet/tcpip.h>.

Revision 1.27 / (download) - annotate - [select for diffs], Thu Jan 14 04:57:06 2010 UTC (14 years, 4 months ago) by jsing
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE, OPENBSD_5_6, OPENBSD_5_5_BASE, OPENBSD_5_5, OPENBSD_5_4_BASE, OPENBSD_5_4, OPENBSD_5_3_BASE, OPENBSD_5_3, OPENBSD_5_2_BASE, OPENBSD_5_2, OPENBSD_5_1_BASE, OPENBSD_5_1, OPENBSD_5_0_BASE, OPENBSD_5_0, OPENBSD_4_9_BASE, OPENBSD_4_9, OPENBSD_4_8_BASE, OPENBSD_4_8, OPENBSD_4_7_BASE, OPENBSD_4_7
Changes since 1.26: +18 -5 lines
Diff to previous 1.26 (colored)

Include the link-level header in the hex output if both the -x and -e
options are specified.

ok claudio@ sthen@ deraadt@ jmc@

Revision 1.26 / (download) - annotate - [select for diffs], Tue Oct 27 23:59:55 2009 UTC (14 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.25: +1 -5 lines
Diff to previous 1.25 (colored)

rcsid[] and sccsid[] and copyright[] are essentially unmaintained (and
unmaintainable).  these days, people use source.  these id's do not provide
any benefit, and do hurt the small install media
(the 33,000 line diff is essentially mechanical)
ok with the idea millert, ok dms

Revision 1.25 / (download) - annotate - [select for diffs], Fri Dec 5 01:25:24 2008 UTC (15 years, 6 months ago) by sthen
Branch: MAIN
CVS Tags: OPENBSD_4_6_BASE, OPENBSD_4_6, OPENBSD_4_5_BASE, OPENBSD_4_5
Changes since 1.24: +7 -3 lines
Diff to previous 1.24 (colored)

add ethertype and tcpdump support for VLAN stacking (QinQ) with
type number 0x88a8 specified by 802.1ad.

from reyk on misc@.  "ok, go for it" dlg

Revision 1.24 / (download) - annotate - [select for diffs], Thu Oct 16 12:57:01 2008 UTC (15 years, 7 months ago) by mpf
Branch: MAIN
Changes since 1.23: +6 -2 lines
Diff to previous 1.23 (colored)

Add support for IEEE "slow protocols" LACP, MARKER as per 802.3ad.
Code from tcpdump.org with cleanup and shrinkage by me.
Help and ideas for extra sanity checks from canacar@
OK canacar@

Revision 1.23 / (download) - annotate - [select for diffs], Sun Oct 7 16:41:05 2007 UTC (16 years, 8 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_4_4_BASE, OPENBSD_4_4, OPENBSD_4_3_BASE, OPENBSD_4_3
Changes since 1.22: +2 -2 lines
Diff to previous 1.22 (colored)

trash $Header goo which is just annoying; 5595

Revision 1.22 / (download) - annotate - [select for diffs], Thu Jun 1 17:18:39 2006 UTC (18 years ago) by moritz
Branch: MAIN
CVS Tags: OPENBSD_4_2_BASE, OPENBSD_4_2, OPENBSD_4_1_BASE, OPENBSD_4_1, OPENBSD_4_0_BASE, OPENBSD_4_0
Changes since 1.21: +13 -7 lines
Diff to previous 1.21 (colored)

Pass the captured packet length in addition to the real packet length
to etherip_print() and do all the bounds checking with it. Also add
bounds checks to ether_print(). This fixes even more crashes.

ok canacar@

Revision 1.21 / (download) - annotate - [select for diffs], Tue Mar 28 15:48:33 2006 UTC (18 years, 2 months ago) by reyk
Branch: MAIN
Changes since 1.20: +6 -2 lines
Diff to previous 1.20 (colored)

Add a simple printer for IEEE 802.1AB LLDP, the Link Layer Discovery
Protocol.

LLDP is used by some switch vendors as a replacement for the non-free
Cizzco Discovery Protocol (CDP) due to some Cisco patentry...

ok brad@

Revision 1.20 / (download) - annotate - [select for diffs], Sat Oct 8 19:45:15 2005 UTC (18 years, 8 months ago) by canacar
Branch: MAIN
CVS Tags: OPENBSD_3_9_BASE, OPENBSD_3_9
Changes since 1.19: +7 -2 lines
Diff to previous 1.19 (colored)

Add a best effort mpls decoder. From Jason L. Wright.
Since the encapsulated protocol information is not always
available in the MPLS tag stack. The decoder attempts
to guess the protocol.
ok brad@

Revision 1.19 / (download) - annotate - [select for diffs], Thu Jan 22 16:18:52 2004 UTC (20 years, 4 months ago) by jason
Branch: MAIN
CVS Tags: OPENBSD_3_8_BASE, OPENBSD_3_8, OPENBSD_3_7_BASE, OPENBSD_3_7, OPENBSD_3_6_BASE, OPENBSD_3_6, OPENBSD_3_5_BASE, OPENBSD_3_5
Changes since 1.18: +36 -2 lines
Diff to previous 1.18 (colored)

802.3X pretty printer (dead simple)
jakob@: "seems reasonable"

Revision 1.18 / (download) - annotate - [select for diffs], Tue Feb 19 19:39:40 2002 UTC (22 years, 3 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_3_4_BASE, OPENBSD_3_4, OPENBSD_3_3_BASE, OPENBSD_3_3, OPENBSD_3_2_BASE, OPENBSD_3_2, OPENBSD_3_1_BASE, OPENBSD_3_1
Changes since 1.17: +2 -4 lines
Diff to previous 1.17 (colored)

We live in an ANSI C world.  Remove lots of gratuitous #ifdef __STDC__ cruft.

Revision 1.17 / (download) - annotate - [select for diffs], Mon Feb 5 15:18:47 2001 UTC (23 years, 4 months ago) by jason
Branch: MAIN
CVS Tags: OPENBSD_3_0_BASE, OPENBSD_3_0, OPENBSD_2_9_BASE, OPENBSD_2_9
Changes since 1.16: +4 -4 lines
Diff to previous 1.16 (colored)

etherip printing code... handles draft (v2) and current (v3)

Revision 1.16 / (download) - annotate - [select for diffs], Tue Oct 3 14:31:57 2000 UTC (23 years, 8 months ago) by ho
Branch: MAIN
CVS Tags: OPENBSD_2_8_BASE, OPENBSD_2_8
Changes since 1.15: +3 -1 lines
Diff to previous 1.15 (colored)

Add $OpenBSD$. (jakob@ ok)

Revision 1.15 / (download) - annotate - [select for diffs], Wed Apr 26 21:35:40 2000 UTC (24 years, 1 month ago) by jakob
Branch: MAIN
CVS Tags: OPENBSD_2_7_BASE, OPENBSD_2_7
Changes since 1.14: +11 -2 lines
Diff to previous 1.14 (colored)

INET6
DHCP/BOOTP
tcp & udp checksum detection
numerous bugfixes

Revision 1.14 / (download) - annotate - [select for diffs], Tue Mar 7 18:16:37 2000 UTC (24 years, 3 months ago) by chris
Branch: MAIN
Changes since 1.13: +2 -2 lines
Diff to previous 1.13 (colored)

Use ETHERTYPE_8021Q

Revision 1.13 / (download) - annotate - [select for diffs], Tue Mar 7 16:50:42 2000 UTC (24 years, 3 months ago) by chris
Branch: MAIN
Changes since 1.12: +31 -4 lines
Diff to previous 1.12 (colored)

Add 802.1Q from kuznet@ms2.inr.ac.ru via tcpdump.org
also, make extracted_ethertype not extern

Revision 1.12 / (download) - annotate - [select for diffs], Sat Feb 19 14:55:18 2000 UTC (24 years, 3 months ago) by chris
Branch: MAIN
Changes since 1.11: +1 -12 lines
Diff to previous 1.11 (colored)

Remove bogus 802.1Q code
ok jakob@

Revision 1.11 / (download) - annotate - [select for diffs], Fri Feb 18 14:39:35 2000 UTC (24 years, 3 months ago) by jason
Branch: MAIN
Changes since 1.10: +8 -1 lines
Diff to previous 1.10 (colored)

Add support for dumping PPPoE Discovery and Session packets

Revision 1.10 / (download) - annotate - [select for diffs], Sun Jan 16 12:32:16 2000 UTC (24 years, 4 months ago) by jakob
Branch: MAIN
Changes since 1.9: +12 -1 lines
Diff to previous 1.9 (colored)

VLAN 802.1q support

Revision 1.9 / (download) - annotate - [select for diffs], Thu Sep 16 17:06:48 1999 UTC (24 years, 8 months ago) by brad
Branch: MAIN
CVS Tags: OPENBSD_2_6_BASE, OPENBSD_2_6
Changes since 1.8: +3 -3 lines
Diff to previous 1.8 (colored)

#if __STDC__ --> #ifdef __STDC__

Revision 1.8 / (download) - annotate - [select for diffs], Wed Jul 28 20:41:36 1999 UTC (24 years, 10 months ago) by jakob
Branch: MAIN
Changes since 1.7: +2 -2 lines
Diff to previous 1.7 (colored)

-  Merge some changes from tcpdump 3.4
   -a flag; attempt to convert network and broadcast addresses to names
   Improved signal handling
   Miscellaneous fixes and typos
   OSPF MD5 authentication support

-  -X flag; emacs-hexl print (including ascii)

-  Add ECN bits to TCP and IP headers

-  IKE & IPsec (ESP & AH) support

OK deraadt@

Revision 1.7 / (download) - annotate - [select for diffs], Sun Jul 27 01:34:34 1997 UTC (26 years, 10 months ago) by denny
Branch: MAIN
CVS Tags: OPENBSD_2_5_BASE, OPENBSD_2_5, OPENBSD_2_4_BASE, OPENBSD_2_4, OPENBSD_2_3_BASE, OPENBSD_2_3, OPENBSD_2_2_BASE, OPENBSD_2_2
Changes since 1.6: +2 -2 lines
Diff to previous 1.6 (colored)

Ethernet v2 encapsulated Appletalk packets are phase 1, w/ LLAP header.
802.3/SNAP encapsulated Appletalk packets are phase 2, w/ no LLAP header.

Revision 1.6 / (download) - annotate - [select for diffs], Thu Dec 12 16:22:38 1996 UTC (27 years, 6 months ago) by bitblt
Branch: MAIN
CVS Tags: OPENBSD_2_1_BASE, OPENBSD_2_1
Changes since 1.5: +8 -14 lines
Diff to previous 1.5 (colored)

*** empty log message ***

Revision 1.5 / (download) - annotate - [select for diffs], Tue Nov 12 08:31:57 1996 UTC (27 years, 7 months ago) by mickey
Branch: MAIN
Changes since 1.4: +5 -1 lines
Diff to previous 1.4 (colored)

add NetBIOS printing.

Revision 1.4 / (download) - annotate - [select for diffs], Sat Jul 13 11:01:21 1996 UTC (27 years, 11 months ago) by mickey
Branch: MAIN
CVS Tags: OPENBSD_2_0_BASE, OPENBSD_2_0
Changes since 1.3: +7 -4 lines
Diff to previous 1.3 (colored)

it is 3.2 now.

Revision 1.3 / (download) - annotate - [select for diffs], Mon Jun 10 07:47:34 1996 UTC (28 years ago) by deraadt
Branch: MAIN
Changes since 1.2: +1 -1 lines
Diff to previous 1.2 (colored)

sync to latest

Revision 1.2 / (download) - annotate - [select for diffs], Mon Mar 4 15:59:23 1996 UTC (28 years, 3 months ago) by mickey
Branch: MAIN
Changes since 1.1: +1 -0 lines
Diff to previous 1.1 (colored)

Updating to the latest LBL release.
Sun's SKIP support added.

Revision 1.1.1.1 / (download) - annotate - [select for diffs] (vendor branch), Wed Oct 18 08:48:25 1995 UTC (28 years, 7 months ago) by deraadt
CVS Tags: netbsd_1_1
Changes since 1.1: +0 -0 lines
Diff to previous 1.1 (colored)

initial import of NetBSD tree

Revision 1.1 / (download) - annotate - [select for diffs], Wed Oct 18 08:48:25 1995 UTC (28 years, 7 months ago) by deraadt
Branch: MAIN

Initial revision

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.