osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

[OpenFlow] Fix a crash caused by the same filter name used for several 

different ftypes.

Change-Id: Idf4335b2ab733af74afd23bdde066bff81d13952
Reviewed-on: https://code.wireshark.org/review/11148
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
AndersBroman 2015-10-19 18:15:14 +02:00 committed by Michael Mann
parent 90c4cbef19
commit 6b128409a7
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
epan/dissectors/packet-openflow_v4.c
View File

@ -4728,52 +4728,52 @@ proto_register_openflow_v4(void)
NULL, HFILL }
},
{ &hf_openflow_v4_oxm_value_etheraddr,
{ "Value", "openflow_v4.oxm.value",
{ "Value", "openflow_v4.oxm.value_etheraddr",
FT_ETHER, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_openflow_v4_oxm_value_ethertype,
{ "Value", "openflow_v4.oxm.value",
{ "Value", "openflow_v4.oxm.value_ethertype",
FT_UINT16, BASE_HEX, VALS(etype_vals), 0x0,
NULL, HFILL }
},
{ &hf_openflow_v4_oxm_value_vlan_present,
{ "OFPVID_PRESENT", "openflow_v4.oxm.value",
{ "OFPVID_PRESENT", "openflow_v4.oxm.value_vlan_present",
FT_BOOLEAN, 16, NULL, OFPVID_PRESENT,
NULL, HFILL }
},
{ &hf_openflow_v4_oxm_value_vlan_vid,
{ "Value", "openflow_v4.oxm.value",
{ "Value", "openflow_v4.oxm.value_vlan_vid",
FT_UINT16, BASE_DEC, NULL, 0x0fff,
NULL, HFILL }
},
{ &hf_openflow_v4_oxm_value_ipv4addr,
{ "Value", "openflow_v4.oxm.value",
{ "Value", "openflow_v4.oxm.value_ipv4addr",
FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_openflow_v4_oxm_value_ipv6addr,
{ "Value", "openflow_v4.oxm.value",
{ "Value", "openflow_v4.oxm.value_ipv6addr",
FT_IPv6, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_openflow_v4_oxm_value_ipproto,
{ "Value", "openflow_v4.oxm.value",
{ "Value", "openflow_v4.oxm.value_ipproto",
FT_UINT8, BASE_DEC|BASE_EXT_STRING, &ipproto_val_ext, 0x0,
NULL, HFILL }
},
{ &hf_openflow_v4_oxm_value_uint16,
{ "Value", "openflow_v4.oxm.value",
{ "Value", "openflow_v4.oxm.value_uint16",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_openflow_v4_oxm_value_uint24,
{ "Value", "openflow_v4.oxm.value",
{ "Value", "openflow_v4.oxm.value_uint24",
FT_UINT24, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_openflow_v4_oxm_value_uint32,
{ "Value", "openflow_v4.oxm.value",
{ "Value", "openflow_v4.oxm.value_uint32",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},

20
epan/dissectors/packet-openflow_v5.c
View File

@ -6031,52 +6031,52 @@ proto_register_openflow_v5(void)
NULL, HFILL }
},
{ &hf_openflow_v5_oxm_value_etheraddr,
{ "Value", "openflow_v5.oxm.value",
{ "Value", "openflow_v5.oxm.value_etheraddr",
FT_ETHER, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_openflow_v5_oxm_value_ethertype,
{ "Value", "openflow_v5.oxm.value",
{ "Value", "openflow_v5.oxm.value_ethertype",
FT_UINT16, BASE_HEX, VALS(etype_vals), 0x0,
NULL, HFILL }
},
{ &hf_openflow_v5_oxm_value_vlan_present,
{ "OFPVID_PRESENT", "openflow_v5.oxm.value",
{ "OFPVID_PRESENT", "openflow_v5.oxm.value_vlan_present",
FT_BOOLEAN, 16, NULL, OFPVID_PRESENT,
NULL, HFILL }
},
{ &hf_openflow_v5_oxm_value_vlan_vid,
{ "Value", "openflow_v5.oxm.value",
{ "Value", "openflow_v5.oxm.value_vlan_vid",
FT_UINT16, BASE_DEC, NULL, 0x0fff,
NULL, HFILL }
},
{ &hf_openflow_v5_oxm_value_ipv4addr,
{ "Value", "openflow_v5.oxm.value",
{ "Value", "openflow_v5.oxm.value_ipv4addr",
FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_openflow_v5_oxm_value_ipv6addr,
{ "Value", "openflow_v5.oxm.value",
{ "Value", "openflow_v5.oxm.value_ipv6addr",
FT_IPv6, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_openflow_v5_oxm_value_ipproto,
{ "Value", "openflow_v5.oxm.value",
{ "Value", "openflow_v5.oxm.value_ipproto",
FT_UINT8, BASE_DEC|BASE_EXT_STRING, &ipproto_val_ext, 0x0,
NULL, HFILL }
},
{ &hf_openflow_v5_oxm_value_uint16,
{ "Value", "openflow_v5.oxm.value",
{ "Value", "openflow_v5.oxm.value_uint16",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_openflow_v5_oxm_value_uint24,
{ "Value", "openflow_v5.oxm.value",
{ "Value", "openflow_v5.oxm.value_uint24",
FT_UINT24, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_openflow_v5_oxm_value_uint32,
{ "Value", "openflow_v5.oxm.value",
{ "Value", "openflow_v5.oxm.value_uint32",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},