diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-11-23 02:20:13 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-11-23 02:20:13 +0000 |
| commit | 9b7fb8a81120f99babc82e25416f9e25fe616c73 (patch) | |
| tree | 5dc37cedfddb9588b91957f7da7aeaac83d75543 /epan/dissectors/packet-synphasor.c | |
| parent | b3a24c5cc401498535ffdb64aaa212e46e587698 (diff) | |
Create the ability to have packet scoped "proto" data. Bug 9470 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9470)
I'm not sold on the name or module the proto_data functions live in, but I believe the function arguments are solid and gives us the most flexibility for the future. And search/replace of a function name is easy enough to do.
The big driving force for getting this in sooner rather than later is the saved memory on ethernet packets (and IP packets soon), that used to have file_scope() proto data when all it needed was packet_scope() data (technically packet_info->pool scoped), strictly for Decode As.
All dissectors that use p_add_proto_data() only for Decode As functionality have been converted to using packet_scope(). All other dissectors were converted to using file_scope() which was the original scope for "proto" data.
svn path=/trunk/; revision=53520
Diffstat (limited to 'epan/dissectors/packet-synphasor.c')
| -rw-r--r-- | epan/dissectors/packet-synphasor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-synphasor.c b/epan/dissectors/packet-synphasor.c index a7b58c8592..eda6823a2d 100644 --- a/epan/dissectors/packet-synphasor.c +++ b/epan/dissectors/packet-synphasor.c @@ -533,7 +533,7 @@ static int dissect_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v if (conversation) { config_frame *conf = (config_frame *)conversation_get_proto_data(conversation, proto_synphasor); /* no problem if 'conf' is NULL, the DATA frame dissector checks this again */ - p_add_proto_data(pinfo->fd, proto_synphasor, 0, conf); + p_add_proto_data(wmem_file_scope(), pinfo, proto_synphasor, 0, conf); } } } /* if (!visited) */ @@ -794,7 +794,7 @@ static int dissect_data_frame(tvbuff_t *tvb, /* search for configuration information to dissect the frame */ { gboolean config_found = FALSE; - conf = (config_frame *)p_get_proto_data(pinfo->fd, proto_synphasor, 0); + conf = (config_frame *)p_get_proto_data(wmem_file_scope(), pinfo, proto_synphasor, 0); if (conf) { /* check if the size of the current frame is the |