summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhannes <hannes>2007-03-18 17:12:36 +0000
committerhannes <hannes>2007-03-18 17:12:36 +0000
commited062a3aee340915d15017eadb5e4d6208b108b1 (patch)
tree2e88d50e6d82f76affda9ce6d16dedd3ecb4487b
parentff85096ba40c2952aade5d250f8564c7b4f7171e (diff)
downloadtcpdump-ed062a3aee340915d15017eadb5e4d6208b108b1.tar.gz
Bugfix from Carles Kishimoto <carles.kishimoto@gmail.com>:
the port and prio fields of mstp PDUs need to be properly shifted.
-rw-r--r--print-stp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/print-stp.c b/print-stp.c
index c704b1c6..caceba9a 100644
--- a/print-stp.c
+++ b/print-stp.c
@@ -11,7 +11,7 @@
#ifndef lint
static const char rcsid[] _U_ =
-"@(#) $Header: /tcpdump/master/tcpdump/print-stp.c,v 1.13.2.6 2007-03-09 18:59:48 hannes Exp $";
+"@(#) $Header: /tcpdump/master/tcpdump/print-stp.c,v 1.13.2.7 2007-03-18 17:12:36 hannes Exp $";
#endif
#ifdef HAVE_CONFIG_H
@@ -267,8 +267,8 @@ stp_print_mstp_bpdu(const struct stp_bpdu_ *stp_bpdu, u_int length)
EXTRACT_32BITS(ptr + offset +
MST_BPDU_MSTI_ROOT_PATH_COST_OFFSET));
printf("\n\t\tMSTI bridge-prio %d, port-prio %d, hops %d",
- ptr[offset + MST_BPDU_MSTI_BRIDGE_PRIO_OFFSET],
- ptr[offset + MST_BPDU_MSTI_PORT_PRIO_OFFSET],
+ ptr[offset + MST_BPDU_MSTI_BRIDGE_PRIO_OFFSET] >> 4,
+ ptr[offset + MST_BPDU_MSTI_PORT_PRIO_OFFSET] >> 4,
ptr[offset + MST_BPDU_MSTI_REMAIN_HOPS_OFFSET]);
len -= MST_BPDU_MSTI_LENGTH;