diff options
author | Michael Mann <mmann78@netscape.net> | 2013-10-27 16:03:11 +0000 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2013-10-27 16:03:11 +0000 |
commit | 471f21181b866fc1328b61a2ea4584b400388d7b (patch) | |
tree | d98992020277c9f9e591babddd359c8b03d9238b /epan/dissectors/packet-ax25.c | |
parent | 394f67c1b7ab65b6fb89610ce251be62b8509208 (diff) |
Have X.25 dissector pass boolean q_bit_set value through dissector data rather than pinfo->private_data.
Other "related" dissectors weren't manipulating pinfo->private_data, so it doesn't make sense for them to bother saving/restore it (now that q_bit_set isn't being used)
svn path=/trunk/; revision=52894
Diffstat (limited to 'epan/dissectors/packet-ax25.c')
-rw-r--r-- | epan/dissectors/packet-ax25.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/epan/dissectors/packet-ax25.c b/epan/dissectors/packet-ax25.c index b1e41ee302..fade71bc97 100644 --- a/epan/dissectors/packet-ax25.c +++ b/epan/dissectors/packet-ax25.c @@ -148,7 +148,6 @@ dissect_ax25( tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree ) guint8 pid = AX25_P_NO_L3; guint8 src_ssid; guint8 dst_ssid; - void *saved_private_data; tvbuff_t *next_tvb = NULL; @@ -254,16 +253,12 @@ dissect_ax25( tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree ) proto_item_set_end(ti, tvb, offset); - saved_private_data = pinfo->private_data; - next_tvb = tvb_new_subset_remaining(tvb, offset); if (!dissector_try_uint(ax25_dissector_table, pid, next_tvb, pinfo, parent_tree)) { call_dissector(data_handle, next_tvb, pinfo, parent_tree); } - - pinfo->private_data = saved_private_data; } else proto_item_set_end(ti, tvb, offset); |