From 906eb9afa06ccf51aa7eadf78e33cb884a4b60cb Mon Sep 17 00:00:00 2001 From: Sylvain Baubeau Date: Fri, 28 Dec 2018 22:55:02 +0100 Subject: [PATCH 1/2] Make ofp_type complete --- openflow_input/standard-1.0 | 2 +- openflow_input/standard-1.1 | 2 +- openflow_input/standard-1.2 | 2 +- openflow_input/standard-1.3 | 2 +- openflow_input/standard-1.4 | 2 +- openflow_input/standard-1.5 | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/openflow_input/standard-1.0 b/openflow_input/standard-1.0 index 1bba411a5..61e5b9014 100644 --- a/openflow_input/standard-1.0 +++ b/openflow_input/standard-1.0 @@ -61,7 +61,7 @@ enum macro_definitions { OFPQ_MIN_RATE_UNCFG = 0xffff, }; -enum ofp_type(wire_type=uint8_t) { +enum ofp_type(wire_type=uint8_t, complete=True) { OFPT_HELLO = 0, OFPT_ERROR = 1, OFPT_ECHO_REQUEST = 2, diff --git a/openflow_input/standard-1.1 b/openflow_input/standard-1.1 index 07f246e26..96167227d 100644 --- a/openflow_input/standard-1.1 +++ b/openflow_input/standard-1.1 @@ -75,7 +75,7 @@ enum ofp_port(wire_type=uint32_t) { OFPP_ANY = 0xffffffff, }; -enum ofp_type(wire_type=uint8_t) { +enum ofp_type(wire_type=uint8_t, complete=True) { OFPT_HELLO = 0, OFPT_ERROR = 1, OFPT_ECHO_REQUEST = 2, diff --git a/openflow_input/standard-1.2 b/openflow_input/standard-1.2 index 9141f223c..7742dbe20 100644 --- a/openflow_input/standard-1.2 +++ b/openflow_input/standard-1.2 @@ -71,7 +71,7 @@ enum ofp_port(wire_type=uint32_t) { OFPP_ANY = 0xffffffff, }; -enum ofp_type(wire_type=uint8_t) { +enum ofp_type(wire_type=uint8_t, complete=True) { OFPT_HELLO = 0, OFPT_ERROR = 1, OFPT_ECHO_REQUEST = 2, diff --git a/openflow_input/standard-1.3 b/openflow_input/standard-1.3 index 061f9ce6d..ebdf665dc 100644 --- a/openflow_input/standard-1.3 +++ b/openflow_input/standard-1.3 @@ -70,7 +70,7 @@ enum ofp_port(wire_type=uint32_t) { OFPP_ANY = 0xffffffff, }; -enum ofp_type(wire_type=uint8_t) { +enum ofp_type(wire_type=uint8_t, complete=True) { OFPT_HELLO = 0, OFPT_ERROR = 1, OFPT_ECHO_REQUEST = 2, diff --git a/openflow_input/standard-1.4 b/openflow_input/standard-1.4 index 51a1a1906..dbf2f6243 100644 --- a/openflow_input/standard-1.4 +++ b/openflow_input/standard-1.4 @@ -70,7 +70,7 @@ enum ofp_port(wire_type=uint32_t) { OFPP_ANY = 0xffffffff, }; -enum ofp_type(wire_type=uint8_t) { +enum ofp_type(wire_type=uint8_t, complete=True) { OFPT_HELLO = 0, OFPT_ERROR = 1, OFPT_ECHO_REQUEST = 2, diff --git a/openflow_input/standard-1.5 b/openflow_input/standard-1.5 index a875c5ad7..1a5dfaedd 100644 --- a/openflow_input/standard-1.5 +++ b/openflow_input/standard-1.5 @@ -46,7 +46,7 @@ struct of_uint8 { /* ------------------------------------------- HEADER ------------------------------------- */ /* Type for header */ -enum ofp_type(wire_type=uint8_t) { +enum ofp_type(wire_type=uint8_t, complete=True) { OFPT_HELLO = 0, OFPT_ERROR = 1, OFPT_ECHO_REQUEST = 2, From a5284a45b64d76d6411199d3cabc2f8be47ba724 Mon Sep 17 00:00:00 2001 From: Sylvain Baubeau Date: Mon, 7 Jan 2019 22:36:02 +0100 Subject: [PATCH 2/2] Add group type enum --- openflow_input/standard-1.1 | 2 +- openflow_input/standard-1.2 | 2 +- openflow_input/standard-1.3 | 2 +- openflow_input/standard-1.4 | 2 +- openflow_input/standard-1.5 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/openflow_input/standard-1.1 b/openflow_input/standard-1.1 index 96167227d..235ee2f53 100644 --- a/openflow_input/standard-1.1 +++ b/openflow_input/standard-1.1 @@ -257,7 +257,7 @@ enum ofp_group(wire_type=uint32_t, complete=False) { OFPG_ANY = 0xffffffff, }; -enum ofp_group_type(wire_type=uint8_t) { +enum ofp_group_type(wire_type=uint8_t, complete=True) { OFPGT_ALL = 0, OFPGT_SELECT = 1, OFPGT_INDIRECT = 2, diff --git a/openflow_input/standard-1.2 b/openflow_input/standard-1.2 index 7742dbe20..1ab42b85d 100644 --- a/openflow_input/standard-1.2 +++ b/openflow_input/standard-1.2 @@ -244,7 +244,7 @@ enum ofp_group_mod_command(wire_type=uint16_t) { OFPGC_DELETE = 2, }; -enum ofp_group_type(wire_type=uint8_t) { +enum ofp_group_type(wire_type=uint8_t, complete=True) { OFPGT_ALL = 0, OFPGT_SELECT = 1, OFPGT_INDIRECT = 2, diff --git a/openflow_input/standard-1.3 b/openflow_input/standard-1.3 index ebdf665dc..3cf4bf8f4 100644 --- a/openflow_input/standard-1.3 +++ b/openflow_input/standard-1.3 @@ -267,7 +267,7 @@ enum ofp_group_mod_command(wire_type=uint16_t) { OFPGC_DELETE = 2, }; -enum ofp_group_type(wire_type=uint8_t) { +enum ofp_group_type(wire_type=uint8_t, complete=True) { OFPGT_ALL = 0, OFPGT_SELECT = 1, OFPGT_INDIRECT = 2, diff --git a/openflow_input/standard-1.4 b/openflow_input/standard-1.4 index dbf2f6243..ada1156e9 100644 --- a/openflow_input/standard-1.4 +++ b/openflow_input/standard-1.4 @@ -272,7 +272,7 @@ enum ofp_group_mod_command(wire_type=uint16_t) { OFPGC_DELETE = 2, }; -enum ofp_group_type(wire_type=uint8_t) { +enum ofp_group_type(wire_type=uint8_t, complete=True) { OFPGT_ALL = 0, OFPGT_SELECT = 1, OFPGT_INDIRECT = 2, diff --git a/openflow_input/standard-1.5 b/openflow_input/standard-1.5 index 1a5dfaedd..dc122dad8 100644 --- a/openflow_input/standard-1.5 +++ b/openflow_input/standard-1.5 @@ -748,7 +748,7 @@ enum ofp_group_mod_command(wire_type=uint16_t) { }; /* Group types */ -enum ofp_group_type(wire_type=uint8_t) { +enum ofp_group_type(wire_type=uint8_t, complete=True) { OFPGT_ALL = 0, OFPGT_SELECT = 1, OFPGT_INDIRECT = 2,