From aad1ee149403994194cf37cef4530b042ba7df3a Mon Sep 17 00:00:00 2001 From: Jakub Grajciar Date: Wed, 11 Mar 2020 12:47:32 +0100 Subject: acl: API cleanup Use consistent API types. Type: fix Signed-off-by: Jakub Grajciar Change-Id: If90d753f129312400c4c3669bb86289d0c3e0d99 Signed-off-by: Jakub Grajciar --- extras/vom/vom/acl_l3_list.cpp | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'extras/vom/vom/acl_l3_list.cpp') diff --git a/extras/vom/vom/acl_l3_list.cpp b/extras/vom/vom/acl_l3_list.cpp index d3e44746ae1..5f1152f0a8f 100644 --- a/extras/vom/vom/acl_l3_list.cpp +++ b/extras/vom/vom/acl_l3_list.cpp @@ -42,28 +42,24 @@ l3_list::event_handler::event_handler() l3_list::l3_list(const key_t& key) : m_hdl(handle_t::INVALID) , m_key(key) -{ -} +{} l3_list::l3_list(const handle_t& hdl, const key_t& key) : m_hdl(hdl) , m_key(key) -{ -} +{} l3_list::l3_list(const key_t& key, const rules_t& rules) : m_hdl(handle_t::INVALID) , m_key(key) , m_rules(rules) -{ -} +{} l3_list::l3_list(const l3_list& o) : m_hdl(o.m_hdl) , m_key(o.m_key) , m_rules(o.m_rules) -{ -} +{} l3_list::~l3_list() { @@ -199,12 +195,12 @@ l3_list::event_handler::handle_populate(const client_db::key_t& key) l3_list acl(hdl, std::string(reinterpret_cast(payload.tag))); for (unsigned int ii = 0; ii < payload.count; ii++) { - const route::prefix_t src(payload.r[ii].is_ipv6, - payload.r[ii].src_ip_addr, - payload.r[ii].src_ip_prefix_len); - const route::prefix_t dst(payload.r[ii].is_ipv6, - payload.r[ii].dst_ip_addr, - payload.r[ii].dst_ip_prefix_len); + const route::prefix_t src(payload.r[ii].src_prefix.address.af, + (uint8_t*)&payload.r[ii].src_prefix.address.un, + payload.r[ii].src_prefix.len); + const route::prefix_t dst(payload.r[ii].dst_prefix.address.af, + (uint8_t*)&payload.r[ii].dst_prefix.address.un, + payload.r[ii].dst_prefix.len); l3_rule rule(ii, action_t::from_int(payload.r[ii].is_permit), src, dst); rule.set_proto(payload.r[ii].proto); -- cgit 1.2.3-korg