changed order of sigtype and sigid
Conflicts:
java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchField.java
java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchFields.java
java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/CircuitSignalID.java
diff --git a/openflow_input/circuit b/openflow_input/circuit
index 01a1432..0f436a4 100644
--- a/openflow_input/circuit
+++ b/openflow_input/circuit
@@ -114,7 +114,6 @@
list(of_port_optical_t) entries;
};
-
struct of_port_optical {
of_port_no_t port_no;
uint16_t length;
@@ -132,9 +131,33 @@
uint16_t length;
uint8_t port_signal_type;
uint8_t reserved;
- pad(2);
+ pad(1);
+ uint8_t port_type;
};
+struct of_circuit_port_status : of_experimenter {
+ uint8_t version;
+ uint8_t type == 4;
+ uint16_t length;
+ uint32_t xid;
+ uint32_t experimenter == 0x748771;
+ uint32_t exp_type == 12;
+ enum ofp_port_reason reason;
+ pad(7);
+ of_port_no_t port_no;
+ uint16_t lengths;
+ pad(2);
+ of_mac_addr_t hw_addr;
+ pad(2);
+ of_port_name_t name;
+ enum ofp_port_config config;
+ enum ofp_port_state state;
+ uint64_t ignore;
+};
+
+
+
+
struct of_port_optical_transport_application_code
{
uint16_t feature_type;