aboutsummaryrefslogtreecommitdiffstats
path: root/ethereal_gen.py
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2001-12-19 08:59:08 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2001-12-19 08:59:08 +0000
commite3c79a0bf280832724ab5dc155f8489fdca36253 (patch)
tree499e178d8233648fc5fee6ec63bf70fad87f2ee0 /ethereal_gen.py
parent96d26b9477c284177aee8edad4456166435182f4 (diff)
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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4424 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'ethereal_gen.py')
-rw-r--r--ethereal_gen.py11
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);