diff options
| author | Guy Harris <guy@alum.mit.edu> | 2005-01-01 02:57:02 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2005-01-01 02:57:02 +0000 |
| commit | 71217a80071adae12b53253e3025b2220e6c89f5 (patch) | |
| tree | 0e6002853a3a04b81db3f093f0a09459ebbccc7e /gtk/rtp_analysis.c | |
| parent | 3f0d0ca5ea5f6034904e4cb03b38b66e7b03e165 (diff) | |
| download | wireshark-71217a80071adae12b53253e3025b2220e6c89f5.tar.gz | |
As we've made the tap_specific_data field of a tap_packet_t structure a
const pointer (so that we don't get complaints when we make the
tap-specific data argument to "tap_queue_packet()" a const pointer,
allowing dissectors to hand const data to a tap without a complaint), we
should make the tap per-packet function take a const pointer as an
argument as well. Do so.
In some taps, use _U_, or actually use the argument, rather than
sticking in dummy "X = X" assignments to fake use of parameters. (This
means that the tap functions in question no longer have the notion that
they act on a particular static structure wired in.)
svn path=/trunk/; revision=12910
Diffstat (limited to 'gtk/rtp_analysis.c')
| -rw-r--r-- | gtk/rtp_analysis.c | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c index 246d732bb8..1f315e2b9b 100644 --- a/gtk/rtp_analysis.c +++ b/gtk/rtp_analysis.c @@ -533,20 +533,23 @@ static void add_to_clist(GtkCList *clist, guint32 number, guint16 seq_num, gchar *timeStr, guint32 pkt_len, GdkColor *color); static int rtp_packet_analyse(tap_rtp_stat_t *statinfo, - packet_info *pinfo, struct _rtp_info *rtpinfo); + packet_info *pinfo, + const struct _rtp_info *rtpinfo); static int rtp_packet_add_info(GtkCList *clist, - tap_rtp_stat_t *statinfo, packet_info *pinfo, struct _rtp_info *rtpinfo); + tap_rtp_stat_t *statinfo, packet_info *pinfo, + const struct _rtp_info *rtpinfo); static int rtp_packet_save_payload(tap_rtp_save_info_t *saveinfo, - tap_rtp_stat_t *statinfo, - packet_info *pinfo, struct _rtp_info *rtpinfo); + tap_rtp_stat_t *statinfo, + packet_info *pinfo, + const struct _rtp_info *rtpinfo); /****************************************************************************/ /* whenever a RTP packet is seen by the tap listener */ -static int rtp_packet(void *user_data_arg, packet_info *pinfo, epan_dissect_t *edt _U_, void *rtpinfo_arg) +static int rtp_packet(void *user_data_arg, packet_info *pinfo, epan_dissect_t *edt _U_, const void *rtpinfo_arg) { user_data_t *user_data = user_data_arg; - struct _rtp_info *rtpinfo = rtpinfo_arg; + const struct _rtp_info *rtpinfo = rtpinfo_arg; #ifdef USE_CONVERSATION_GRAPH value_pair_t vp; #endif @@ -593,7 +596,8 @@ static int rtp_packet(void *user_data_arg, packet_info *pinfo, epan_dissect_t *e /****************************************************************************/ static int rtp_packet_analyse(tap_rtp_stat_t *statinfo, - packet_info *pinfo, struct _rtp_info *rtpinfo) + packet_info *pinfo, + const struct _rtp_info *rtpinfo) { double current_time; double current_jitter; @@ -759,7 +763,8 @@ static const GdkColor COLOR_CN = {0, 0xbfff, 0xbfff, 0xffff}; /****************************************************************************/ /* adds statistics information from the packet to the clist */ static int rtp_packet_add_info(GtkCList *clist, - tap_rtp_stat_t *statinfo, packet_info *pinfo, struct _rtp_info *rtpinfo) + tap_rtp_stat_t *statinfo, packet_info *pinfo, + const struct _rtp_info *rtpinfo) { guint16 msecs; gchar timeStr[32]; @@ -842,8 +847,9 @@ static int rtp_packet_add_info(GtkCList *clist, /****************************************************************************/ static int rtp_packet_save_payload(tap_rtp_save_info_t *saveinfo, - tap_rtp_stat_t *statinfo, - packet_info *pinfo, struct _rtp_info *rtpinfo) + tap_rtp_stat_t *statinfo, + packet_info *pinfo, + const struct _rtp_info *rtpinfo) { guint i; const guint8 *data; |