openflow_input: changed syntax for openflow input parsing of enums
diff --git a/openflow_input/standard-1.0 b/openflow_input/standard-1.0
index 938b7dd..4a73261 100644
--- a/openflow_input/standard-1.0
+++ b/openflow_input/standard-1.0
@@ -159,7 +159,7 @@
OFPFW_NW_DST_MASK = 0xfc000,
OFPFW_DL_VLAN_PCP = 0x100000,
OFPFW_NW_TOS = 0x200000,
- OFPFW_ALL = 0x3fffff,
+ OFPFW_ALL(virtual=True) = 0x3fffff,
};
enum ofp_action_type(wire_type=uint16_t) {
@@ -586,7 +586,7 @@
uint16_t priority;
uint32_t buffer_id;
of_port_no_t out_port;
- ofp_flow_mod_flags flags;
+ enum ofp_flow_mod_flags flags;
list(of_action_t) actions;
};
@@ -603,7 +603,7 @@
uint16_t priority;
uint32_t buffer_id;
of_port_no_t out_port;
- ofp_flow_mod_flags flags;
+ enum ofp_flow_mod_flags flags;
list(of_action_t) actions;
};
@@ -620,7 +620,7 @@
uint16_t priority;
uint32_t buffer_id;
of_port_no_t out_port;
- ofp_flow_mod_flags flags;
+ enum ofp_flow_mod_flags flags;
list(of_action_t) actions;
};
@@ -637,7 +637,7 @@
uint16_t priority;
uint32_t buffer_id;
of_port_no_t out_port;
- ofp_flow_mod_flags flags;
+ enum ofp_flow_mod_flags flags;
list(of_action_t) actions;
};
@@ -654,7 +654,7 @@
uint16_t priority;
uint32_t buffer_id;
of_port_no_t out_port;
- ofp_flow_mod_flags flags;
+ enum ofp_flow_mod_flags flags;
list(of_action_t) actions;
};
@@ -671,7 +671,7 @@
uint16_t priority;
uint32_t buffer_id;
of_port_no_t out_port;
- ofp_flow_mod_flags flags;
+ enum ofp_flow_mod_flags flags;
list(of_action_t) actions;
};
diff --git a/openflow_input/standard-1.1 b/openflow_input/standard-1.1
index bbf2277..9acbacf 100644
--- a/openflow_input/standard-1.1
+++ b/openflow_input/standard-1.1
@@ -856,7 +856,7 @@
uint32_t buffer_id;
of_port_no_t out_port;
uint32_t out_group;
- ofp_flow_mod_flags flags;
+ enum ofp_flow_mod_flags flags;
pad(2);
of_match_t match;
list(of_instruction_t) instructions;
@@ -877,7 +877,7 @@
uint32_t buffer_id;
of_port_no_t out_port;
uint32_t out_group;
- ofp_flow_mod_flags flags;
+ enum ofp_flow_mod_flags flags;
pad(2);
of_match_t match;
list(of_instruction_t) instructions;
@@ -898,7 +898,7 @@
uint32_t buffer_id;
of_port_no_t out_port;
uint32_t out_group;
- ofp_flow_mod_flags flags;
+ enum ofp_flow_mod_flags flags;
pad(2);
of_match_t match;
list(of_instruction_t) instructions;
@@ -919,7 +919,7 @@
uint32_t buffer_id;
of_port_no_t out_port;
uint32_t out_group;
- ofp_flow_mod_flags flags;
+ enum ofp_flow_mod_flags flags;
pad(2);
of_match_t match;
list(of_instruction_t) instructions;
@@ -940,7 +940,7 @@
uint32_t buffer_id;
of_port_no_t out_port;
uint32_t out_group;
- ofp_flow_mod_flags flags;
+ enum ofp_flow_mod_flags flags;
pad(2);
of_match_t match;
list(of_instruction_t) instructions;
@@ -961,7 +961,7 @@
uint32_t buffer_id;
of_port_no_t out_port;
uint32_t out_group;
- ofp_flow_mod_flags flags;
+ enum ofp_flow_mod_flags flags;
pad(2);
of_match_t match;
list(of_instruction_t) instructions;
diff --git a/openflow_input/standard-1.2 b/openflow_input/standard-1.2
index 703a969..9752b7d 100644
--- a/openflow_input/standard-1.2
+++ b/openflow_input/standard-1.2
@@ -772,7 +772,7 @@
uint32_t buffer_id;
of_port_no_t out_port;
uint32_t out_group;
- ofp_flow_mod_flags flags;
+ enum ofp_flow_mod_flags flags;
pad(2);
of_match_t match;
list(of_instruction_t) instructions;
@@ -793,7 +793,7 @@
uint32_t buffer_id;
of_port_no_t out_port;
uint32_t out_group;
- ofp_flow_mod_flags flags;
+ enum ofp_flow_mod_flags flags;
pad(2);
of_match_t match;
list(of_instruction_t) instructions;
@@ -814,7 +814,7 @@
uint32_t buffer_id;
of_port_no_t out_port;
uint32_t out_group;
- ofp_flow_mod_flags flags;
+ enum ofp_flow_mod_flags flags;
pad(2);
of_match_t match;
list(of_instruction_t) instructions;
@@ -835,7 +835,7 @@
uint32_t buffer_id;
of_port_no_t out_port;
uint32_t out_group;
- ofp_flow_mod_flags flags;
+ enum ofp_flow_mod_flags flags;
pad(2);
of_match_t match;
list(of_instruction_t) instructions;
@@ -856,7 +856,7 @@
uint32_t buffer_id;
of_port_no_t out_port;
uint32_t out_group;
- ofp_flow_mod_flags flags;
+ enum ofp_flow_mod_flags flags;
pad(2);
of_match_t match;
list(of_instruction_t) instructions;
@@ -877,7 +877,7 @@
uint32_t buffer_id;
of_port_no_t out_port;
uint32_t out_group;
- ofp_flow_mod_flags flags;
+ enum ofp_flow_mod_flags flags;
pad(2);
of_match_t match;
list(of_instruction_t) instructions;
diff --git a/openflow_input/standard-1.3 b/openflow_input/standard-1.3
index e0f08b6..afe371e 100644
--- a/openflow_input/standard-1.3
+++ b/openflow_input/standard-1.3
@@ -924,7 +924,7 @@
uint32_t buffer_id;
of_port_no_t out_port;
uint32_t out_group;
- ofp_flow_mod_flags flags;
+ enum ofp_flow_mod_flags flags;
pad(2);
of_match_t match;
list(of_instruction_t) instructions;
@@ -945,7 +945,7 @@
uint32_t buffer_id;
of_port_no_t out_port;
uint32_t out_group;
- ofp_flow_mod_flags flags;
+ enum ofp_flow_mod_flags flags;
pad(2);
of_match_t match;
list(of_instruction_t) instructions;
@@ -966,7 +966,7 @@
uint32_t buffer_id;
of_port_no_t out_port;
uint32_t out_group;
- ofp_flow_mod_flags flags;
+ enum ofp_flow_mod_flags flags;
pad(2);
of_match_t match;
list(of_instruction_t) instructions;
@@ -987,7 +987,7 @@
uint32_t buffer_id;
of_port_no_t out_port;
uint32_t out_group;
- ofp_flow_mod_flags flags;
+ enum ofp_flow_mod_flags flags;
pad(2);
of_match_t match;
list(of_instruction_t) instructions;
@@ -1008,7 +1008,7 @@
uint32_t buffer_id;
of_port_no_t out_port;
uint32_t out_group;
- ofp_flow_mod_flags flags;
+ enum ofp_flow_mod_flags flags;
pad(2);
of_match_t match;
list(of_instruction_t) instructions;
@@ -1029,7 +1029,7 @@
uint32_t buffer_id;
of_port_no_t out_port;
uint32_t out_group;
- ofp_flow_mod_flags flags;
+ enum ofp_flow_mod_flags flags;
pad(2);
of_match_t match;
list(of_instruction_t) instructions;