6lowpan: proto_tree_add_item() can be used directly for an FT_UINT64
authorMartin Kaiser <wireshark@kaiser.cx>
Fri, 18 Mar 2016 13:47:18 +0000 (12:47 -0100)
committerAlexis La Goutte <alexis.lagoutte@gmail.com>
Fri, 18 Mar 2016 22:04:18 +0000 (22:04 +0000)
Change-Id: I3f43fc9b0951822dd2ec3aba85af993e20c549d3
Reviewed-on: https://code.wireshark.org/review/14515
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
epan/dissectors/packet-6lowpan.c

index 8a0a7d7a19a11225175a1f73261ddac16088742f..d2640c78ed6f321bc8bb22dd9990a7599bac572c 100644 (file)
@@ -2256,9 +2256,9 @@ dissect_6lowpan_mesh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8
 
     /* Get and display the originator address. */
     if (!(mesh_header & LOWPAN_MESH_HEADER_V)) {
-        guint64         addr64 = tvb_get_ntoh64(tvb, offset);
+        proto_tree_add_item(mesh_tree, hf_6lowpan_mesh_orig64,
+                tvb, offset, 8, ENC_BIG_ENDIAN);
 
-        proto_tree_add_uint64(mesh_tree, hf_6lowpan_mesh_orig64, tvb, offset, 8, addr64);
         src_ifcid = tvb_get_ptr(tvb, offset, 8);
         /* Update source IID */
         memcpy(siid, src_ifcid, LOWPAN_IFC_ID_LEN);
@@ -2294,9 +2294,8 @@ dissect_6lowpan_mesh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8
 
     /* Get and display the destination address. */
     if (!(mesh_header & LOWPAN_MESH_HEADER_F)) {
-        guint64         addr64 = tvb_get_ntoh64(tvb, offset);
-
-        proto_tree_add_uint64(mesh_tree, hf_6lowpan_mesh_dest64, tvb, offset, 8, addr64);
+        proto_tree_add_item(mesh_tree, hf_6lowpan_mesh_dest64,
+                tvb, offset, 8, ENC_BIG_ENDIAN);
 
         dst_ifcid = tvb_get_ptr(tvb, offset, 8);
         /* Update destination IID */