aboutsummaryrefslogtreecommitdiffstats
path: root/packet-icap.c
diff options
context:
space:
mode:
Diffstat (limited to 'packet-icap.c')
-rw-r--r--packet-icap.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/packet-icap.c b/packet-icap.c
index e3817f38c1..bbbf367cae 100644
--- a/packet-icap.c
+++ b/packet-icap.c
@@ -3,7 +3,7 @@
*
* Srishylam Simharajan simha@netapp.com
*
- * $Id: packet-icap.c,v 1.10 2002/07/17 06:55:19 guy Exp $
+ * $Id: packet-icap.c,v 1.11 2002/08/02 23:35:50 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -28,10 +28,6 @@
#include "config.h"
#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
#include <string.h>
#include <ctype.h>
@@ -59,18 +55,18 @@ static gint ett_icap = -1;
static dissector_handle_t data_handle;
#define TCP_PORT_ICAP 1344
-static int is_icap_message(const u_char *data, int linelen, icap_type_t *type);
+static int is_icap_message(const guchar *data, int linelen, icap_type_t *type);
static void
dissect_icap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
proto_tree *icap_tree = NULL;
proto_item *ti = NULL;
gint offset = 0;
- const u_char *line;
+ const guchar *line;
gint next_offset;
- const u_char *linep, *lineend;
+ const guchar *linep, *lineend;
int linelen;
- u_char c;
+ guchar c;
icap_type_t icap_type;
int datalen;
@@ -235,7 +231,7 @@ is_icap_header:
static int
-is_icap_message(const u_char *data, int linelen, icap_type_t *type)
+is_icap_message(const guchar *data, int linelen, icap_type_t *type)
{
#define ICAP_COMPARE(string, length, msgtype) { \
if (strncmp(data, string, length) == 0) { \