diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-11-02 09:47:48 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-11-02 14:06:31 +0000 |
| commit | 35e4233314f93ffa283cc4b6b050d7a59ca9f062 (patch) | |
| tree | ab0a82bef80649fca565a80104d18bfcc281b671 /epan/dissectors/packet-openflow_v4.c | |
| parent | 23eac7dc6921e042d6eb005b10c399380146736f (diff) | |
Openflow (v4/v5): Add vOXM vlan mask field
Bug: 12979
Change-Id: I7f0e806081704dfeaf40ce1e4e41271ffd5e3023
Reviewed-on: https://code.wireshark.org/review/18618
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-openflow_v4.c')
| -rw-r--r-- | epan/dissectors/packet-openflow_v4.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/epan/dissectors/packet-openflow_v4.c b/epan/dissectors/packet-openflow_v4.c index c621115d4f..f5e8d7f4c2 100644 --- a/epan/dissectors/packet-openflow_v4.c +++ b/epan/dissectors/packet-openflow_v4.c @@ -62,6 +62,7 @@ static int hf_openflow_v4_oxm_mask = -1; static int hf_openflow_v4_oxm_mask_etheraddr = -1; static int hf_openflow_v4_oxm_mask_ipv4addr = -1; static int hf_openflow_v4_oxm_mask_ipv6addr = -1; +static int hf_openflow_v4_oxm_mask_vlan = -1; static int hf_openflow_v4_match_type = -1; static int hf_openflow_v4_match_length = -1; static int hf_openflow_v4_match_pad = -1; @@ -1043,6 +1044,10 @@ dissect_openflow_oxm_v4(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_tree_add_item(oxm_tree, hf_openflow_v4_oxm_value_vlan_present, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(oxm_tree, hf_openflow_v4_oxm_value_vlan_vid, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; + if (oxm_hm) { + proto_tree_add_item(oxm_tree, hf_openflow_v4_oxm_mask_vlan, tvb, offset, 2, ENC_NA); + offset+=2; + } break; case OFPXMT_OFB_IP_PROTO: @@ -4807,6 +4812,11 @@ proto_register_openflow_v4(void) FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL } }, + { &hf_openflow_v4_oxm_mask_vlan, + { "Mask", "openflow_v4.oxm.vlan_mask", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, { &hf_openflow_v4_match_type, { "Type", "openflow_v4.match.type", FT_UINT16, BASE_DEC, VALS(openflow_v4_match_type_values), 0x0, |