diff options
| author | guy <guy> | 2005-11-13 12:12:41 +0000 |
|---|---|---|
| committer | guy <guy> | 2005-11-13 12:12:41 +0000 |
| commit | dd928cfb35d7ceeacf55dd880ffc9673ac8809e7 (patch) | |
| tree | 199addded786551dd05b060773db9f797ab335b6 /print-ipfc.c | |
| parent | 86f96f8a7be545190da718a2908928d185e26d76 (diff) | |
| download | tcpdump-dd928cfb35d7ceeacf55dd880ffc9673ac8809e7.tar.gz | |
Have print_llc() clear out the extracted_ethertype argument, rather than
having its callers do so - some of its callers *weren't* doing so,
leaving random junk in that argument in some cases.
When checking for "802.3-encapsulated" IPX, check the raw values of the
SSAP and DSAP for 0xFF, don't check them after the low-order bit has
been masked off.
The "flag" values in the LLC header aren't bits, they're combinations of
bits, including the combination "no bits"; don't use "bittok2str()" on
them. Also, combine the proper bits, namely the C/R bit (which we
weren't combining) and the P/F bit (which we were).
Diffstat (limited to 'print-ipfc.c')
| -rw-r--r-- | print-ipfc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/print-ipfc.c b/print-ipfc.c index e19d9791..c9807651 100644 --- a/print-ipfc.c +++ b/print-ipfc.c @@ -21,7 +21,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-ipfc.c,v 1.8 2005-07-07 01:22:19 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-ipfc.c,v 1.9 2005-11-13 12:12:42 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -101,8 +101,6 @@ ipfc_print(const u_char *p, u_int length, u_int caplen) p += IPFC_HDRLEN; caplen -= IPFC_HDRLEN; - /* Frame Control field determines interpretation of packet */ - extracted_ethertype = 0; /* Try to print the LLC-layer header & higher layers */ if (llc_print(p, length, caplen, ESRC(&ehdr), EDST(&ehdr), &extracted_ethertype) == 0) { |