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 | |
| 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
| -rw-r--r-- | AUTHORS | 3 | ||||
| -rw-r--r-- | ethereal_gen.py | 11 | ||||
| -rw-r--r-- | packet-giop.c | 5 | ||||
| -rw-r--r-- | plugins/giop/packet-coseventcomm.c | 2 | ||||
| -rw-r--r-- | plugins/giop/packet-cosnaming.c | 2 |
5 files changed, 17 insertions, 6 deletions
@@ -954,6 +954,9 @@ Pavel Mores <pvl[AT]uh.cz> { Bernd Becker <bb[AT]bernd-becker.de> { Support for LOCATION_FORWARD, LOCATION_FORWARD_PERM and NEEDS_ADDRESSING_MODE replies in GIOP + ethereal_gen.py cleanups + Reset the Protocol column to GIOP if no heuristic dissectors + succeed } Heinz Prantner <Heinz.Prantner[AT]radisys.com> { 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); diff --git a/packet-giop.c b/packet-giop.c index 904c9bba6c..20be6a5060 100644 --- a/packet-giop.c +++ b/packet-giop.c @@ -9,7 +9,7 @@ * Frank Singleton <frank.singleton@ericsson.com> * Trevor Shepherd <eustrsd@am1.ericsson.se> * - * $Id: packet-giop.c,v 1.52 2001/12/17 22:45:18 guy Exp $ + * $Id: packet-giop.c,v 1.53 2001/12/19 08:59:06 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1762,6 +1762,9 @@ static gboolean try_heuristic_giop_dissector(tvbuff_t *tvb, packet_info *pinfo, } /* protocol_is_enabled */ } /* loop */ + if (check_col (pinfo->cinfo, COL_PROTOCOL)) + col_set_str (pinfo->cinfo, COL_PROTOCOL, "GIOP"); + pinfo->current_proto = saved_proto; return res; /* result */ diff --git a/plugins/giop/packet-coseventcomm.c b/plugins/giop/packet-coseventcomm.c index 4752a7bc65..5d1705c7d3 100644 --- a/plugins/giop/packet-coseventcomm.c +++ b/plugins/giop/packet-coseventcomm.c @@ -649,7 +649,7 @@ static gboolean dissect_coseventcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tr guint32 offset_saved = (*offset); /* save in case we must back out */ if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_add_str(pinfo->cinfo, COL_PROTOCOL, "COSEVENTCOMM"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "COSEVENTCOMM"); if (ptree) { ti = proto_tree_add_item(ptree, proto_coseventcomm, tvb, *offset, tvb_length(tvb) - *offset, FALSE); diff --git a/plugins/giop/packet-cosnaming.c b/plugins/giop/packet-cosnaming.c index 3ae40b66fa..5bd3a3f115 100644 --- a/plugins/giop/packet-cosnaming.c +++ b/plugins/giop/packet-cosnaming.c @@ -1684,7 +1684,7 @@ static gboolean dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree guint32 offset_saved = (*offset); /* save in case we must back out */ if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_add_str(pinfo->cinfo, COL_PROTOCOL, "COSNAMING"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "COSNAMING"); if (ptree) { ti = proto_tree_add_item(ptree, proto_cosnaming, tvb, *offset, tvb_length(tvb) - *offset, FALSE); |