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-netrom.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-netrom.c')
| -rw-r--r-- | epan/dissectors/packet-netrom.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/epan/dissectors/packet-netrom.c b/epan/dissectors/packet-netrom.c index 80167f297e..ce0a22ebec 100644 --- a/epan/dissectors/packet-netrom.c +++ b/epan/dissectors/packet-netrom.c @@ -208,7 +208,6 @@ dissect_netrom_proto(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 op_code; guint8 cct_index; guint8 cct_id; - void *saved_private_data; tvbuff_t *next_tvb = NULL; col_set_str( pinfo->cinfo, COL_PROTOCOL, "NET/ROM" ); @@ -448,7 +447,6 @@ dissect_netrom_proto(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Call sub-dissectors here */ - saved_private_data = pinfo->private_data; next_tvb = tvb_new_subset_remaining(tvb, offset); switch ( op_code ) @@ -465,14 +463,11 @@ dissect_netrom_proto(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) call_dissector( default_handle , next_tvb, pinfo, tree ); break; } - - pinfo->private_data = saved_private_data; } static void dissect_netrom_routing(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - void *saved_private_data; tvbuff_t *next_tvb; col_set_str( pinfo->cinfo, COL_PROTOCOL, "NET/ROM"); @@ -492,13 +487,9 @@ dissect_netrom_routing(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item( netrom_tree, hf_netrom_mnemonic, tvb, 1, 6, ENC_ASCII|ENC_NA ); } - saved_private_data = pinfo->private_data; next_tvb = tvb_new_subset_remaining(tvb, 7); call_dissector( default_handle , next_tvb, pinfo, tree ); - - pinfo->private_data = saved_private_data; - } /* Code to actually dissect the packets */ |