diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-12-19 08:59:08 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-12-19 08:59:08 +0000 |
| commit | 887799e01a4a87fee62ef25fd548ba9050cac902 (patch) | |
| tree | 499e178d8233648fc5fee6ec63bf70fad87f2ee0 /ethereal_gen.py | |
| parent | e1dc7724713b1437cf58aafde01bb38a55867338 (diff) | |
| download | wireshark-887799e01a4a87fee62ef25fd548ba9050cac902.tar.gz wireshark-887799e01a4a87fee62ef25fd548ba9050cac902.tar.bz2 wireshark-887799e01a4a87fee62ef25fd548ba9050cac902.zip | |
From Bernd Becker: don't clear COL_INFO until the GIOP subdissecrors are
fixed to put something interesting there, fix the GIOP dissector to
restore the Protocol column if no heuristic dissector succeeded, and fix
up the plugin GIOP subdissectors to use "col_set_str()" to set the
Protocol column.
svn path=/trunk/; revision=4424
Diffstat (limited to 'ethereal_gen.py')
| -rw-r--r-- | ethereal_gen.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/ethereal_gen.py b/ethereal_gen.py index 1a6c4cd731..5a831b83f6 100644 --- a/ethereal_gen.py +++ b/ethereal_gen.py @@ -1,6 +1,6 @@ # -*- python -*- # -# $Id: ethereal_gen.py,v 1.18 2001/12/17 22:51:42 guy Exp $ +# $Id: ethereal_gen.py,v 1.19 2001/12/19 08:59:06 guy Exp $ # # ethereal_gen.py (part of idl2eth) # @@ -2114,8 +2114,13 @@ static gboolean dissect_@dissname@(tvbuff_t *tvb, packet_info *pinfo, proto_tree if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, \"@disprot@\"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO)) +/* + * Do not clear COL_INFO, as nothing is being written there by + * this dissector yet. So leave it as is from the GIOP dissector. + * TODO: add something useful to COL_INFO + * if (check_col(pinfo->cinfo, COL_INFO)) + * col_clear(pinfo->cinfo, COL_INFO); + */ if (ptree) { ti = proto_tree_add_item(ptree, proto_@dissname@, tvb, *offset, tvb_length(tvb) - *offset, FALSE); |