#include "vom/acl_list.hpp"
#include "vom/acl_list_cmds.hpp"
#include "vom/logger.hpp"
+#include "vom/singular_db_funcs.hpp"
namespace VOM {
namespace ACL {
+
+template <>
+l2_list::event_handler::event_handler()
+{
+ OM::register_listener(this);
+ inspect::register_handler({ "l2-acl-list" }, "L2 ACL lists", this);
+}
+
template <>
void
l2_list::event_handler::handle_populate(const client_db::key_t& key)
m_evh.order();
/*
-* dump VPP Bridge domains
-*/
- std::shared_ptr<list_cmds::l2_dump_cmd> cmd(new list_cmds::l2_dump_cmd());
+ * dump VPP Bridge domains
+ */
+ std::shared_ptr<list_cmds::l2_dump_cmd> cmd =
+ std::make_shared<list_cmds::l2_dump_cmd>();
HW::enqueue(cmd);
HW::write();
VOM_LOG(log_level_t::DEBUG) << "dump: " << acl.to_string();
/*
-* Write each of the discovered ACLs into the OM,
-* but disable the HW Command q whilst we do, so that no
-* commands are sent to VPP
-*/
+ * Write each of the discovered ACLs into the OM,
+ * but disable the HW Command q whilst we do, so that no
+ * commands are sent to VPP
+ */
OM::commit(key, acl);
}
}
+template <>
+void
+l2_list::event_handler::show(std::ostream& os)
+{
+ db_dump(m_db, os);
+}
+
+template <>
+l3_list::event_handler::event_handler()
+{
+ OM::register_listener(this);
+ inspect::register_handler({ "l3-acl-list" }, "L3 ACL lists", this);
+}
+
template <>
void
l3_list::event_handler::handle_populate(const client_db::key_t& key)
m_evh.order();
/*
-* dump VPP Bridge domains
-*/
- std::shared_ptr<list_cmds::l3_dump_cmd> cmd(new list_cmds::l3_dump_cmd());
+ * dump L3 ACLs Bridge domains
+ */
+ std::shared_ptr<list_cmds::l3_dump_cmd> cmd =
+ std::make_shared<list_cmds::l3_dump_cmd>();
HW::enqueue(cmd);
HW::write();
payload.r[ii].dst_ip_prefix_len);
l3_rule rule(ii, action_t::from_int(payload.r[ii].is_permit), src, dst);
+ rule.set_proto(payload.r[ii].proto);
+ rule.set_src_from_port(payload.r[ii].srcport_or_icmptype_first);
+ rule.set_src_to_port(payload.r[ii].srcport_or_icmptype_last);
+ rule.set_dst_from_port(payload.r[ii].dstport_or_icmpcode_first);
+ rule.set_dst_to_port(payload.r[ii].dstport_or_icmpcode_last);
+ rule.set_tcp_flags_mask(payload.r[ii].tcp_flags_mask);
+ rule.set_tcp_flags_value(payload.r[ii].tcp_flags_value);
+
acl.insert(rule);
}
VOM_LOG(log_level_t::DEBUG) << "dump: " << acl.to_string();
/*
-* Write each of the discovered ACLs into the OM,
-* but disable the HW Command q whilst we do, so that no
-* commands are sent to VPP
-*/
+ * Write each of the discovered ACLs into the OM,
+ * but disable the HW Command q whilst we do, so that no
+ * commands are sent to VPP
+ */
OM::commit(key, acl);
}
}
+template <>
+void
+l3_list::event_handler::show(std::ostream& os)
+{
+ db_dump(m_db, os);
+}
+
template <>
void
l3_list::update(const l3_list& obj)
/*
* always update the instance with the latest rule set
*/
- if (!m_hdl || obj.m_rules != m_rules) {
+ if (rc_t::OK != m_hdl.rc() || obj.m_rules != m_rules) {
HW::enqueue(new list_cmds::l3_update_cmd(m_hdl, m_key, m_rules));
}
/*
/*
* always update the instance with the latest rule set
*/
- if (!m_hdl || obj.m_rules != m_rules) {
+ if (rc_t::OK != m_hdl.rc() || obj.m_rules != m_rules) {
HW::enqueue(new list_cmds::l2_update_cmd(m_hdl, m_key, m_rules));
}
/*
l3_list::replay(void)
{
if (m_hdl) {
+ m_hdl.data().reset();
HW::enqueue(new list_cmds::l3_update_cmd(m_hdl, m_key, m_rules));
}
}
l2_list::replay(void)
{
if (m_hdl) {
+ m_hdl.data().reset();
HW::enqueue(new list_cmds::l2_update_cmd(m_hdl, m_key, m_rules));
}
}