aboutsummaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
authorNeale Ranns <nranns@cisco.com>2019-03-12 04:34:53 -0700
committerNeale Ranns <nranns@cisco.com>2019-03-12 15:45:25 +0000
commitfa0ac2c5668cb8f387a8e16dcf8d2d7154a09fe2 (patch)
treef44fa8ddfe3cf5a706e583904f75f9ef02d281aa /extras
parentda7f7b6164e976a97ff0afb13f488c60461402bc (diff)
GBP: contracts API fixed length of allowed ethertypes
VAPI does not handle two VLAs in one struct. Change-Id: I259c998bef4398ead2bbb9e788350d50c2f05694 Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'extras')
-rw-r--r--extras/vom/vom/gbp_contract_cmds.cpp34
1 files changed, 15 insertions, 19 deletions
diff --git a/extras/vom/vom/gbp_contract_cmds.cpp b/extras/vom/vom/gbp_contract_cmds.cpp
index 9e8a177422b..b5705347791 100644
--- a/extras/vom/vom/gbp_contract_cmds.cpp
+++ b/extras/vom/vom/gbp_contract_cmds.cpp
@@ -42,23 +42,32 @@ create_cmd::operator==(const create_cmd& other) const
(m_allowed_ethertypes == other.m_allowed_ethertypes));
}
+#define ARRAY_LEN(x) (sizeof(x) / sizeof(x[0]))
+
rc_t
create_cmd::issue(connection& con)
{
size_t n_rules = m_gbp_rules.size();
- size_t n_et_rules = 0;
+ uint32_t ii = 0;
- msg_t req(con.ctx(), n_rules, n_et_rules, std::ref(*this));
+ msg_t req(con.ctx(), n_rules, std::ref(*this));
auto& payload = req.get_request().get_payload();
payload.is_add = 1;
payload.contract.acl_index = m_acl.value();
payload.contract.sclass = m_sclass;
payload.contract.dclass = m_dclass;
-
- uint32_t ii = 0;
payload.contract.n_rules = n_rules;
+ payload.contract.n_ether_types = m_allowed_ethertypes.size();
+
+ for (auto tt : m_allowed_ethertypes) {
+ payload.contract.allowed_ethertypes[ii] = tt.value();
+ ii++;
+ if (ii == ARRAY_LEN(payload.contract.allowed_ethertypes))
+ break;
+ }
+ ii = 0;
for (auto rule : m_gbp_rules) {
if (rule.action() == gbp_rule::action_t::REDIRECT)
payload.contract.rules[ii].action = GBP_API_RULE_REDIRECT;
@@ -88,19 +97,6 @@ create_cmd::issue(connection& con)
++ii;
}
- u8* data;
- u16* et;
-
- data = (((u8*)&payload.contract.n_ether_types) +
- (sizeof(payload.contract.rules[0]) * payload.contract.n_rules));
- *data = m_allowed_ethertypes.size();
- et = (u16*)(++data);
- ii = 0;
- for (auto tt : m_allowed_ethertypes) {
- et[ii] = tt.value();
- ii++;
- }
-
VAPI_CALL(req.execute());
return (wait());
@@ -136,7 +132,7 @@ delete_cmd::operator==(const delete_cmd& other) const
rc_t
delete_cmd::issue(connection& con)
{
- msg_t req(con.ctx(), 0, 0, std::ref(*this));
+ msg_t req(con.ctx(), 0, std::ref(*this));
auto& payload = req.get_request().get_payload();
payload.is_add = 0;
@@ -154,7 +150,7 @@ delete_cmd::to_string() const
{
std::ostringstream s;
s << "gbp-contract-delete: " << m_hw_item.to_string()
- << " src-epg-id:" << m_sclass << " dst-epg-id:" << m_dclass;
+ << " sclass:" << m_sclass << " dclass:" << m_dclass;
return (s.str());
}