aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2012-05-23 06:36:47 +0000
committerAnders Broman <anders.broman@ericsson.com>2012-05-23 06:36:47 +0000
commit0832853fa801c8d9399e7f495e1f09bb7963c170 (patch)
tree97ec67084cd56ac28513365250b5339a202e3fb5 /epan/dissectors
parenta6deef666c0af093bbbf76c57e1fae88cb180e7a (diff)
From Robert Bullen:
The Wireshark and tshark TCP conversations stats tables aggregate reused connections into a single line item https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7248 svn path=/trunk/; revision=42806
Diffstat (limited to 'epan/dissectors')
-rw-r--r--epan/dissectors/packet-tcp.c5
-rw-r--r--epan/dissectors/packet-tcp.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index 35919998db..8953404977 100644
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -4140,6 +4140,11 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (tcpd) {
item = proto_tree_add_uint(tcp_tree, hf_tcp_stream, tvb, offset, 0, tcpd->stream);
PROTO_ITEM_SET_GENERATED(item);
+
+ /* Copy the stream index into the header as well to make it available
+ * to tap listeners.
+ */
+ tcph->th_stream = tcpd->stream;
}
/* Do we need to calculate timestamps relative to the tcp-stream? */
diff --git a/epan/dissectors/packet-tcp.h b/epan/dissectors/packet-tcp.h
index a89d6b1629..f93c2d5ba2 100644
--- a/epan/dissectors/packet-tcp.h
+++ b/epan/dissectors/packet-tcp.h
@@ -59,6 +59,7 @@ typedef struct tcpheader {
guint16 th_dport;
guint8 th_hlen;
guint16 th_flags;
+ guint32 th_stream; /* this stream index field is included to help differentiate when address/port pairs are reused */
address ip_src;
address ip_dst;
} tcp_info_t;