Merge into master from pull request #191:
Add DHCP pkt in reason and circuit id TLV (https://github.com/floodlight/loxigen/pull/191)
diff --git a/c_gen/templates/loci_show.h b/c_gen/templates/loci_show.h
index f5b80f2..635c41e 100644
--- a/c_gen/templates/loci_show.h
+++ b/c_gen/templates/loci_show.h
@@ -198,6 +198,7 @@
#define LOCI_SHOW_desc_str_dp_desc(writer, cookie, val) LOCI_SHOW_desc_str(writer, cookie, val)
#define LOCI_SHOW_desc_str_pipeline(writer, cookie, val) LOCI_SHOW_desc_str(writer, cookie, val)
#define LOCI_SHOW_octets_data(writer, cookie, val) LOCI_SHOW_octets(writer, cookie, val)
+#define LOCI_SHOW_octets_value(writer, cookie, val) LOCI_SHOW_octets(writer, cookie, val)
#define LOCI_SHOW_u16_err_type(writer, cookie, val) LOCI_SHOW_u16(writer, cookie, val)
#define LOCI_SHOW_u16_code(writer, cookie, val) LOCI_SHOW_u16(writer, cookie, val)
#define LOCI_SHOW_u64_datapath_id(writer, cookie, val) LOCI_SHOW_x64(writer, cookie, val)
diff --git a/openflow_input/bsn_tlv b/openflow_input/bsn_tlv
index ec91065..6105687 100644
--- a/openflow_input/bsn_tlv
+++ b/openflow_input/bsn_tlv
@@ -112,3 +112,9 @@
uint16_t length;
uint64_t value;
};
+
+struct of_bsn_tlv_circuit_id : of_bsn_tlv {
+ uint16_t type == 14;
+ uint16_t length;
+ of_octets_t value;
+};
diff --git a/openflow_input/standard-1.3 b/openflow_input/standard-1.3
index bb85231..af7e501 100644
--- a/openflow_input/standard-1.3
+++ b/openflow_input/standard-1.3
@@ -291,6 +291,7 @@
OFPR_BSN_DEST_PORT_UNREACHABLE = 136,
OFPR_BSN_FRAGMENTATION_REQUIRED = 137,
OFPR_BSN_ARP = 139,
+ OFPR_BSN_DHCP = 140,
};
enum ofp_flow_removed_reason(wire_type=uint8_t) {