diff options
author | Bruce M Simpson <bms@FreeBSD.org> | 2004-03-31 09:17:26 +0000 |
---|---|---|
committer | Bruce M Simpson <bms@FreeBSD.org> | 2004-03-31 09:17:26 +0000 |
commit | 5b0fe47811aa43b75fc69dbf7338cace232a4d48 (patch) | |
tree | eb08e08f0f875c3b16f8e1aec86091f100906f1c /contrib/tcpdump/print-stp.c | |
parent | c76561e4dc56e0caaeade9b482501e52daad5ce3 (diff) | |
download | src-5b0fe47811aa43b75fc69dbf7338cace232a4d48.tar.gz src-5b0fe47811aa43b75fc69dbf7338cace232a4d48.zip |
Import tcpdump 3.8.3, from http://www.tcpdump.org/releases/tcpdump-3.8.3.tar.gz
Notes
Notes:
svn path=/vendor/tcpdump/dist/; revision=127668
Diffstat (limited to 'contrib/tcpdump/print-stp.c')
-rw-r--r-- | contrib/tcpdump/print-stp.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/contrib/tcpdump/print-stp.c b/contrib/tcpdump/print-stp.c index 40d4d79cb95c..7b28070d48eb 100644 --- a/contrib/tcpdump/print-stp.c +++ b/contrib/tcpdump/print-stp.c @@ -10,19 +10,15 @@ */ #ifndef lint -static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-stp.c,v 1.6.6.1 2002/05/29 10:00:00 guy Exp $"; +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-stp.c,v 1.11.2.2 2003/11/16 08:51:46 guy Exp $"; #endif #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include <sys/param.h> -#include <sys/time.h> -#include <sys/socket.h> - -#include <netinet/in.h> +#include <tcpdump-stdinc.h> #include <stdlib.h> #include <stdio.h> @@ -40,7 +36,7 @@ stp_print_bridge_id(const u_char *p) } static void -stp_print_config_bpdu(const u_char *p, u_int length) +stp_print_config_bpdu(const u_char *p) { printf("config "); if (p[7] & 1) @@ -63,7 +59,7 @@ stp_print_config_bpdu(const u_char *p, u_int length) } static void -stp_print_tcn_bpdu(const u_char *p, u_int length) +stp_print_tcn_bpdu(void) { printf("tcn"); } @@ -82,17 +78,17 @@ stp_print(const u_char *p, u_int length) printf("unknown version"); return; } - + switch (p[6]) { - case 0: + case 0x00: if (length < 10) goto trunc; - stp_print_config_bpdu(p, length); + stp_print_config_bpdu(p); break; - case 1: - stp_print_tcn_bpdu(p, length); + case 0x80: + stp_print_tcn_bpdu(); break; default: |