diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-05-18 17:07:24 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-05-19 22:49:00 +0000 |
| commit | 18bc1cf4ae31e32d0babd6c12cdd8a25c698f180 (patch) | |
| tree | 49c7a4a99afcf97549311213b1c32286f4776f43 /epan/dissectors/packet-openflow_v6.c | |
| parent | 6bc71e4d0a205607496c1ecb7a0dc584fe4382e2 (diff) | |
Openflow(v6): enhance display of Port and Port Description
Change-Id: I6252989f5f57d68049da825da194e0443b91ae09
Reviewed-on: https://code.wireshark.org/review/21702
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-openflow_v6.c')
| -rw-r--r-- | epan/dissectors/packet-openflow_v6.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/epan/dissectors/packet-openflow_v6.c b/epan/dissectors/packet-openflow_v6.c index 72bbf19dab..6c11e1c56d 100644 --- a/epan/dissectors/packet-openflow_v6.c +++ b/epan/dissectors/packet-openflow_v6.c @@ -30,6 +30,7 @@ #include <epan/etypes.h> #include <epan/expert.h> #include <epan/ipproto.h> +#include <epan/addr_resolv.h> void proto_register_openflow_v6(void); void proto_reg_handoff_openflow_v6(void); @@ -2536,6 +2537,7 @@ dissect_openflow_port_desc_prop_ethernet_v6(tvbuff_t *tvb, packet_info *pinfo _U /* uint32_t curr_speed; */ proto_tree_add_item(tree, hf_openflow_v6_port_desc_prop_ethernet_curr_speed, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_item_append_text(tree, " Speed: %u Mb", tvb_get_ntohl(tvb, offset)/1000); offset+=4; /* uint32_t max_speed; */ @@ -2707,6 +2709,7 @@ dissect_openflow_port_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree /* uint8_t hw_addr[OFP_ETH_ALEN]; */ proto_tree_add_item(port_tree, hf_openflow_v6_port_hw_addr, tvb, offset, OFP_ETH_ALEN, ENC_NA); + proto_item_append_text(port_tree, ": %s", tvb_ether_to_str(tvb, offset)); offset+=OFP_ETH_ALEN; /* uint8_t pad2[2]; */ @@ -2715,6 +2718,8 @@ dissect_openflow_port_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree /* char name[OFP_MAX_PORT_NAME_LEN]; Null-terminated */ proto_tree_add_item(port_tree, hf_openflow_v6_port_name, tvb, offset, OFP_MAX_PORT_NAME_LEN, ENC_ASCII|ENC_NA); + + proto_item_append_text(port_tree, " (%s)", tvb_get_string_enc(wmem_packet_scope(), tvb, offset, OFP_ETH_ALEN, ENC_ASCII)); offset+=OFP_MAX_PORT_NAME_LEN; /* uint32_t config; */ |