diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-11-27 07:36:23 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-11-27 07:36:23 +0000 |
| commit | 95267f647adb60b659991380203db2ba7e2a322b (patch) | |
| tree | cd743bf25f5564044cd3e57b05bc6c93bb6a17b5 | |
| parent | 703189dd9d787237fc65894616300c6a87f79c32 (diff) | |
Get rid of some code to set "pinfo->current_proto"; let the Ethereal
infrastructure do it for the dissectors.
Make some WCP dissector routines static.
svn path=/trunk/; revision=4283
| -rw-r--r-- | packet-fr.c | 3 | ||||
| -rw-r--r-- | packet-quake3.c | 5 | ||||
| -rw-r--r-- | packet-wcp.c | 8 |
3 files changed, 5 insertions, 11 deletions
diff --git a/packet-fr.c b/packet-fr.c index c03160ba7d..de61661f31 100644 --- a/packet-fr.c +++ b/packet-fr.c @@ -3,7 +3,7 @@ * * Copyright 2001, Paul Ionescu <paul@acorp.ro> * - * $Id: packet-fr.c,v 1.21 2001/11/27 07:13:25 guy Exp $ + * $Id: packet-fr.c,v 1.22 2001/11/27 07:36:22 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -147,7 +147,6 @@ static void dissect_fr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) char buf[32]; guint8 fr_ctrl; - pinfo->current_proto = "Frame Relay"; if (check_col(pinfo->fd, COL_PROTOCOL)) col_set_str(pinfo->fd, COL_PROTOCOL, "FR"); diff --git a/packet-quake3.c b/packet-quake3.c index fea1d62a68..a0080f1d17 100644 --- a/packet-quake3.c +++ b/packet-quake3.c @@ -3,7 +3,7 @@ * * Uwe Girlich <uwe@planetquake.com> * - * $Id: packet-quake3.c,v 1.5 2001/11/25 22:19:24 hagbard Exp $ + * $Id: packet-quake3.c,v 1.6 2001/11/27 07:36:22 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -495,8 +495,6 @@ dissect_quake3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) direction = DIR_UNKNOWN; - pinfo->current_proto = "QUAKE3"; - if (check_col(pinfo->fd, COL_PROTOCOL)) col_set_str(pinfo->fd, COL_PROTOCOL, "QUAKE3"); @@ -672,4 +670,3 @@ proto_register_quake3(void) "Set the UDP base port for the Quake III Arena Master Server", 10, &gbl_quake3_master_port); } - diff --git a/packet-wcp.c b/packet-wcp.c index aaaa68919a..080686f6e5 100644 --- a/packet-wcp.c +++ b/packet-wcp.c @@ -2,7 +2,7 @@ * Routines for Wellfleet Compression frame disassembly * Copyright 2001, Jeffrey C. Foster <jfoste@woodward.com> * - * $Id: packet-wcp.c,v 1.15 2001/11/27 07:13:26 guy Exp $ + * $Id: packet-wcp.c,v 1.16 2001/11/27 07:36:23 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -278,7 +278,7 @@ dissect_wcp_reset( tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr } -void wcp_save_data( tvbuff_t *tvb, packet_info *pinfo){ +static void wcp_save_data( tvbuff_t *tvb, packet_info *pinfo){ wcp_window_t *buf_ptr = 0; int len; @@ -302,7 +302,7 @@ void wcp_save_data( tvbuff_t *tvb, packet_info *pinfo){ } -void dissect_wcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { +static void dissect_wcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree *wcp_tree; proto_item *ti; @@ -310,8 +310,6 @@ void dissect_wcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { guint16 temp, cmd, ext_cmd, seq; tvbuff_t *next_tvb; - pinfo->current_proto = "WCP"; - if (check_col(pinfo->fd, COL_PROTOCOL)) col_set_str(pinfo->fd, COL_PROTOCOL, "WCP"); if (check_col(pinfo->fd, COL_INFO)) |