diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-11-14 03:51:41 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-11-14 03:51:41 +0000 |
| commit | 167562929bd1d06385daff04f3e11002d88a71cd (patch) | |
| tree | 9d1894b94f697db9f4f11acde7671c95d0d1ae75 | |
| parent | 245f7d30ab4353c6461ca1b88d4b2e9142b55de2 (diff) | |
Check for existence of COL_INFO before adding "Short xxx packet" to
COL_INFO.
svn path=/trunk/; revision=2641
| -rw-r--r-- | packet-dns.c | 6 | ||||
| -rw-r--r-- | packet-nbns.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/packet-dns.c b/packet-dns.c index fa82ecd1df..bf2a9aeb52 100644 --- a/packet-dns.c +++ b/packet-dns.c @@ -1,7 +1,7 @@ /* packet-dns.c * Routines for DNS packet disassembly * - * $Id: packet-dns.c,v 1.57 2000/10/19 23:11:45 guy Exp $ + * $Id: packet-dns.c,v 1.58 2000/11/14 03:51:41 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -2257,7 +2257,9 @@ dissect_dns(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) col_add_str(fd, COL_PROTOCOL, "DNS"); if (!BYTES_ARE_IN_FRAME(offset, DNS_HDRLEN)) { - col_add_str(fd, COL_INFO, "Short DNS packet"); + if (check_col(fd, COL_INFO)) { + col_add_str(fd, COL_INFO, "Short DNS packet"); + } old_dissect_data(pd, offset, fd, tree); return; } diff --git a/packet-nbns.c b/packet-nbns.c index 1c593fdb6c..9638543e8d 100644 --- a/packet-nbns.c +++ b/packet-nbns.c @@ -4,7 +4,7 @@ * Gilbert Ramirez <gram@xiexie.org> * Much stuff added by Guy Harris <guy@alum.mit.edu> * - * $Id: packet-nbns.c,v 1.45 2000/08/13 14:08:30 deniel Exp $ + * $Id: packet-nbns.c,v 1.46 2000/11/14 03:51:41 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -1141,7 +1141,9 @@ dissect_nbns(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) col_add_str(fd, COL_PROTOCOL, "NBNS"); if (pi.captured_len < NBNS_HDRLEN) { - col_add_str(fd, COL_INFO, "Short NBNS packet"); + if (check_col(fd, COL_INFO)) { + col_add_str(fd, COL_INFO, "Short NBNS packet"); + } old_dissect_data(pd, offset, fd, tree); return; } |