osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Rename the "private" member of the "packet_info" structure to 

"private_data", to keep C++ compilers from getting heartburn.

svn path=/trunk/; revision=4130
This commit is contained in:
Guy Harris 2001-11-03 00:58:52 +00:00
parent 6d24afcb1f
commit 0c13da5c70
10 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/packet_info.c
View File

@ -1,7 +1,7 @@
/* packet_info.c
* Routines for handling packet information
*
* $Id: packet_info.c,v 1.3 2001/10/01 08:29:37 guy Exp $
* $Id: packet_info.c,v 1.4 2001/11/03 00:58:52 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -47,7 +47,7 @@ void blank_packetinfo(void)
pi.destport = 0;
pi.current_proto = "<Missing Protocol Name>";
pi.p2p_dir = P2P_DIR_UNKNOWN;
pi.private = NULL;
pi.private_data = NULL;
}

4
epan/packet_info.h
View File

@ -1,7 +1,7 @@
/* packet_info.h
* Definitions for packet info structures and routines
*
* $Id: packet_info.h,v 1.7 2001/10/01 08:29:37 guy Exp $
* $Id: packet_info.h,v 1.8 2001/11/03 00:58:52 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -115,7 +115,7 @@ typedef struct _packet_info {
int iplen;
int iphdrlen;
int p2p_dir;
void *private; /* pointer to data passed from one dissector to another */
void *private_data; /* pointer to data passed from one dissector to another */
} packet_info;
void blank_packetinfo(void);

4
packet-afs.c
View File

@ -8,7 +8,7 @@
* Portions based on information/specs retrieved from the OpenAFS sources at
* www.openafs.org, Copyright IBM.
*
* $Id: packet-afs.c,v 1.34 2001/09/03 10:33:05 guy Exp $
* $Id: packet-afs.c,v 1.35 2001/11/03 00:58:49 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -184,7 +184,7 @@ afs_init_protocol(void)
static void
dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
struct rxinfo *rxinfo = pinfo->private;
struct rxinfo *rxinfo = pinfo->private_data;
int reply = 0;
conversation_t *conversation;
struct afs_request_key request_key, *new_request_key;

4
packet-nbns.c
View File

@ -4,7 +4,7 @@
* Gilbert Ramirez <gram@xiexie.org>
* Much stuff added by Guy Harris <guy@alum.mit.edu>
*
* $Id: packet-nbns.c,v 1.62 2001/10/12 01:41:03 guy Exp $
* $Id: packet-nbns.c,v 1.63 2001/11/03 00:58:49 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -1504,7 +1504,7 @@ dissect_nbss_packet(tvbuff_t *tvb, int offset, packet_info *pinfo,
static void
dissect_nbss(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
struct tcpinfo *tcpinfo = pinfo->private;
struct tcpinfo *tcpinfo = pinfo->private_data;
int offset = 0;
int max_data;
guint8 msg_type;

4
packet-rlogin.c
View File

@ -2,7 +2,7 @@
* Routines for unix rlogin packet dissection
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
*
* $Id: packet-rlogin.c,v 1.21 2001/10/01 08:29:35 guy Exp $
* $Id: packet-rlogin.c,v 1.22 2001/11/03 00:58:49 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -341,7 +341,7 @@ static void rlogin_display( rlogin_hash_entry_t *hash_info, tvbuff_t *tvb,
static void
dissect_rlogin(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
struct tcpinfo *tcpinfo = pinfo->private;
struct tcpinfo *tcpinfo = pinfo->private_data;
conversation_t *conversation;
rlogin_hash_entry_t *hash_info;
guint length;

4
packet-rx.c
View File

@ -4,7 +4,7 @@
* Based on routines from tcpdump patches by
* Ken Hornstein <kenh@cmf.nrl.navy.mil>
*
* $Id: packet-rx.c,v 1.26 2001/09/14 07:10:05 guy Exp $
* $Id: packet-rx.c,v 1.27 2001/11/03 00:58:49 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -542,7 +542,7 @@ dissect_rx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
break;
case RX_PACKET_TYPE_DATA: {
tvbuff_t *next_tvb;
pinfo->private = &rxinfo;
pinfo->private_data = &rxinfo;
next_tvb = tvb_new_subset(tvb, offset, -1, -1);
call_dissector(afs_handle, next_tvb, pinfo, parent_tree);
};

4
packet-smb-mailslot.c
View File

@ -2,7 +2,7 @@
* Routines for SMB mailslot packet dissection
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
*
* $Id: packet-smb-mailslot.c,v 1.18 2001/10/04 23:19:01 guy Exp $
* $Id: packet-smb-mailslot.c,v 1.19 2001/11/03 00:58:49 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -56,7 +56,7 @@ gboolean
dissect_mailslot_smb(tvbuff_t *setup_tvb, tvbuff_t *tvb, packet_info *pinfo,
proto_tree *parent_tree)
{
struct smb_info *smb_info = pinfo->private;
struct smb_info *smb_info = pinfo->private_data;
proto_tree *tree = 0;
proto_item *item;
tvbuff_t *next_tvb = NULL;

8
packet-smb-pipe.c
View File

@ -8,7 +8,7 @@ XXX Fixme : shouldnt show [malformed frame] for long packets
* significant rewrite to tvbuffify the dissector, Ronnie Sahlberg and
* Guy Harris 2001
*
* $Id: packet-smb-pipe.c,v 1.37 2001/10/26 10:14:43 guy Exp $
* $Id: packet-smb-pipe.c,v 1.38 2001/11/03 00:58:49 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -365,7 +365,7 @@ static int
add_detail_level(tvbuff_t *tvb, int offset, int count, packet_info *pinfo,
proto_tree *tree, int convert, int hf_index)
{
struct smb_info *smb_info = pinfo->private;
struct smb_info *smb_info = pinfo->private_data;
struct smb_request_val *request_val = smb_info->request_val;
guint16 level;
@ -1955,7 +1955,7 @@ dissect_response_data(tvbuff_t *tvb, packet_info *pinfo, int convert,
static gboolean
dissect_pipe_lanman(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
{
struct smb_info *smb_info = pinfo->private;
struct smb_info *smb_info = pinfo->private_data;
struct smb_request_val *request_val = smb_info->request_val;
int parameter_count = smb_info->parameter_count;
int offset = 0, start_offset;
@ -2221,7 +2221,7 @@ dissect_pipe_lanman(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
gboolean
dissect_pipe_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
struct smb_info *smb_info = pinfo->private;
struct smb_info *smb_info = pinfo->private_data;
if (!proto_is_protocol_enabled(proto_smb_lanman))
return FALSE;

4
packet-smb.c
View File

@ -2,7 +2,7 @@
* Routines for smb packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
* $Id: packet-smb.c,v 1.122 2001/10/20 19:29:21 guy Exp $
* $Id: packet-smb.c,v 1.123 2001/11/03 00:58:49 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -10398,7 +10398,7 @@ dissect_transact_params(const u_char *pd, int offset, frame_data *fd,
/*
* Pass "si" to the subdissector.
*/
pinfo->private = &si;
pinfo->private_data = &si;
/*
* Tvbuff for setup area, for mailslot call.

6
packet-tcp.c
View File

@ -1,7 +1,7 @@
/* packet-tcp.c
* Routines for TCP packet disassembly
*
* $Id: packet-tcp.c,v 1.112 2001/10/30 22:22:26 guy Exp $
* $Id: packet-tcp.c,v 1.113 2001/11/03 00:58:50 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -250,7 +250,7 @@ desegment_tcp(tvbuff_t *tvb, packet_info *pinfo, int offset,
guint32 sport, guint32 dport,
proto_tree *tree, proto_tree *tcp_tree)
{
struct tcpinfo *tcpinfo = pinfo->private;
struct tcpinfo *tcpinfo = pinfo->private_data;
fragment_data *ipfd_head;
tcp_segment_key old_tsk, *tsk;
gboolean must_desegment = FALSE;
@ -969,7 +969,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Assume we'll pass un-reassembled data to subdissectors. */
tcpinfo.is_reassembled = FALSE;
pinfo->private = &tcpinfo;
pinfo->private_data = &tcpinfo;
/*
* Assume, initially, that we can't desegment.