diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-08-01 10:08:57 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-08-03 16:30:10 +0000 |
| commit | 5db1352526e71727091ff0e1c0e97821eec4e4cb (patch) | |
| tree | 01f836967616b7ae8b2840c488b500c7ff13d55c /epan/dissectors/packet-batadv.c | |
| parent | 3fa5625ea074908d5617111a7edfcf6d95e6108a (diff) | |
| download | wireshark-5db1352526e71727091ff0e1c0e97821eec4e4cb.tar.gz | |
Eliminate proto_tree_add_text from some dissectors.
Change-Id: I398e9cf4f6882e76644aa758e12c39a39159e95f
Reviewed-on: https://code.wireshark.org/review/3319
Petri-Dish: Michael Mann <mmann78@netscape.net>
Petri-Dish: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-batadv.c')
| -rw-r--r-- | epan/dissectors/packet-batadv.c | 36 |
1 files changed, 30 insertions, 6 deletions
diff --git a/epan/dissectors/packet-batadv.c b/epan/dissectors/packet-batadv.c index d871030d59..665b18ad76 100644 --- a/epan/dissectors/packet-batadv.c +++ b/epan/dissectors/packet-batadv.c @@ -368,6 +368,8 @@ static int hf_batadv_batman_version = -1; static int hf_batadv_batman_flags = -1; static int hf_batadv_batman_ttl = -1; static int hf_batadv_batman_gwflags = -1; +static int hf_batadv_batman_gwflags_dl_speed = -1; +static int hf_batadv_batman_gwflags_ul_speed = -1; static int hf_batadv_batman_tq = -1; static int hf_batadv_batman_seqno = -1; static int hf_batadv_batman_seqno32 = -1; @@ -393,6 +395,9 @@ static int hf_batadv_icmp_ttl = -1; static int hf_batadv_icmp_uid = -1; static int hf_batadv_icmp_seqno = -1; +static int hf_batadv_icmp_rr_pointer = -1; +static int hf_batadv_icmp_rr_ether = -1; + static int hf_batadv_unicast_version = -1; static int hf_batadv_unicast_dst = -1; static int hf_batadv_unicast_ttl = -1; @@ -706,9 +711,8 @@ static void dissect_batadv_gwflags(tvbuff_t *tvb, guint8 gwflags, int offset, pr } gwflags_tree = proto_item_add_subtree(tgw, ett_batadv_batman_gwflags); - proto_tree_add_text(gwflags_tree, tvb, offset, 1, "Download Speed: %dkbit", down); - proto_tree_add_text(gwflags_tree, tvb, offset, 1, "Upload Speed: %dkbit", up); - + proto_tree_add_uint_format_value(gwflags_tree, hf_batadv_batman_gwflags_dl_speed, tvb, offset, 1, down, "%dkbit", down); + proto_tree_add_uint_format_value(gwflags_tree, hf_batadv_batman_gwflags_ul_speed, tvb, offset, 1, up, "%dkbit", up); } static int dissect_batadv_batman_v5(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) @@ -1753,13 +1757,13 @@ dissect_batadv_icmp_rr(proto_tree *batadv_icmp_tree, tvbuff_t *tvb, int offset) field_tree = proto_tree_add_subtree(batadv_icmp_tree, tvb, offset, 1+ 6 * BAT_RR_LEN, ett_batadv_icmp_rr, NULL, "ICMP RR"); - proto_tree_add_text(field_tree, tvb, offset, 1, "Pointer: %d", ptr); + proto_tree_add_item(field_tree, hf_batadv_icmp_rr_pointer, tvb, offset, 1, ENC_NA); ptr--; offset++; for (i = 0; i < BAT_RR_LEN; i++) { - proto_tree_add_text(field_tree, tvb, offset, 6, "%s%s", - (i > ptr) ? "-" : tvb_ether_to_str(tvb, offset), + proto_tree_add_ether_format(field_tree, hf_batadv_icmp_rr_ether, tvb, offset, 6, tvb_get_ptr(tvb, offset, 6), + "%s%s", (i > ptr) ? "-" : tvb_ether_to_str(tvb, offset), (i == ptr) ? " <- (current)" : ""); offset += 6; @@ -3188,6 +3192,16 @@ void proto_register_batadv(void) FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL } }, + { &hf_batadv_batman_gwflags_dl_speed, + { "Download Speed", "batadv.batman.gwflags.dl_speed", + FT_UINT32, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_batadv_batman_gwflags_ul_speed, + { "Upload Speed", "batadv.batman.gwflags.ul_speed", + FT_UINT32, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, { &hf_batadv_batman_tq, { "Transmission Quality", "batadv.batman.tq", FT_UINT8, BASE_DEC, NULL, 0x0, @@ -3318,6 +3332,16 @@ void proto_register_batadv(void) FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL} }, + { &hf_batadv_icmp_rr_pointer, + { "Pointer", "batadv.icmp.rr_pointer", + FT_UINT16, BASE_DEC, NULL, 0x0, + NULL, HFILL} + }, + { &hf_batadv_icmp_rr_ether, + { "RR MAC", "batadv.icmp.rr_ether", + FT_ETHER, BASE_NONE, NULL, 0x0, + NULL, HFILL} + }, { &hf_batadv_unicast_version, { "Version", "batadv.unicast.version", FT_UINT8, BASE_DEC, NULL, 0x0, |