diff options
| author | Bill Meier <wmeier@newsguy.com> | 2015-01-20 14:18:53 -0500 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2015-01-20 20:49:18 +0000 |
| commit | c0a403abf32274d73c9a71a0abca1235cbcfb488 (patch) | |
| tree | d62bc99017b1548e78a464a1f93000b817dc008f /epan/dissectors/packet-6lowpan.c | |
| parent | f63628d9c4c8d5d38e97ae6ac3640b365075b0ef (diff) | |
6lowpan: Fix a few minor bugs; Also: Misc
(Bugs were introduced in gf5e2b42);
Misc:
Localize a few variables;
Remove some dead initializers.
Change-Id: Ib7493740ecf29ed9f753475f721b47a64f54a278
Reviewed-on: https://code.wireshark.org/review/6687
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors/packet-6lowpan.c')
| -rw-r--r-- | epan/dissectors/packet-6lowpan.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c index a10af1e491..f1ee141c8c 100644 --- a/epan/dissectors/packet-6lowpan.c +++ b/epan/dissectors/packet-6lowpan.c @@ -1389,8 +1389,7 @@ dissect_6lowpan_iphc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint d guint16 hint_panid; gint offset = 0; gint length = 0; - proto_tree * iphc_tree = NULL; - proto_item * ti = NULL; + proto_tree * iphc_tree; proto_item * ti_dam = NULL; /* IPHC header fields. */ guint16 iphc_flags; @@ -1507,6 +1506,7 @@ dissect_6lowpan_iphc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint d if ((tree) && (iphc_traffic != LOWPAN_IPHC_FLOW_COMPRESSED)) { /* Create a tree for the traffic class. */ proto_tree * tf_tree; + proto_item * ti; ti = proto_tree_add_uint(tree, hf_6lowpan_traffic_class, tvb, offset>>3, 1, ipv6_class); tf_tree = proto_item_add_subtree(ti, ett_6lopwan_traffic_class); @@ -1612,6 +1612,7 @@ dissect_6lowpan_iphc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint d /* Add information about where the context came from. */ /* TODO: We should display the prefix length too. */ if (tree && sctx->plen) { + proto_item *ti; ti = proto_tree_add_ipv6(iphc_tree, hf_6lowpan_iphc_sctx_prefix, tvb, 0, 0, (guint8 *)&sctx->prefix); PROTO_ITEM_SET_GENERATED(ti); if ( sctx->frame ) { @@ -1738,6 +1739,7 @@ dissect_6lowpan_iphc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint d /* Add information about where the context came from. */ /* TODO: We should display the prefix length too. */ if (tree && dctx->plen) { + proto_item *ti; ti = proto_tree_add_ipv6(iphc_tree, hf_6lowpan_iphc_dctx_prefix, tvb, 0, 0, (guint8 *)&dctx->prefix); PROTO_ITEM_SET_GENERATED(ti); if ( dctx->frame ) { @@ -1828,7 +1830,7 @@ dissect_6lowpan_iphc_nhc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gi /* Create a tree for the IPv6 extension header. */ if (tree) { - nhc_tree = proto_tree_add_subtree(tree, tvb, offset, 2, ett_6lowpan_nhc_ext, NULL, "IPv6 extension header"); + nhc_tree = proto_tree_add_subtree(tree, tvb, offset, 2, ett_6lowpan_nhc_ext, &ti, "IPv6 extension header"); /* Display the NHC-UDP pattern. */ proto_tree_add_bits_item(nhc_tree, hf_6lowpan_nhc_pattern, tvb, offset<<3, LOWPAN_NHC_PATTERN_EXT_BITS, ENC_BIG_ENDIAN); } @@ -2178,13 +2180,13 @@ dissect_6lowpan_mesh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 { gint offset = 0; guint8 mesh_header; - proto_tree * mesh_tree = NULL; - proto_item * ti = NULL; + proto_tree * mesh_tree; + proto_item * ti; const guint8 * src_ifcid; const guint8 * dst_ifcid; /* Create a tree for the mesh header. */ - mesh_tree = proto_tree_add_subtree(tree, tvb, offset, 0, ett_6lowpan_mesh, NULL, "Mesh Header"); + mesh_tree = proto_tree_add_subtree(tree, tvb, offset, 0, ett_6lowpan_mesh, &ti, "Mesh Header"); /* Get and display the mesh flags. */ mesh_header = tvb_get_guint8(tvb, offset); @@ -2404,7 +2406,7 @@ dissect_6lowpan_frag_middle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 dgram_size; guint16 dgram_tag; guint16 dgram_offset = 0; - proto_tree * frag_tree = NULL; + proto_tree * frag_tree; proto_item * ti; /* Reassembly parameters. */ tvbuff_t * new_tvb; |