diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-12-10 02:12:53 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-12-10 02:12:53 +0000 |
| commit | dca6cf394f94da0b83482e4f42241560edbcb333 (patch) | |
| tree | bbc5d5c9356892ddbb54fbdae8be2ef98f3a2765 /tethereal.c | |
| parent | fcfa433ff01caf367021ff9512f9d716bd83a35a (diff) | |
Don't fill in the columns if we're writing to a capture file.
Don't fill in the columns if we're in verbose mode.
svn path=/trunk/; revision=4372
Diffstat (limited to 'tethereal.c')
| -rw-r--r-- | tethereal.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tethereal.c b/tethereal.c index 378e60a479..46203484bc 100644 --- a/tethereal.c +++ b/tethereal.c @@ -1,6 +1,6 @@ /* tethereal.c * - * $Id: tethereal.c,v 1.104 2001/12/10 00:25:41 guy Exp $ + * $Id: tethereal.c,v 1.105 2001/12/10 02:12:53 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1239,7 +1239,7 @@ wtap_dispatch_cb_write(u_char *user, const struct wtap_pkthdr *phdr, cf->count++; if (cf->rfcode) { fill_in_fdata(&fdata, cf, phdr, pseudo_header, offset); - edt = epan_dissect_new(pseudo_header, buf, &fdata, TRUE, &cf->cinfo); + edt = epan_dissect_new(pseudo_header, buf, &fdata, TRUE, NULL); passed = dfilter_apply_edt(cf->rfcode, edt); } else { passed = TRUE; @@ -1342,8 +1342,10 @@ wtap_dispatch_cb_print(u_char *user, const struct wtap_pkthdr *phdr, create_proto_tree = TRUE; else create_proto_tree = FALSE; + /* We only need the columns if we're *not* verbose; in verbose mode, + we print the protocol tree, not the protocol summary. */ edt = epan_dissect_new(pseudo_header, buf, &fdata, create_proto_tree, - &cf->cinfo); + verbose ? NULL : &cf->cinfo); if (cf->rfcode) passed = dfilter_apply_edt(cf->rfcode, edt); if (passed) { |