diff options
author | Jörg Mayer <jmayer@loplof.de> | 2004-02-01 06:49:25 +0000 |
---|---|---|
committer | Jörg Mayer <jmayer@loplof.de> | 2004-02-01 06:49:25 +0000 |
commit | 38faa0f27bad25d554fad15509ea6eeb8b81240f (patch) | |
tree | c5523d5a731fb2a0992e07d16613b37d2961d47e | |
parent | d62f6c67da505b319272a274a05be983889330c0 (diff) | |
download | wireshark-38faa0f27bad25d554fad15509ea6eeb8b81240f.tar.gz wireshark-38faa0f27bad25d554fad15509ea6eeb8b81240f.tar.bz2 wireshark-38faa0f27bad25d554fad15509ea6eeb8b81240f.zip |
packet-dcerpc-afs4int.c
svn path=/trunk/; revision=9938
-rw-r--r-- | epan/configure.in | 6 | ||||
-rw-r--r-- | epan/tvbuff.c | 6 | ||||
-rw-r--r-- | epan/tvbuff.h | 4 | ||||
-rw-r--r-- | packet-dcerpc-afs4int.c | 23 | ||||
-rw-r--r-- | packet-http.c | 4 | ||||
-rw-r--r-- | packet-radius.c | 6 | ||||
-rw-r--r-- | plugins/Xplugin_table.h | 2 | ||||
-rw-r--r-- | plugins/plugin_api_list.c | 4 |
8 files changed, 31 insertions, 24 deletions
diff --git a/epan/configure.in b/epan/configure.in index 9adb1d4fe2..4116039386 100644 --- a/epan/configure.in +++ b/epan/configure.in @@ -1,4 +1,4 @@ -# $Id: configure.in,v 1.55 2004/01/10 16:50:59 obiot Exp $ +# $Id: configure.in,v 1.56 2004/02/01 06:49:24 jmayer Exp $ dnl dnl Process this file with autoconf 2.13 or later to produce a dnl configure script; 2.12 doesn't generate a "configure" script that @@ -45,12 +45,12 @@ AC_ARG_WITH(extra-gcc-checks, [ if test $withval != no then - ethereal_extra_gcc_flags=" -Wcast-qual -Wcast-align -Wbad-function-cast -pedantic" + ethereal_extra_gcc_flags=" " fi ],) AC_MSG_CHECKING(to see if we can add '-Wall -W$ethereal_extra_gcc_flags' to CFLAGS) if test x$GCC != x ; then - CFLAGS="-D_U_=\"__attribute__((unused))\" -Wall -W$ethereal_extra_gcc_flags $CFLAGS" + CFLAGS="-D_U_=\"__attribute__((unused))\" -Wall -W -Wcast-qual -Wcast-align -Wbad-function-cast -pedantic $ethereal_extra_gcc_flags $CFLAGS" AC_MSG_RESULT(yes) else CFLAGS="-D_U_=\"\" $CFLAGS" diff --git a/epan/tvbuff.c b/epan/tvbuff.c index 12d2600ee2..a3ff20f390 100644 --- a/epan/tvbuff.c +++ b/epan/tvbuff.c @@ -9,7 +9,7 @@ * the data of a backing tvbuff, or can be a composite of * other tvbuffs. * - * $Id: tvbuff.c,v 1.57 2004/01/23 09:40:38 jmayer Exp $ + * $Id: tvbuff.c,v 1.58 2004/02/01 06:49:24 jmayer Exp $ * * Copyright (c) 2000 by Gilbert Ramirez <gram@alumni.rice.edu> * @@ -250,7 +250,7 @@ tvb_set_real_data(tvbuff_t* tvb, const guint8* data, guint length, gint reported THROW(ReportedBoundsError); } - tvb->real_data = (gpointer) data; + tvb->real_data = data; tvb->length = length; tvb->reported_length = reported_length; tvb->initialized = TRUE; @@ -1545,7 +1545,7 @@ tvb_strneql(tvbuff_t *tvb, gint offset, const guint8 *str, gint size) * it returns 0 (meaning "equal") and -1 otherwise, otherwise return -1. */ gint -tvb_strncaseeql(tvbuff_t *tvb, gint offset, const guint8 *str, gint size) +tvb_strncaseeql(tvbuff_t *tvb, gint offset, const gchar *str, gint size) { guint8 *ptr; diff --git a/epan/tvbuff.h b/epan/tvbuff.h index d2319ba64f..9a707dfef5 100644 --- a/epan/tvbuff.h +++ b/epan/tvbuff.h @@ -9,7 +9,7 @@ * the data of a backing tvbuff, or can be a composite of * other tvbuffs. * - * $Id: tvbuff.h,v 1.37 2004/01/23 09:40:38 jmayer Exp $ + * $Id: tvbuff.h,v 1.38 2004/02/01 06:49:24 jmayer Exp $ * * Copyright (c) 2000 by Gilbert Ramirez <gram@alumni.rice.edu> * @@ -481,7 +481,7 @@ extern gint tvb_strneql(tvbuff_t *tvb, gint offset, const guint8 *str, * Call strncasecmp after checking if enough chars left, returning 0 if * it returns 0 (meaning "equal") and -1 otherwise, otherwise return -1. */ -extern gint tvb_strncaseeql(tvbuff_t *tvb, gint offset, const guint8 *str, +extern gint tvb_strncaseeql(tvbuff_t *tvb, gint offset, const gchar *str, gint size); /* diff --git a/packet-dcerpc-afs4int.c b/packet-dcerpc-afs4int.c index d20c369288..20e2739913 100644 --- a/packet-dcerpc-afs4int.c +++ b/packet-dcerpc-afs4int.c @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tar.gz file/fsint/afs4int.idl * - * $Id: packet-dcerpc-afs4int.c,v 1.6 2004/01/27 04:15:47 guy Exp $ + * $Id: packet-dcerpc-afs4int.c,v 1.7 2004/02/01 06:49:22 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -2136,9 +2136,11 @@ dissect_afsReturns (tvbuff_t * tvb, int offset, return offset; } +#if 0 /* not used */ + static int dissect_afsbundled_stat (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * parent_tree, guint8 *drep) + packet_info * pinfo, proto_tree * parent_tree, guint8 *drep _U_) { @@ -2187,11 +2189,12 @@ return offset; } +#endif /* not used */ static int -dissect_afsBulkStat (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * tree, - guint8 *drep) +dissect_afsBulkStat (tvbuff_t * tvb _U_, int offset, + packet_info * pinfo _U_, proto_tree * tree _U_, + guint8 *drep _U_) { /* unsigned32 BulkStat_len; @@ -3826,7 +3829,7 @@ static int static int afs4int_dissect_gettime_rqst (tvbuff_t * - tvb, int offset, packet_info * pinfo, proto_tree * tree, guint8 *drep) + tvb _U_, int offset, packet_info * pinfo, proto_tree * tree _U_, guint8 *drep _U_) { dcerpc_info *di; @@ -3909,7 +3912,7 @@ static int static int afs4int_dissect_getserverinterfaces_rqst (tvbuff_t * - tvb, int offset, packet_info * pinfo, proto_tree * tree, guint8 *drep) + tvb _U_, int offset, packet_info * pinfo, proto_tree * tree _U_, guint8 *drep _U_) { dcerpc_info *di; @@ -4038,7 +4041,7 @@ static int static int afs4int_dissect_getstatistics_rqst (tvbuff_t * - tvb, int offset, packet_info * pinfo, proto_tree * tree, guint8 *drep) + tvb _U_, int offset, packet_info * pinfo, proto_tree * tree _U_, guint8 *drep _U_) { dcerpc_info *di; @@ -4055,7 +4058,7 @@ static int static int afs4int_dissect_getstatistics_resp (tvbuff_t * - tvb, int offset, packet_info * pinfo, proto_tree * tree, guint8 *drep) + tvb _U_, int offset, packet_info * pinfo, proto_tree * tree _U_, guint8 *drep _U_) { dcerpc_info *di; @@ -4124,7 +4127,7 @@ static int static int afs4int_dissect_bulkfetchvv_resp (tvbuff_t * - tvb, int offset, packet_info * pinfo, proto_tree * tree, guint8 *drep) + tvb _U_, int offset, packet_info * pinfo, proto_tree * tree _U_, guint8 *drep _U_) { dcerpc_info *di; diff --git a/packet-http.c b/packet-http.c index af21242004..520c5365c0 100644 --- a/packet-http.c +++ b/packet-http.c @@ -6,7 +6,7 @@ * Copyright 2002, Tim Potter <tpot@samba.org> * Copyright 1999, Andrew Tridgell <tridge@samba.org> * - * $Id: packet-http.c,v 1.93 2004/01/19 23:57:11 guy Exp $ + * $Id: packet-http.c,v 1.94 2004/02/01 06:49:22 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1031,7 +1031,7 @@ find_header_hf_value(tvbuff_t *tvb, int offset, guint header_len) for (i = 0; i < array_length(headers); i++) { if (header_len == strlen(headers[i].name) && tvb_strncaseeql(tvb, offset, - (const guint8 *)headers[i].name, header_len) == 0) + headers[i].name, header_len) == 0) return i; } diff --git a/packet-radius.c b/packet-radius.c index d7eb241b79..f81f572d3a 100644 --- a/packet-radius.c +++ b/packet-radius.c @@ -6,7 +6,7 @@ * * RFC 2865, RFC 2866, RFC 2867, RFC 2868, RFC 2869 * - * $Id: packet-radius.c,v 1.89 2004/01/13 03:27:47 guy Exp $ + * $Id: packet-radius.c,v 1.90 2004/02/01 06:49:22 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -44,7 +44,9 @@ #include "packet-gtp.h" #include "prefs.h" #include "crypt-md5.h" +#include "tap.h" +static int radius_tap = -1; static int proto_radius = -1; static int hf_radius_length = -1; static int hf_radius_code = -1; @@ -2845,6 +2847,7 @@ static void dissect_radius(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dissect_attribute_value_pairs(tvb, hdrlength, avptree, avplength, pinfo); } + tap_queue_packet(radius_tap, pinfo, NULL); } /* registration with the filtering engine */ void @@ -2881,6 +2884,7 @@ proto_register_radius(void) prefs_register_string_preference(radius_module,"shared_secret","Shared Secret", "Shared secret used to decode User Passwords", &shared_secret); + radius_tap = register_tap("radius"); } void diff --git a/plugins/Xplugin_table.h b/plugins/Xplugin_table.h index acadc0f009..f531be5926 100644 --- a/plugins/Xplugin_table.h +++ b/plugins/Xplugin_table.h @@ -99,7 +99,7 @@ typedef gint (*addr_tvb_get_nstringz0) (tvbuff_t *, gint, guint, guint8 *); typedef gint (*addr_tvb_find_line_end) (tvbuff_t *, gint, int, gint *, gboolean); typedef gint (*addr_tvb_find_line_end_unquoted) (tvbuff_t *, gint, int, gint *); typedef gint (*addr_tvb_strneql) (tvbuff_t *, gint, const guint8 *, gint); -typedef gint (*addr_tvb_strncaseeql) (tvbuff_t *, gint, const guint8 *, gint); +typedef gint (*addr_tvb_strncaseeql) (tvbuff_t *, gint, const gchar *, gint); typedef gchar *(*addr_tvb_bytes_to_str) (tvbuff_t *, gint, gint); typedef struct pref_module *(*addr_prefs_register_protocol) (int, void (*) (void)); typedef void (*addr_prefs_register_uint_preference) (struct pref_module *, const char *, const char *, const char *, guint, guint *); diff --git a/plugins/plugin_api_list.c b/plugins/plugin_api_list.c index 21ce1c2a99..4a10a969ab 100644 --- a/plugins/plugin_api_list.c +++ b/plugins/plugin_api_list.c @@ -1,7 +1,7 @@ /* plugin_api_list.c * Used to generate various included files for plugin API * - * $Id: plugin_api_list.c,v 1.23 2004/01/25 17:53:55 gerald Exp $ + * $Id: plugin_api_list.c,v 1.24 2004/02/01 06:49:25 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -184,7 +184,7 @@ gint tvb_find_line_end(tvbuff_t*, gint, int, gint *, gboolean); gint tvb_find_line_end_unquoted(tvbuff_t*, gint, int, gint *); gint tvb_strneql(tvbuff_t*, gint, const guint8 *, gint); -gint tvb_strncaseeql(tvbuff_t*, gint, const guint8 *, gint); +gint tvb_strncaseeql(tvbuff_t*, gint, const gchar *, gint); gchar *tvb_bytes_to_str(tvbuff_t*, gint, gint len); |