diff options
author | Evan Huus <eapache@gmail.com> | 2012-10-08 15:23:36 +0000 |
---|---|---|
committer | Evan Huus <eapache@gmail.com> | 2012-10-08 15:23:36 +0000 |
commit | b6f0d11c6f538a6214af9e93ce07f8fde227460b (patch) | |
tree | 675372de1de864ff91efa2d767c96404fcc5020c /epan/epan_dissect.h | |
parent | 92c3bc0228b40742c079a03b41f2b25d3e8591d6 (diff) |
EDT structures now own their ep_ memory pools. This should finally clean
up the last little bits of:
- https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5284
- https://www.wireshark.org/lists/wireshark-dev/201208/msg00128.html
and possibly part of:
- https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7775
This is a fairly invasive change that required some funky work with linked
lists to avoid changing any of the public ep_* APIs, so if something breaks
blame me :)
svn path=/trunk/; revision=45389
Diffstat (limited to 'epan/epan_dissect.h')
-rw-r--r-- | epan/epan_dissect.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/epan/epan_dissect.h b/epan/epan_dissect.h index 7faabef947..8a95bfe808 100644 --- a/epan/epan_dissect.h +++ b/epan/epan_dissect.h @@ -31,6 +31,7 @@ extern "C" { #include "tvbuff.h" #include "proto.h" #include "packet_info.h" +#include "emem.h" /* Dissection of a single byte array. Holds tvbuff info as * well as proto_tree info. As long as the epan_dissect_t for a byte @@ -41,6 +42,7 @@ extern "C" { struct _epan_dissect_t { tvbuff_t *tvb; proto_tree *tree; + emem_header_t *mem; packet_info pi; }; @@ -49,3 +51,16 @@ struct _epan_dissect_t { #endif /* __cplusplus */ #endif /* EPAN_DISSECT_H */ + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ |