loci: miscellaneous changes for OF 1.4
diff --git a/c_gen/match.py b/c_gen/match.py
index 7b7dcce..d6b43fa 100644
--- a/c_gen/match.py
+++ b/c_gen/match.py
@@ -131,6 +131,7 @@
2: of_v2_keys,
3: [],
4: [],
+ 5: [],
}
# Complete list of match keys, sorted by the standard order
diff --git a/c_gen/of_g_legacy.py b/c_gen/of_g_legacy.py
index 2372b31..401c89d 100644
--- a/c_gen/of_g_legacy.py
+++ b/c_gen/of_g_legacy.py
@@ -111,6 +111,7 @@
2: "uint32_t",
3: "uint32_t",
4: "uint32_t",
+ 5: "uint32_t",
"short_name":"port_no"
},
of_port_desc_t = {
@@ -118,6 +119,7 @@
2: "of_port_desc_t",
3: "of_port_desc_t",
4: "of_port_desc_t",
+ 5: "of_port_desc_t",
"short_name":"port_desc"
},
of_bsn_vport_t = {
@@ -125,6 +127,7 @@
2: "of_bsn_vport_t",
3: "of_bsn_vport_t",
4: "of_bsn_vport_t",
+ 5: "of_bsn_vport_t",
"short_name":"bsn_vport"
},
of_fm_cmd_t = { # Flow mod command went from u16 to u8
@@ -132,6 +135,7 @@
2: "uint8_t",
3: "uint8_t",
4: "uint8_t",
+ 5: "uint8_t",
"short_name":"fm_cmd"
},
of_wc_bmap_t = { # Wildcard bitmap
@@ -139,6 +143,7 @@
2: "uint32_t",
3: "uint64_t",
4: "uint64_t",
+ 5: "uint64_t",
"short_name":"wc_bmap"
},
of_match_bmap_t = { # Match bitmap
@@ -146,6 +151,7 @@
2: "uint32_t",
3: "uint64_t",
4: "uint64_t",
+ 5: "uint64_t",
"short_name":"match_bmap"
},
of_match_t = { # Match object
@@ -153,6 +159,7 @@
2: "of_match_v2_t",
3: "of_match_v3_t",
4: "of_match_v3_t", # Currently uses same match as 1.2 (v3).
+ 5: "of_match_v3_t", # Currently uses same match as 1.2 (v3).
"short_name":"match"
},
)
@@ -270,6 +277,7 @@
extra_length = {
("of_packet_in", 3): 2,
("of_packet_in", 4): 2,
+ ("of_packet_in", 5): 2,
}
## Boolean indication of variable length, per class, wire_version,
diff --git a/c_gen/templates/loci_int.h b/c_gen/templates/loci_int.h
index 1ea9eeb..9907349 100644
--- a/c_gen/templates/loci_int.h
+++ b/c_gen/templates/loci_int.h
@@ -30,6 +30,8 @@
:: flow_mod = of_g.base_length[("of_flow_modify",of_g.VERSION_1_2)]
:: packet_in = of_g.base_length[("of_packet_in",of_g.VERSION_1_2)]
:: packet_in_1_3 = of_g.base_length[("of_packet_in",of_g.VERSION_1_3)]
+:: packet_in_1_4 = of_g.base_length[("of_packet_in",of_g.VERSION_1_4)]
+:: assert packet_in_1_3 == packet_in_1_4
:: flow_stats = of_g.base_length[("of_flow_stats_entry", of_g.VERSION_1_2)]
:: match1 = of_g.base_length[("of_match_v1",of_g.VERSION_1_0)]
:: match2 = of_g.base_length[("of_match_v2",of_g.VERSION_1_1)]
diff --git a/c_gen/templates/loci_validator.c b/c_gen/templates/loci_validator.c
index 1f98b21..c4e8b5c 100644
--- a/c_gen/templates/loci_validator.c
+++ b/c_gen/templates/loci_validator.c
@@ -199,7 +199,7 @@
return ${validator_name(proto.class_by_name('of_header'))}(msg, len, &out_len);
:: #endfor
default:
- VALIDATOR_LOG("Bad version %d", OF_VERSION_1_3);
+ VALIDATOR_LOG("Bad version %d", version);
return -1;
}
}