From b2c971d9ce911c2835b7c7fd37005cad3fe6d7a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Caama=C3=B1o=20Ruiz?= Date: Wed, 11 Apr 2018 13:29:52 +0200 Subject: openflow: fix decode of experimenter OXM fields MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No longer report decoded experimenter values as undecoded which was causing incorrect offset handling. Change-Id: If902f8c8c5b53b8062e88229d67728bb67557062 Signed-off-by: Jaime Caamaño Ruiz Reviewed-on: https://code.wireshark.org/review/26888 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- epan/dissectors/packet-openflow_v6.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'epan/dissectors/packet-openflow_v6.c') diff --git a/epan/dissectors/packet-openflow_v6.c b/epan/dissectors/packet-openflow_v6.c index a7be077033..3ea3a408fe 100644 --- a/epan/dissectors/packet-openflow_v6.c +++ b/epan/dissectors/packet-openflow_v6.c @@ -1104,7 +1104,6 @@ static int dissect_openflow_oxm_header_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset, guint16 length _U_) { guint16 oxm_class; - guint8 oxm_length; /* oxm_class */ oxm_class = tvb_get_ntohs(tvb, offset); @@ -1123,18 +1122,9 @@ dissect_openflow_oxm_header_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree offset+=1; /* oxm_length */ - oxm_length = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_openflow_v6_oxm_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset+=1; - if (oxm_class == OFPXMC_EXPERIMENTER) { - /* uint32_t experimenter; */ - proto_tree_add_item(tree, hf_openflow_v6_oxm_experimenter_experimenter, tvb, offset, 4, ENC_BIG_ENDIAN); - offset+=4; - proto_tree_add_item(tree, hf_openflow_v6_oxm_experimenter_value, tvb, offset, oxm_length - 4, ENC_NA); - offset+=(oxm_length - 4); - } - return offset; } @@ -1271,6 +1261,12 @@ dissect_openflow_oxm_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, offset = oxm_end; } + } else if (oxm_class == OFPXMC_EXPERIMENTER) { + /* uint32_t experimenter; */ + proto_tree_add_item(oxm_tree, hf_openflow_v6_oxm_experimenter_experimenter, tvb, offset, 4, ENC_BIG_ENDIAN); + offset+=4; + proto_tree_add_item(oxm_tree, hf_openflow_v6_oxm_experimenter_value, tvb, offset, oxm_length - 4, ENC_NA); + offset+=(oxm_length - 4); } else { proto_tree_add_expert_format(oxm_tree, pinfo, &ei_openflow_v6_oxm_undecoded, tvb, offset, oxm_length, "Unknown OXM body."); -- cgit v1.2.3