diff options
| author | Guy Harris <guy@alum.mit.edu> | 2000-04-13 08:14:35 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2000-04-13 08:14:35 +0000 |
| commit | e70b4f7700d6c2970e60f601e1a4b4a28736e28e (patch) | |
| tree | 18e76909b9e62fb8b6f50312e0c548e4d26e3fb0 /packet-isis.c | |
| parent | dccffa9d2fe07846aeade1ecc78badbb4ccf1630 (diff) | |
Set the COL_PROTOCOL column to "ISIS" in the ISIS dissector, rather than
in its caller.
Set the COL_PROTOCOL column to "COTP" in the COTP dissector, rather than
in the dissectors it calls, so that it's done for all frames we hand to
that dissector.
Set the COL_INFO field for COTP packets we don't dissect because the
length indicator is zero, or the frame is too short, or the PDU type is
bogus.
svn path=/trunk/; revision=1842
Diffstat (limited to 'packet-isis.c')
| -rw-r--r-- | packet-isis.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/packet-isis.c b/packet-isis.c index f09e2757ea..ead27120e9 100644 --- a/packet-isis.c +++ b/packet-isis.c @@ -2,7 +2,7 @@ * Routines for ISO/OSI network and transport protocol packet disassembly, core * bits. * - * $Id: packet-isis.c,v 1.5 2000/03/20 22:52:43 gram Exp $ + * $Id: packet-isis.c,v 1.6 2000/04/13 08:14:35 guy Exp $ * Stuart Stanley <stuarts@mxmail.net> * * Ethereal - Network traffic analyzer @@ -178,6 +178,9 @@ dissect_isis(const u_char *pd, int offset, frame_data *fd, proto_item *ti; proto_tree *isis_tree = NULL; + if (check_col(fd, COL_PROTOCOL)) + col_add_str(fd, COL_PROTOCOL, "ISIS"); + if (!BYTES_ARE_IN_FRAME(offset, sizeof(*ihdr))) { isis_dissect_unknown(offset, sizeof(*ihdr), tree, fd, "not enough capture data for header (%d vs %d)", |