From 9965f29399a31ff475cd03718bf0a5a2a3bbe3a6 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Mon, 18 Nov 2013 07:54:48 +0000 Subject: [PATCH] You don't get to have three separate protocols all with the name "OpenFlow 1.3". svn path=/trunk/; revision=53408 --- epan/dissectors/packet-openflow_v4.c | 4 ++-- epan/dissectors/packet-openflow_v5.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epan/dissectors/packet-openflow_v4.c b/epan/dissectors/packet-openflow_v4.c index d95f93d828..f595ac2e59 100644 --- a/epan/dissectors/packet-openflow_v4.c +++ b/epan/dissectors/packet-openflow_v4.c @@ -730,7 +730,7 @@ static expert_field ei_openflow_v4_queue_prop_undecoded = EI_INIT; static expert_field ei_openflow_v4_message_undecoded = EI_INIT; static const value_string openflow_v4_version_values[] = { - { 0x04, "1.3" }, + { 0x04, "1.4" }, { 0, NULL } }; @@ -7870,7 +7870,7 @@ proto_register_openflow_v4(void) expert_module_t *expert_openflow_v4; /* Register the protocol name and description */ - proto_openflow_v4 = proto_register_protocol("OpenFlow 1.3", + proto_openflow_v4 = proto_register_protocol("OpenFlow 1.4", "openflow_v4", "openflow_v4"); new_register_dissector("openflow_v4", dissect_openflow_v4, proto_openflow_v4); diff --git a/epan/dissectors/packet-openflow_v5.c b/epan/dissectors/packet-openflow_v5.c index e62d828465..41e572ac63 100644 --- a/epan/dissectors/packet-openflow_v5.c +++ b/epan/dissectors/packet-openflow_v5.c @@ -8149,7 +8149,7 @@ proto_register_openflow_v5(void) expert_module_t *expert_openflow_v5; /* Register the protocol name and description */ - proto_openflow_v5 = proto_register_protocol("OpenFlow 1.3", + proto_openflow_v5 = proto_register_protocol("OpenFlow 1.5", "openflow_v5", "openflow_v5"); new_register_dissector("openflow_v5", dissect_openflow_v5, proto_openflow_v5);