aboutsummaryrefslogtreecommitdiffstats
path: root/packet-tcp.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2001-11-03 00:58:52 +0000
committerGuy Harris <guy@alum.mit.edu>2001-11-03 00:58:52 +0000
commit0c13da5c70517cf81f9d30c10f6ef7e7a45ccb78 (patch)
tree3d9cbe45f362244be62e2a96e427cc01b003c344 /packet-tcp.c
parent6d24afcb1f64c301fe262d5c0fd68760c3f0cf4f (diff)
downloadwireshark-0c13da5c70517cf81f9d30c10f6ef7e7a45ccb78.tar.gz
wireshark-0c13da5c70517cf81f9d30c10f6ef7e7a45ccb78.tar.bz2
wireshark-0c13da5c70517cf81f9d30c10f6ef7e7a45ccb78.zip
Rename the "private" member of the "packet_info" structure to
"private_data", to keep C++ compilers from getting heartburn. svn path=/trunk/; revision=4130
Diffstat (limited to 'packet-tcp.c')
-rw-r--r--packet-tcp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-tcp.c b/packet-tcp.c
index 5a1f24f234..03255ca1a5 100644
--- a/packet-tcp.c
+++ b/packet-tcp.c
@@ -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.