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 /packet-giop.c | |
| parent | e1dc7724713b1437cf58aafde01bb38a55867338 (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.
svn path=/trunk/; revision=4424
Diffstat (limited to 'packet-giop.c')
| -rw-r--r-- | packet-giop.c | 5 |
1 files changed, 4 insertions, 1 deletions
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 */ |