waste a couple of bytes per tcp conversation and make the tree for acked_packets...

while this should improve performance by unmeasurably little it does have the sideeffect that once we finish the rewrite   tcp analysis might actually work and work well even for tcp over tcp tunnelling.

this also means that if you include packet-tcp.h   you also need to include emem.h .

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@17681 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/asn1/pkixcmp/packet-cmp-template.c b/asn1/pkixcmp/packet-cmp-template.c
index 3e763841022b6f378c06c376fa3352e6b1688ef2..781b5ae75e4f6560bc0b7f489f8444e01e42f46e 100644 (file)
--- a/asn1/pkixcmp/packet-cmp-template.c
+++ b/asn1/pkixcmp/packet-cmp-template.c
@@ -39,6 +39,7 @@
 #include "packet-crmf.h"
 #include "packet-pkix1explicit.h"
 #include "packet-pkix1implicit.h"
+#include <epan/emem.h>
 #include "packet-tcp.h"
 #include <epan/prefs.h>
 #include <epan/nstime.h>

diff --git a/epan/dissectors/packet-aim-chat.c b/epan/dissectors/packet-aim-chat.c
index 5ce087c6ea883034c951ad129194f3ce5fc26607..9b59b39fa4d4918fe5981bf25d41b67a66824570 100644 (file)
--- a/epan/dissectors/packet-aim-chat.c
+++ b/epan/dissectors/packet-aim-chat.c
@@ -37,6 +37,7 @@
 
 #include <epan/packet.h>
 #include <epan/strutil.h>
+#include <epan/emem.h>
 
 #include "packet-tcp.h"
 #include "packet-aim.h"

diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c
index 18407aa585bf93c225c4690b39e9e57a545297d7..a49ad74e4d3d4cac9b815c88d0c9d758fc77fb27 100644 (file)
--- a/epan/dissectors/packet-aim.c
+++ b/epan/dissectors/packet-aim.c
@@ -40,6 +40,7 @@
 
 #include <epan/packet.h>
 #include <epan/strutil.h>
+#include <epan/emem.h>
 
 #include "packet-tcp.h"
 #include "packet-aim.h"

diff --git a/epan/dissectors/packet-bittorrent.c b/epan/dissectors/packet-bittorrent.c
index 1be80b59db9c260cd507ad675c53b3d234278462..c76ed44480015a598ec0f5f88cea2545a3bde89e 100644 (file)
--- a/epan/dissectors/packet-bittorrent.c
+++ b/epan/dissectors/packet-bittorrent.c
@@ -37,6 +37,7 @@
 #include <epan/conversation.h>
 #include <epan/packet.h>
 #include <epan/strutil.h>
+#include <epan/emem.h>
 
 #include "packet-tcp.h"
 

diff --git a/epan/dissectors/packet-cast.c b/epan/dissectors/packet-cast.c
index ab2201ff38ca3cf33d5d51c122a9f46bb78c4600..49077b9ae40d1051a94ee42f60275c1895851fd1 100644 (file)
--- a/epan/dissectors/packet-cast.c
+++ b/epan/dissectors/packet-cast.c
@@ -32,6 +32,7 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
+#include <epan/emem.h>
 
 #include "packet-tcp.h"
 

diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c
index 7d050212dd582ce5bc5ae71b1a812c1c0399a9e2..86c14f0e31c18a416627ce70091ff20966a339dd 100644 (file)
--- a/epan/dissectors/packet-cmp.c
+++ b/epan/dissectors/packet-cmp.c
@@ -47,6 +47,7 @@
 #include "packet-crmf.h"
 #include "packet-pkix1explicit.h"
 #include "packet-pkix1implicit.h"
+#include <epan/emem.h>
 #include "packet-tcp.h"
 #include <epan/prefs.h>
 #include <epan/nstime.h>
@@ -182,7 +183,7 @@ static int hf_cmp_PKIFailureInfo_missingTimeStamp = -1;
 static int hf_cmp_PKIFailureInfo_badPOP = -1;
 
 /*--- End of included file: packet-cmp-hf.c ---*/
-#line 64 "packet-cmp-template.c"
+#line 65 "packet-cmp-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_cmp = -1;
@@ -226,7 +227,7 @@ static gint ett_cmp_GenRepContent = -1;
 static gint ett_cmp_ErrorMsgContent = -1;
 
 /*--- End of included file: packet-cmp-ett.c ---*/
-#line 68 "packet-cmp-template.c"
+#line 69 "packet-cmp-template.c"
 
 static const char *object_identifier_id;
 
@@ -1315,7 +1316,7 @@ dissect_cmp_OOBCertHash(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pa
 
 
 /*--- End of included file: packet-cmp-fn.c ---*/
-#line 73 "packet-cmp-template.c"
+#line 74 "packet-cmp-template.c"
 
 static int
 dissect_cmp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
@@ -1488,7 +1489,7 @@ dissect_cmp_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
                tree = proto_item_add_subtree(item, ett_cmp);
        }
 
-       return dissect_cmp_pdu(tvb, pinfo, tree);
+       dissect_cmp_pdu(tvb, pinfo, tree);
 }
 
 
@@ -1958,7 +1959,7 @@ void proto_register_cmp(void) {
         "", HFILL }},
 
 /*--- End of included file: packet-cmp-hfarr.c ---*/
-#line 279 "packet-cmp-template.c"
+#line 280 "packet-cmp-template.c"
   };
 
   /* List of subtrees */
@@ -2004,7 +2005,7 @@ void proto_register_cmp(void) {
     &ett_cmp_ErrorMsgContent,
 
 /*--- End of included file: packet-cmp-ettarr.c ---*/
-#line 285 "packet-cmp-template.c"
+#line 286 "packet-cmp-template.c"
   };
   module_t *cmp_module;
 

diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c
index d45aa9bda14ff82f5ea76565bca73351f67a5055..ca5f63b6af9eceb29e0ae348d6d662a1acace8a4 100644 (file)
--- a/epan/dissectors/packet-cops.c
+++ b/epan/dissectors/packet-cops.c
@@ -63,6 +63,7 @@
 #include "isprint.h"
 
 #include <epan/packet.h>
+#include <epan/emem.h>
 #include "packet-ipv6.h"
 #include "packet-tcp.h"
 

diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c
index 6770bf5443a719b4d609c4b50bd4f8c2b2646de5..9b621e44ca5fd44e2554449bf969010d1ba114ec 100644 (file)
--- a/epan/dissectors/packet-dec-dnart.c
+++ b/epan/dissectors/packet-dec-dnart.c
@@ -53,7 +53,8 @@
 #include <gmodule.h>
 #include <epan/packet.h>
 #include <epan/proto.h>
-#include <epan/dissectors/packet-tcp.h>
+#include <epan/emem.h>
+#include "packet-tcp.h"
 #include <epan/etypes.h>
 #include <epan/ppptypes.h>
 

diff --git a/epan/dissectors/packet-dhcp-failover.c b/epan/dissectors/packet-dhcp-failover.c
index 971cdf034e51f0227248209f1d1e931c03964114..22f26ee2ecfcadf954252e1924888e93e4e7b7aa 100644 (file)
--- a/epan/dissectors/packet-dhcp-failover.c
+++ b/epan/dissectors/packet-dhcp-failover.c
@@ -48,6 +48,7 @@
 #include <epan/packet.h>
 #include <epan/strutil.h>
 #include <epan/prefs.h>
+#include <epan/emem.h>
 #include "packet-arp.h"
 #include "packet-tcp.h"
 

diff --git a/epan/dissectors/packet-dlsw.c b/epan/dissectors/packet-dlsw.c
index e60d0130f242d57eedd1d984cb4606e6e4caa3a6..8b24c5e370f59e0c59853a164554a8f6742ad1f6 100644 (file)
--- a/epan/dissectors/packet-dlsw.c
+++ b/epan/dissectors/packet-dlsw.c
@@ -34,6 +34,7 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/emem.h>
 #include "packet-tcp.h"
 
 static int proto_dlsw = -1;

diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c
index f6e984a2bd9b5e88adf98fb6fd748a1cbfa68482..2dff93c5b553b7021a93f2beab50159e21fdb9e7 100644 (file)
--- a/epan/dissectors/packet-dns.c
+++ b/epan/dissectors/packet-dns.c
@@ -36,6 +36,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/emem.h>
 #include <epan/ipproto.h>
 #include <epan/addr_resolv.h>
 #include "packet-dns.h"

diff --git a/epan/dissectors/packet-dsi.c b/epan/dissectors/packet-dsi.c
index 7604a587c62a32813f0815ad887c8c5616c55fe1..16fba4e58d509e8ca0da5e8dcdb974d2d5bd7db7 100644 (file)
--- a/epan/dissectors/packet-dsi.c
+++ b/epan/dissectors/packet-dsi.c
@@ -33,6 +33,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/emem.h>
 
 #include <epan/prefs.h>
 #include "packet-tcp.h"

diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c
index e04ee1758e09d1132a7c4cd2a264c92752683061..d08fa74c8eb319c1cdac07c30bd46691ced64dac 100644 (file)
--- a/epan/dissectors/packet-edonkey.c
+++ b/epan/dissectors/packet-edonkey.c
@@ -38,6 +38,7 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
+#include <epan/emem.h>
 #include "packet-edonkey.h"
 #include "packet-tcp.h"
 

diff --git a/epan/dissectors/packet-gnutella.c b/epan/dissectors/packet-gnutella.c
index 1c6ccec98125f041a1fa566ba9ae94b20456da65..d3728918b2b308df33e1e2ffdc9853c25fdb850a 100644 (file)
--- a/epan/dissectors/packet-gnutella.c
+++ b/epan/dissectors/packet-gnutella.c
@@ -35,6 +35,7 @@
 
 
 #include <epan/packet.h>
+#include <epan/emem.h>
 #include "packet-gnutella.h"
 #include "packet-tcp.h"
 

diff --git a/epan/dissectors/packet-icep.c b/epan/dissectors/packet-icep.c
index 92b0f14f9f7b09ad16eca3ddbd5c8982b1122d47..b5d31a7b31c521e8b7295acc28fc51a884839b0d 100644 (file)
--- a/epan/dissectors/packet-icep.c
+++ b/epan/dissectors/packet-icep.c
@@ -53,8 +53,8 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/dissectors/packet-tcp.h>
 #include <epan/emem.h>
+#include "packet-tcp.h"
 
 #if 0
 #define DBG(str, args...)       do {\

diff --git a/epan/dissectors/packet-ipdc.c b/epan/dissectors/packet-ipdc.c
index 36f0681c2c984b495fa773888994b4b2166c647e..0508d67f247200c812bcbe81704f3700ab90abd3 100644 (file)
--- a/epan/dissectors/packet-ipdc.c
+++ b/epan/dissectors/packet-ipdc.c
@@ -38,6 +38,7 @@
 #include <math.h>
 
 #include <epan/packet.h>
+#include <epan/emem.h>
 #include "packet-ipdc.h"
 #include "packet-tcp.h"
 #include <epan/packet.h>

diff --git a/epan/dissectors/packet-isns.c b/epan/dissectors/packet-isns.c
index 163426b7a1b25a9b9abcf66b44e1fcd92a8a7f25..c65cc5046573a2236e03422eea3b8fddf1d3376c 100644 (file)
--- a/epan/dissectors/packet-isns.c
+++ b/epan/dissectors/packet-isns.c
@@ -48,6 +48,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/emem.h>
 #include <epan/conversation.h>
 #include "packet-tcp.h"
 #include <epan/prefs.h>

diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c
index 10e4701411f8a77a95a50635315fcbea7d17eef8..fbc25d36a617fe7e8d960fc7453716788c374a58 100644 (file)
--- a/epan/dissectors/packet-kerberos.c
+++ b/epan/dissectors/packet-kerberos.c
@@ -82,6 +82,7 @@
 #include <epan/strutil.h>
 
 #include <epan/conversation.h>
+#include <epan/emem.h>
 #include <epan/dissectors/packet-kerberos.h>
 #include <epan/dissectors/packet-netbios.h>
 #include <epan/dissectors/packet-tcp.h>
@@ -95,7 +96,6 @@
 #include <epan/dissectors/packet-dcerpc.h>
 
 #include <epan/dissectors/packet-gssapi.h>
-#include <epan/emem.h>
 
 #define UDP_PORT_KERBEROS              88
 #define TCP_PORT_KERBEROS              88

diff --git a/epan/dissectors/packet-kpasswd.c b/epan/dissectors/packet-kpasswd.c
index 9d8cb5b2a8bf337b4cfd90cae979e91df3639045..2dc863b82e2211be74258d49b07e5365bc8d1271 100644 (file)
--- a/epan/dissectors/packet-kpasswd.c
+++ b/epan/dissectors/packet-kpasswd.c
@@ -30,7 +30,8 @@
 #endif
 
 #include <epan/packet.h>
-#include <epan/dissectors/packet-tcp.h>
+#include <epan/emem.h>
+#include "packet-tcp.h"
 #include "packet-kerberos.h"
 #include "packet-ber.h"
 #include <epan/prefs.h>

diff --git a/epan/dissectors/packet-laplink.c b/epan/dissectors/packet-laplink.c
index 9f022950748c9e7f117ceabeb3b56559313e6103..821baa5d1cb34b3ed357f6db391c2545676fcee5 100644 (file)
--- a/epan/dissectors/packet-laplink.c
+++ b/epan/dissectors/packet-laplink.c
@@ -36,6 +36,7 @@
 #include <epan/packet.h>
 #include <epan/strutil.h>
 #include <epan/conversation.h>
+#include <epan/emem.h>
 
 #include "packet-tcp.h"
 #include <epan/prefs.h>

diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c
index 3c458d641e85010ed2b468bbc5dd7d263c56d44c..2f8940072ee9a1bea01f8fbcfee65125e9eb49dc 100644 (file)
--- a/epan/dissectors/packet-mq.c
+++ b/epan/dissectors/packet-mq.c
@@ -70,6 +70,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/reassemble.h>
 #include <epan/prefs.h>

diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c
index 46fb2f74efd04fc43271b4babf4d56a9e4027157..857935d7a208fcf7f84a4a90b7d0153dd7f5178e 100644 (file)
--- a/epan/dissectors/packet-mysql.c
+++ b/epan/dissectors/packet-mysql.c
@@ -38,6 +38,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
+#include <epan/emem.h>
 
 #include "packet-tcp.h"
 #include <epan/reassemble.h>

diff --git a/epan/dissectors/packet-nbns.c b/epan/dissectors/packet-nbns.c
index a36d56eed0bf0ed06f585235c221ec9b68b62b85..599d4c61a34c9b5947ea349411ecd4442cb82dbf 100644 (file)
--- a/epan/dissectors/packet-nbns.c
+++ b/epan/dissectors/packet-nbns.c
@@ -33,12 +33,12 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/emem.h>
 #include "packet-dns.h"
 #include "packet-netbios.h"
 #include "packet-tcp.h"
 #include "packet-frame.h"
 #include <epan/prefs.h>
-#include <epan/emem.h>
 
 static int proto_nbns = -1;
 static int hf_nbns_flags = -1;

diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c
index 632a4a207038e721a39e941ce1163bdb7d230c39..bdae132fea3ad3b7e04d00f16c16a18525e83f95 100644 (file)
--- a/epan/dissectors/packet-ndmp.c
+++ b/epan/dissectors/packet-ndmp.c
@@ -40,6 +40,7 @@
 
 #include <epan/packet.h>
 #include <epan/conversation.h>
+#include <epan/emem.h>
 #include "packet-rpc.h"
 #include "packet-tcp.h"
 #include "packet-scsi.h"

diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c
index c1405169c2c4d21ed2a4ae6d9d96dfa6ee98b5c4..e03c86ac3d40231ab85b15268f600be851635141 100644 (file)
--- a/epan/dissectors/packet-ndps.c
+++ b/epan/dissectors/packet-ndps.c
@@ -32,12 +32,12 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
+#include <epan/emem.h>
 #include "packet-ipx.h"
 #include "packet-tcp.h"
 #include <epan/conversation.h>
 #include "packet-ndps.h"
 #include <epan/reassemble.h>
-#include <epan/emem.h>
 #include <epan/expert.h>
 
 /* Limit the number of items we can add to the tree. */

diff --git a/epan/dissectors/packet-netsync.c b/epan/dissectors/packet-netsync.c
index 1068adb7ba4b12058ef3b746e6faba1b9f0f5bff..db41dfff2f6e38eec782b2ce23036e5a0b85fd5f 100644 (file)
--- a/epan/dissectors/packet-netsync.c
+++ b/epan/dissectors/packet-netsync.c
@@ -39,7 +39,8 @@
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>
 #include <epan/strutil.h>
-#include <epan/dissectors/packet-tcp.h>
+#include <epan/emem.h>
+#include "packet-tcp.h"
 
 /*
  * See

diff --git a/epan/dissectors/packet-pgsql.c b/epan/dissectors/packet-pgsql.c
index 4bf34c8cac33b1587c24f6aa1f397a7b3588e232..16c73b727e4a8b9679574e6320935c3eea53d7c7 100644 (file)
--- a/epan/dissectors/packet-pgsql.c
+++ b/epan/dissectors/packet-pgsql.c
@@ -32,6 +32,7 @@
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <epan/prefs.h>
+#include <epan/emem.h>
 
 #include "packet-tcp.h"
 #include <epan/reassemble.h>

diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c
index d146ce2263d25fcf7ec7199bb5f434672827c10a..81e7497e09576c5a840f228f742b7a71ca5bedf3 100644 (file)
--- a/epan/dissectors/packet-rpc.c
+++ b/epan/dissectors/packet-rpc.c
@@ -35,6 +35,7 @@
 #include <ctype.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
+#include <epan/emem.h>
 #include "packet-rpc.h"
 #include "packet-frame.h"
 #include "packet-tcp.h"
@@ -43,7 +44,6 @@
 #include <epan/dissectors/rpc_defrag.h>
 #include "packet-nfs.h"
 #include <epan/tap.h>
-#include <epan/emem.h>
 #include <epan/strutil.h>
 
 /*

diff --git a/epan/dissectors/packet-s5066.c b/epan/dissectors/packet-s5066.c
index a9e3da8d0ce4bb919a50b3bba4af23861d41f2a6..fd17556e053095c7da04905d50572da0ca6997ba 100644 (file)
--- a/epan/dissectors/packet-s5066.c
+++ b/epan/dissectors/packet-s5066.c
@@ -31,6 +31,7 @@
 #include <gmodule.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
+#include <epan/emem.h>
 #include <epan/dissectors/packet-tcp.h> /* For tcp_dissect_pdus() */
 
 /* Forward reference */

diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c
index 5aa2ac55cfe7fdad46a661c6f77ae40d563bc5be..bb856bc6853781b4be2925056f299da11bf60d0a 100644 (file)
--- a/epan/dissectors/packet-skinny.c
+++ b/epan/dissectors/packet-skinny.c
@@ -44,6 +44,7 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
+#include <epan/emem.h>
 
 #include "packet-rtp.h"
 #include "packet-tcp.h"

diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c
index 498aa600c3d4b0b308b4bb8b5abeae9e8b81ab7a..45c6de803ecedcee85e368716cfcb1a4001cee33 100644 (file)
--- a/epan/dissectors/packet-slsk.c
+++ b/epan/dissectors/packet-slsk.c
@@ -42,6 +42,7 @@
 
 #include <epan/packet.h>
 #include <epan/tvbuff.h>
+#include <epan/emem.h>
 #include "packet-tcp.h"
 #include <epan/prefs.h>
 #include <epan/strutil.h>

diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c
index 2ff0a73f56bdb43ab42b3414e7217181ae1a103d..1e893cfa09b6320ae17795cc53e02f165c23a6ce 100644 (file)
--- a/epan/dissectors/packet-socks.c
+++ b/epan/dissectors/packet-socks.c
@@ -77,10 +77,10 @@
 #include <epan/addr_resolv.h>
 #include <epan/conversation.h>
 
+#include <epan/emem.h>
 #include "packet-tcp.h"
 #include "packet-udp.h"
 #include <epan/strutil.h>
-#include <epan/emem.h>
 
 
 #define compare_packet(X) (X == (pinfo->fd->num))

diff --git a/epan/dissectors/packet-srvloc.c b/epan/dissectors/packet-srvloc.c
index edbc5fc766eba3598fa1ca569d402cedd238f231..409a35c74ce9d18f9a187f46f9e904460b041459 100644 (file)
--- a/epan/dissectors/packet-srvloc.c
+++ b/epan/dissectors/packet-srvloc.c
@@ -48,9 +48,9 @@
 #include <epan/packet.h>
 #include <epan/strutil.h>
 #include <epan/prefs.h>
+#include <epan/emem.h>
 #include "packet-tcp.h"
 #include <epan/reassemble.h>
-#include <epan/emem.h>
 #include <epan/expert.h>
 
 static proto_item *expert_item = NULL;

diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c
index 5fd86cd0c877898f335d0c64a446259942b40ca3..5c5092f8f9b743f0c7c41424e68e63523bcc049e 100644 (file)
--- a/epan/dissectors/packet-ssh.c
+++ b/epan/dissectors/packet-ssh.c
@@ -37,11 +37,11 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
+#include <epan/emem.h>
 
 #include "packet-tcp.h"
 #include <epan/reassemble.h>
 #include <epan/prefs.h>
-#include <epan/emem.h>
 
 /* get from openssh ssh2.h */
 #define SSH2_MSG_DISCONNECT                            1

diff --git a/epan/dissectors/packet-tali.c b/epan/dissectors/packet-tali.c
index 07b535d14844a34c08e673bd1f8d225b5fdab4ae..5e9fe3b0a74390ebd5a5edd5ed5ea6a5a72e0f66 100644 (file)
--- a/epan/dissectors/packet-tali.c
+++ b/epan/dissectors/packet-tali.c
@@ -40,6 +40,7 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
+#include <epan/emem.h>
 #include "packet-tcp.h"
 
 #define TALI_SYNC_LENGTH    4

diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index f0fad540b0efad05931dbf8375ff17011aac2bf3..7032e854e3998d52086b9fec4dd533ca4b60bbde 100644 (file)
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -37,6 +37,7 @@
 #include <epan/ip_opts.h>
 #include <epan/follow.h>
 #include <epan/prefs.h>
+#include <epan/emem.h>
 #include "packet-tcp.h"
 #include "packet-ip.h"
 #include "packet-frame.h"
@@ -44,7 +45,6 @@
 #include <epan/strutil.h>
 #include <epan/reassemble.h>
 #include <epan/tap.h>
-#include <epan/emem.h>
 #include <epan/slab.h>
 #include <epan/expert.h>
 
@@ -212,7 +212,6 @@ static SLAB_FREE_LIST_DEFINE(tcp_unacked_t)
 static GHashTable *tcp_pdu_tracking_table = NULL;
 static GHashTable *tcp_pdu_skipping_table = NULL;
 
-static se_tree_t *tcp_analyze_acked_table = NULL;
 static se_tree_t *tcp_pdu_time_table = NULL;
 
 static void
@@ -266,6 +265,8 @@ get_tcp_conversation_data(packet_info *pinfo)
                tcpd->flow2.window=0;
                tcpd->flow2.win_scale=-1;
                tcpd->flow2.pdu_seq=NULL;
+               tcpd->acked_table=se_tree_create_non_persistent(SE_TREE_TYPE_RED_BLACK, "tcp_analyze_acked_table");
+
 
                conversation_add_proto_data(conv, proto_tcp, tcpd);
        }
@@ -495,7 +496,7 @@ tcp_get_relative_seq_ack(guint32 *seq, guint32 *ack, guint32 *win, struct tcp_an
 static void
 tcp_analyze_get_acked_struct(guint32 frame, gboolean createflag, struct tcp_analysis *tcpd)
 {
-       tcpd->ta=se_tree_lookup32(tcp_analyze_acked_table, frame);
+       tcpd->ta=se_tree_lookup32(tcpd->acked_table, frame);
        if((!tcpd->ta) && createflag){
                tcpd->ta=se_alloc(sizeof(struct tcp_acked));
                tcpd->ta->frame_acked=0;
@@ -504,7 +505,7 @@ tcp_analyze_get_acked_struct(guint32 frame, gboolean createflag, struct tcp_anal
                tcpd->ta->flags=0;
                tcpd->ta->dupack_num=0;
                tcpd->ta->dupack_frame=0;
-               se_tree_insert32(tcp_analyze_acked_table, frame, (void *)tcpd->ta);
+               se_tree_insert32(tcpd->acked_table, frame, (void *)tcpd->ta);
        }
 }
 
@@ -3086,7 +3087,6 @@ proto_register_tcp(void)
            &try_heuristic_first);
 
        tcp_pdu_time_table=se_tree_create(SE_TREE_TYPE_RED_BLACK, "tcp_pdu_time_table");
-       tcp_analyze_acked_table=se_tree_create(SE_TREE_TYPE_RED_BLACK, "tcp_analyze_acked_table");
        register_init_routine(tcp_analyze_seq_init);
        register_init_routine(tcp_desegment_init);
        register_init_routine(tcp_fragment_init);

diff --git a/epan/dissectors/packet-tcp.h b/epan/dissectors/packet-tcp.h
index e762da3e4ac60d405769c03edda2b9dc4e1a585b..061d77c498235e4678c4e5e481f1d01e88bd73aa 100644 (file)
--- a/epan/dissectors/packet-tcp.h
+++ b/epan/dissectors/packet-tcp.h
@@ -173,6 +173,10 @@ struct tcp_analysis {
         * similar 
         */
        struct tcp_acked *ta;
+       /* This structure contains a tree containing all the various ta's
+        * keyed by frame number.
+        */
+       se_tree_t *acked_table;
 };
 
 

diff --git a/epan/dissectors/packet-tns.c b/epan/dissectors/packet-tns.c
index c54ea8747da0ad7363a4b47186d08d777ce1d9f4..3a3ee761209f818ee410e291432523fa16afc763 100644 (file)
--- a/epan/dissectors/packet-tns.c
+++ b/epan/dissectors/packet-tns.c
@@ -33,6 +33,7 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/emem.h>
 #include "packet-tcp.h"
 #include "packet-tns.h"
 

diff --git a/epan/dissectors/packet-xot.c b/epan/dissectors/packet-xot.c
index b29b07cb9a63d7d1fb6cc405b13ed32a758813be..6f1febb4c22759c8c124d14e539a49008c5dea0a 100644 (file)
--- a/epan/dissectors/packet-xot.c
+++ b/epan/dissectors/packet-xot.c
@@ -35,6 +35,7 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/emem.h>
 #include "packet-tcp.h"
 #include <epan/prefs.h>
 

diff --git a/epan/dissectors/packet-ymsg.c b/epan/dissectors/packet-ymsg.c
index d77adcbae32e5a76573f6c49069e14e41c23b5f7..554835314dbe36def1ecb31d303b30086badbd3c 100644 (file)
--- a/epan/dissectors/packet-ymsg.c
+++ b/epan/dissectors/packet-ymsg.c
@@ -33,6 +33,7 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/emem.h>
 
 #include "packet-tcp.h"
 #include <epan/prefs.h>

diff --git a/gtk/conversations_tcpip.c b/gtk/conversations_tcpip.c
index 67f932968fb4f3d447aa8cdddd8c1a3ca93087bf..8f9e60a86533d0296ea70b3e91904e0a24bfddf8 100644 (file)
--- a/gtk/conversations_tcpip.c
+++ b/gtk/conversations_tcpip.c
@@ -33,6 +33,7 @@
 #include <gtk/gtk.h>
 #include <string.h>
 #include "epan/packet.h"
+#include <epan/emem.h>
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 #include "gui_stat_menu.h"

diff --git a/gtk/flow_graph.c b/gtk/flow_graph.c
index 714da95d48aa30bf326ff9df5e75e527743dcbf5..fa2dd28afff2112c1956d5c0f80e06851cca40fc 100644 (file)
--- a/gtk/flow_graph.c
+++ b/gtk/flow_graph.c
@@ -46,6 +46,7 @@
 
 #include <epan/to_str.h>
 #include <epan/tap.h>
+#include <epan/emem.h>
 #include <epan/dissectors/packet-tcp.h>
 
 #include <string.h>

diff --git a/gtk/hostlist_tcpip.c b/gtk/hostlist_tcpip.c
index a3a5cecc176c818c3622a45b3eafc54bda649b3f..ea3272e05014384c40f80a0c3d70d7ceb42c85a2 100644 (file)
--- a/gtk/hostlist_tcpip.c
+++ b/gtk/hostlist_tcpip.c
@@ -37,6 +37,7 @@
 #include "../stat_menu.h"
 #include "gui_stat_menu.h"
 #include <epan/tap.h>
+#include <epan/emem.h>
 #include "../register.h"
 #include "hostlist_table.h"
 #include <epan/dissectors/packet-tcp.h>

diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c
index 496b73835f83d3e76672ec404cf813472bc3381b..e7a3d666d668e2fc2395ebe0dd4aa5d6a97e18ec 100644 (file)
--- a/gtk/tcp_graph.c
+++ b/gtk/tcp_graph.c
@@ -36,6 +36,7 @@
 #include <epan/ipproto.h>
 #include "globals.h"           /* cfile */
 #include <epan/packet.h>       /* frame_data */
+#include <epan/emem.h>
 #include "gtkglobals.h"                /* packet_list */
 #include "simple_dialog.h"
 #include "gui_utils.h"

diff --git a/plugins/agentx/packet-agentx.c b/plugins/agentx/packet-agentx.c
index 28bcfbeef783727cdffd0c29a9bdaad697692261..e10a48204e4aeadf7038d53b5881ce3a3207ae9f 100644 (file)
--- a/plugins/agentx/packet-agentx.c
+++ b/plugins/agentx/packet-agentx.c
@@ -41,6 +41,7 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
+#include <epan/emem.h>
 
 #include <epan/dissectors/packet-tcp.h>
 

diff --git a/plugins/asn1/packet-asn1.c b/plugins/asn1/packet-asn1.c
index 3d73115553b59ae295de48ad3e1589ffd527ec7a..2d31c6ebd8c7852e6312a5caea66d0242c79796b 100644 (file)
--- a/plugins/asn1/packet-asn1.c
+++ b/plugins/asn1/packet-asn1.c
@@ -81,6 +81,7 @@
 #include <epan/strutil.h>
 #include <epan/filesystem.h>
 #include <epan/report_err.h>
+#include <epan/emem.h>
 #include <epan/dissectors/packet-tcp.h>
 #include <epan/asn1.h>
 #include <wiretap/file_util.h>

diff --git a/plugins/gryphon/packet-gryphon.c b/plugins/gryphon/packet-gryphon.c
index 4d6b67f35b892cb8b65145178eb55e281dbcf305..fe7b16fe923a7fbd27926c49c0a766b17e7d9415 100644 (file)
--- a/plugins/gryphon/packet-gryphon.c
+++ b/plugins/gryphon/packet-gryphon.c
@@ -36,6 +36,7 @@
 
 #include <gmodule.h>
 #include <epan/packet.h>
+#include <epan/emem.h>
 #include "packet-gryphon.h"
 #include <epan/dissectors/packet-tcp.h>
 #include <epan/prefs.h>

diff --git a/plugins/opsi/packet-opsi.c b/plugins/opsi/packet-opsi.c
index 41cfd5aa96e1a54f712cc10f9b37353df2f35867..4ef2796b5014f053a422fde3f11ad379564fdfd5 100644 (file)
--- a/plugins/opsi/packet-opsi.c
+++ b/plugins/opsi/packet-opsi.c
@@ -37,6 +37,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/emem.h>
 #include <epan/dissectors/packet-tcp.h>
 #include <epan/prefs.h>
 

diff --git a/tap-iousers.c b/tap-iousers.c
index d7c779b981bd8456d9bcce74bd55b4fdd1e84eaf..1e7521f0d5c68e5c775cdb379d3cf2290c07ddc5 100644 (file)
--- a/tap-iousers.c
+++ b/tap-iousers.c
@@ -35,6 +35,7 @@
 #include <string.h>
 #include <epan/packet_info.h>
 #include <epan/packet.h>
+#include <epan/emem.h>
 #include <epan/addr_resolv.h>
 #include <epan/tap.h>
 #include <epan/stat_cmd_args.h>