aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2014-11-25 13:49:12 -0500
committerAnders Broman <a.broman58@gmail.com>2014-11-26 07:55:54 +0000
commit7c475037e4b58d75a513f206896db1885cdb9ada (patch)
treea96ea913a9ebc2b38a6df8659d5ed09949ad6b06 /epan
parent5464bc69ae714168e8db55a01618822eb3a90cb8 (diff)
openflow: Use (what appear to be the) correct filter names for a few fields.
Change-Id: I2acd93d99942601b34c85177d21bbc2c4a4e2633 Reviewed-on: https://code.wireshark.org/review/5492 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-openflow_v1.c8
-rw-r--r--epan/dissectors/packet-openflow_v4.c8
-rw-r--r--epan/dissectors/packet-openflow_v5.c8
3 files changed, 12 insertions, 12 deletions
diff --git a/epan/dissectors/packet-openflow_v1.c b/epan/dissectors/packet-openflow_v1.c
index e344cfdb39..df58342cb1 100644
--- a/epan/dissectors/packet-openflow_v1.c
+++ b/epan/dissectors/packet-openflow_v1.c
@@ -969,7 +969,7 @@ proto_register_openflow_v1(void)
NULL, HFILL }
},
{ &hf_openflow_port_name,
- { "Name", "openflow.hw_add",
+ { "Port Name", "openflow.port_name",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
@@ -1019,7 +1019,7 @@ proto_register_openflow_v1(void)
NULL, HFILL }
},
{ &hf_openflow_no_recv_stp,
- { "Drop received 802.1D STP packets", "openflow.no_recv",
+ { "Drop received 802.1D STP packets", "openflow.no_recv_stp",
FT_BOOLEAN, 32, NULL, OFPPC_NO_RECV_STP,
NULL, HFILL }
},
@@ -1153,7 +1153,7 @@ proto_register_openflow_v1(void)
},
#if 0
{ &hf_openflow_cookie_mask,
- { "Cookie mask", "openflow.cookie",
+ { "Cookie mask", "openflow.cookie_mask",
FT_UINT64, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
@@ -1204,7 +1204,7 @@ proto_register_openflow_v1(void)
NULL, HFILL }
},
{ &hf_openflow_eth_dst,
- { "Ethernet destination address", "openflow.eth_src",
+ { "Ethernet destination address", "openflow.eth_dst",
FT_ETHER, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
diff --git a/epan/dissectors/packet-openflow_v4.c b/epan/dissectors/packet-openflow_v4.c
index e946f61e42..7c1b43ee15 100644
--- a/epan/dissectors/packet-openflow_v4.c
+++ b/epan/dissectors/packet-openflow_v4.c
@@ -4781,17 +4781,17 @@ proto_register_openflow_v4(void)
NULL, HFILL }
},
{ &hf_openflow_v4_oxm_mask_etheraddr,
- { "Mask", "openflow_v4.oxm.value",
+ { "Mask", "openflow_v4.oxm.ether_mask",
FT_ETHER, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_openflow_v4_oxm_mask_ipv4addr,
- { "Mask", "openflow_v4.oxm.value",
+ { "Mask", "openflow_v4.oxm.ipv4_mask",
FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_openflow_v4_oxm_mask_ipv6addr,
- { "Mask", "openflow_v4.oxm.value",
+ { "Mask", "openflow_v4.oxm.ipv6_mask",
FT_IPv6, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
@@ -5716,7 +5716,7 @@ proto_register_openflow_v4(void)
NULL, HFILL }
},
{ &hf_openflow_v4_packet_in_reason,
- { "Reason", "openflow_v4.packet_in.buffer_id",
+ { "Reason", "openflow_v4.packet_in.reason",
FT_UINT8, BASE_DEC, VALS(openflow_v4_packet_in_reason_values), 0x0,
NULL, HFILL }
},
diff --git a/epan/dissectors/packet-openflow_v5.c b/epan/dissectors/packet-openflow_v5.c
index 8a97699df4..6b5458dfd9 100644
--- a/epan/dissectors/packet-openflow_v5.c
+++ b/epan/dissectors/packet-openflow_v5.c
@@ -6079,17 +6079,17 @@ proto_register_openflow_v5(void)
NULL, HFILL }
},
{ &hf_openflow_v5_oxm_mask_etheraddr,
- { "Mask", "openflow_v5.oxm.value",
+ { "Mask", "openflow_v5.oxm.ether_mask",
FT_ETHER, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_openflow_v5_oxm_mask_ipv4addr,
- { "Mask", "openflow_v5.oxm.value",
+ { "Mask", "openflow_v5.oxm.ipv4_mask",
FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_openflow_v5_oxm_mask_ipv6addr,
- { "Mask", "openflow_v5.oxm.value",
+ { "Mask", "openflow_v5.oxm.ipv6_mask",
FT_IPv6, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
@@ -7134,7 +7134,7 @@ proto_register_openflow_v5(void)
NULL, HFILL }
},
{ &hf_openflow_v5_packet_in_reason,
- { "Reason", "openflow_v5.packet_in.buffer_id",
+ { "Reason", "openflow_v5.packet_in.reason",
FT_UINT8, BASE_DEC, VALS(openflow_v5_packet_in_reason_values), 0x0,
NULL, HFILL }
},