diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-02-03 07:21:21 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-02-03 14:47:10 +0000 |
| commit | ca13f64162b7c29509eb3e11deed755c82e67d1c (patch) | |
| tree | 6f38fa182deb86a213486e73d90ab0ac3c9e6d18 | |
| parent | a3f23d9a1087fdc068e61a4a1881277e55ce69b4 (diff) | |
OpenFlow (v1): fix exists multiple times with NOT compatible types
'openflow.ofp_match.pad' exists multiple times with NOT compatible types: FT_UINT16 and FT_BYTES
Change-Id: I514bdf6a77ddbf9f8d7e614ea6f4ecf04a664453
Reviewed-on: https://code.wireshark.org/review/13677
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-openflow_v1.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/epan/dissectors/packet-openflow_v1.c b/epan/dissectors/packet-openflow_v1.c index be29ebc3f8..32929defe0 100644 --- a/epan/dissectors/packet-openflow_v1.c +++ b/epan/dissectors/packet-openflow_v1.c @@ -132,7 +132,6 @@ static int hf_openflow_ofp_match_pad = -1; static int hf_openflow_match_dl_type = -1; static int hf_openflow_ofp_match_tos = -1; static int hf_openflow_ofp_match_nw_proto = -1; -static int hf_openflow_match_pad = -1; static int hf_openflow_ofp_source_addr = -1; static int hf_openflow_ofp_dest_addr = -1; static int hf_openflow_ofp_source_port = -1; @@ -334,7 +333,7 @@ dissect_openflow_ofp_match_v1(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree proto_tree_add_item(tree, hf_openflow_ofp_match_nw_proto, tvb, offset, 1, ENC_NA); offset++; /* uint8_t pad2[2]; Align to 64-bits */ - proto_tree_add_item(tree, hf_openflow_match_pad, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_openflow_ofp_match_pad, tvb, offset, 2, ENC_NA); offset += 2; /* uint32_t nw_src; IP source address. */ proto_tree_add_item(tree, hf_openflow_ofp_source_addr, tvb, offset, 4, ENC_NA); @@ -1364,11 +1363,6 @@ proto_register_openflow_v1(void) FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, - { &hf_openflow_match_pad, - { "Pad", "openflow.ofp_match.pad", - FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, { &hf_openflow_ofp_source_addr, { "Source Address", "openflow.ofp_match.source_addr", FT_IPv4, BASE_NONE, NULL, 0x0, |