diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-04-18 12:54:57 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-04-18 12:54:57 -0700 |
| commit | 933dc24d09c8f7cc6a91d31037acec5dd7d5e1c1 (patch) | |
| tree | 88f9855bd3c3f08f3591b82b86efbe668945b220 /print-token.c | |
| parent | 5c2fc51b165ff138acea0ee9589dbc17c99b20d0 (diff) | |
| download | tcpdump-933dc24d09c8f7cc6a91d31037acec5dd7d5e1c1.tar.gz | |
Fix -e output for FDDI, Token Ring, and IP-over-Fibre Channel.
Print them the same way other headers are printed ("src > dst, length l").
For FDDI, always print the frame control field symbolically
For Token Ring, print the AC and FC fields unless the -q flag was given,
just as we do for the FC field for FDDI.
Diffstat (limited to 'print-token.c')
| -rw-r--r-- | print-token.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/print-token.c b/print-token.c index 6565af9d..6bf2b23d 100644 --- a/print-token.c +++ b/print-token.c @@ -112,14 +112,13 @@ token_hdr_print(netdissect_options *ndo, srcname = etheraddr_string(ndo, fsrc); dstname = etheraddr_string(ndo, fdst); - if (ndo->ndo_vflag) - ND_PRINT((ndo, "%02x %02x %s %s %d: ", + if (!ndo->ndo_qflag) + ND_PRINT((ndo, "%02x %02x ", trp->token_ac, - trp->token_fc, - srcname, dstname, - length)); - else - ND_PRINT((ndo, "%s %s %d: ", srcname, dstname, length)); + trp->token_fc)); + ND_PRINT((ndo, "%s > %s, length %u: ", + srcname, dstname, + length)); } static const char *broadcast_indicator[] = { |