diff options
| author | Hiroaki KAWAI <hiroaki.kawai@gmail.com> | 2015-06-11 18:17:55 +0900 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-06-15 11:00:35 +0000 |
| commit | 960d310e52fbcf4b4bbb34c9030f62dc8ebd3009 (patch) | |
| tree | c2cfc21ade4a088b3fcff4d4e81dba62a1bffa86 /epan/dissectors/packet-openflow_v4.c | |
| parent | c11a912b6ff39f45eae3b3b8075e87b5c96d1a20 (diff) | |
openflow_v4: oxm_length includes experimenter
As defined in section 7.2.3.10 "Experimenter
Flow Match Fields" of openflow-switch v1.3.5 spec.
Change-Id: I7268f614417720f225a22b226c8f21603b7f2d0f
Reviewed-on: https://code.wireshark.org/review/8882
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-openflow_v4.c')
| -rw-r--r-- | epan/dissectors/packet-openflow_v4.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/epan/dissectors/packet-openflow_v4.c b/epan/dissectors/packet-openflow_v4.c index a6b1293628..ed31f0f633 100644 --- a/epan/dissectors/packet-openflow_v4.c +++ b/epan/dissectors/packet-openflow_v4.c @@ -1106,6 +1106,9 @@ dissect_openflow_oxm_v4(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, } } else { + if (oxm_class == OFPXMC_EXPERIMENTER) { + oxm_length -= 4; /* oxm_length includes experimenter field */ + } proto_tree_add_expert_format(oxm_tree, pinfo, &ei_openflow_v4_oxm_undecoded, tvb, offset, oxm_length, "Unknown OXM body."); offset+=oxm_length; |