diff options
| author | bms <bms@FreeBSD.org> | 2004-03-31 14:57:24 +0000 |
|---|---|---|
| committer | bms <bms@FreeBSD.org> | 2004-03-31 14:57:24 +0000 |
| commit | 55b12ee1997869e5aed19e4145ad34c6d874a423 (patch) | |
| tree | 5b810dd82a76f16819dd3cc55ffa53ff444b2d5a /contrib/tcpdump/token.h | |
| parent | 34f833a812abe250ad28d7dadb1fdc086b1d4ecd (diff) | |
| download | FreeBSD-src-55b12ee1997869e5aed19e4145ad34c6d874a423.zip FreeBSD-src-55b12ee1997869e5aed19e4145ad34c6d874a423.tar.gz | |
Merge of tcpdump 3.8.3 from tcpdump.org, with the following caveats:
print-atm.c no longer performs special handling for FORE headers; these
can no doubt be re-added at a later date.
print-fr.c is effectively a no-op.
print-llc.c has had the default_print_unaligned() call removed as
tcpdump no longer defines this function, however the prototype is still
present. Suggest we roll in a diff to use print_unknown_data().
Diffstat (limited to 'contrib/tcpdump/token.h')
| -rw-r--r-- | contrib/tcpdump/token.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/tcpdump/token.h b/contrib/tcpdump/token.h index 1e9bd4f..e466c84 100644 --- a/contrib/tcpdump/token.h +++ b/contrib/tcpdump/token.h @@ -1,4 +1,4 @@ -/* @(#) $Header: /tcpdump/master/tcpdump/token.h,v 1.3 2000/10/03 02:55:03 itojun Exp $ (LBL) */ +/* @(#) $Header: /tcpdump/master/tcpdump/token.h,v 1.6 2002/12/11 07:14:12 guy Exp $ (LBL) */ /* * Copyright (c) 1998, Larry Lile * All rights reserved. @@ -41,7 +41,7 @@ #define LARGEST_FRAME(trp) ((ntohs((trp)->token_rcf) & 0x0070) >> 4) #define RING_NUMBER(trp, x) ((ntohs((trp)->token_rseg[x]) & 0xfff0) >> 4) #define BRIDGE_NUMBER(trp, x) ((ntohs((trp)->token_rseg[x]) & 0x000f)) -#define SEGMENT_COUNT(trp) ((RIF_LENGTH(trp) - 2) / 2) +#define SEGMENT_COUNT(trp) ((int)((RIF_LENGTH(trp) - 2) / 2)) struct token_header { u_int8_t token_ac; |
