diff options
| author |   jason <jason@openbsd.org> | 2000-10-19 16:31:41 +0000 |
|---|---|---|
| committer | jason <jason@openbsd.org> | 2000-10-19 16:31:41 +0000 |
| commit | 251413292d886ffc7143fc5ca574a7617a0625b7 (patch) | |
| tree | 214c0b8593a3be5773a5e86e7a7d590efd31a83a /usr.sbin/tcpdump/print-llc.c | |
| parent | Repair two typos; caught by gluk@ptci.ru. (diff) | |
| download | wireguard-openbsd-251413292d886ffc7143fc5ca574a7617a0625b7.tar.xz wireguard-openbsd-251413292d886ffc7143fc5ca574a7617a0625b7.zip | |
code for printing bridge spanning tree packets
also fix a bug where llc encoded frames are hex dumped twice when -x is used
Diffstat (limited to 'usr.sbin/tcpdump/print-llc.c')
| -rw-r--r-- | usr.sbin/tcpdump/print-llc.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/usr.sbin/tcpdump/print-llc.c b/usr.sbin/tcpdump/print-llc.c index 20df1d9d60a..5b5e473e6dd 100644 --- a/usr.sbin/tcpdump/print-llc.c +++ b/usr.sbin/tcpdump/print-llc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-llc.c,v 1.9 2000/10/03 14:31:57 ho Exp $ */ +/* $OpenBSD: print-llc.c,v 1.10 2000/10/19 16:31:42 jason Exp $ */ /* * Copyright (c) 1992, 1993, 1994, 1995, 1996, 1997 @@ -26,7 +26,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /home/cvs/src/usr.sbin/tcpdump/print-llc.c,v 1.9 2000/10/03 14:31:57 ho Exp $"; + "@(#) $Header: /home/cvs/src/usr.sbin/tcpdump/print-llc.c,v 1.10 2000/10/19 16:31:42 jason Exp $"; #endif #include <sys/param.h> @@ -131,6 +131,11 @@ llc_print(const u_char *p, u_int length, u_int caplen, return (ret); } + if (llc.ssap == LLCSAP_8021D && llc.dsap == LLCSAP_8021D) { + stp_print(p, length); + return (1); + } + if ((llc.ssap & ~LLC_GSAP) == llc.dsap) { if (eflag) (void)printf("%s ", llcsap_string(llc.dsap)); @@ -210,8 +215,5 @@ llc_print(const u_char *p, u_int length, u_int caplen, caplen -= 4; } (void)printf(" len=%d", length); - if (caplen > 0) { - default_print_unaligned(p, caplen); - } return(1); } |