diff options
Diffstat (limited to 'extras/vom/vom/tap_interface_cmds.cpp')
| -rw-r--r-- | extras/vom/vom/tap_interface_cmds.cpp | 171 |
1 files changed, 157 insertions, 14 deletions
diff --git a/extras/vom/vom/tap_interface_cmds.cpp b/extras/vom/vom/tap_interface_cmds.cpp index b0885607742..763ded56bdc 100644 --- a/extras/vom/vom/tap_interface_cmds.cpp +++ b/extras/vom/vom/tap_interface_cmds.cpp @@ -16,13 +16,17 @@ #include "vom/tap_interface_cmds.hpp" #include <vapi/tap.api.vapi.hpp> +#include <vapi/tapv2.api.vapi.hpp> + +DEFINE_VAPI_MSG_IDS_TAP_API_JSON; +DEFINE_VAPI_MSG_IDS_TAPV2_API_JSON; namespace VOM { namespace tap_interface_cmds { -create_cmd::create_cmd(HW::item<handle_t>& item, - const std::string& name, - route::prefix_t& prefix, - const l2_address_t& l2_address) +tap_create_cmd::tap_create_cmd(HW::item<handle_t>& item, + const std::string& name, + route::prefix_t& prefix, + const l2_address_t& l2_address) : interface::create_cmd<vapi::Tap_connect>(item, name) , m_prefix(prefix) , m_l2_address(l2_address) @@ -30,7 +34,7 @@ create_cmd::create_cmd(HW::item<handle_t>& item, } rc_t -create_cmd::issue(connection& con) +tap_create_cmd::issue(connection& con) { msg_t req(con.ctx(), std::ref(*this)); @@ -58,12 +62,15 @@ create_cmd::issue(connection& con) VAPI_CALL(req.execute()); m_hw_item = wait(); + if (m_hw_item.rc() == rc_t::OK) { + insert_interface(); + } return rc_t::OK; } std::string -create_cmd::to_string() const +tap_create_cmd::to_string() const { std::ostringstream s; s << "tap-intf-create: " << m_hw_item.to_string() @@ -72,20 +79,30 @@ create_cmd::to_string() const return (s.str()); } -delete_cmd::delete_cmd(HW::item<handle_t>& item) +tap_delete_cmd::tap_delete_cmd(HW::item<handle_t>& item) : interface::delete_cmd<vapi::Tap_delete>(item) { } rc_t -delete_cmd::issue(connection& con) +tap_delete_cmd::issue(connection& con) { - // finally... call VPP + msg_t req(con.ctx(), std::ref(*this)); + + auto& payload = req.get_request().get_payload(); + payload.sw_if_index = m_hw_item.data().value(); + + VAPI_CALL(req.execute()); + wait(); + m_hw_item.set(rc_t::NOOP); + + remove_interface(); return rc_t::OK; } + std::string -delete_cmd::to_string() const +tap_delete_cmd::to_string() const { std::ostringstream s; s << "tap-itf-delete: " << m_hw_item.to_string(); @@ -93,18 +110,18 @@ delete_cmd::to_string() const return (s.str()); } -dump_cmd::dump_cmd() +tap_dump_cmd::tap_dump_cmd() { } bool -dump_cmd::operator==(const dump_cmd& other) const +tap_dump_cmd::operator==(const tap_dump_cmd& other) const { return (true); } rc_t -dump_cmd::issue(connection& con) +tap_dump_cmd::issue(connection& con) { m_dump.reset(new msg_t(con.ctx(), std::ref(*this))); @@ -116,10 +133,136 @@ dump_cmd::issue(connection& con) } std::string -dump_cmd::to_string() const +tap_dump_cmd::to_string() const { return ("tap-itf-dump"); } + +/* + * TAPV2 + */ +tapv2_create_cmd::tapv2_create_cmd(HW::item<handle_t>& item, + const std::string& name, + route::prefix_t& prefix, + const l2_address_t& l2_address) + : interface::create_cmd<vapi::Tap_create_v2>(item, name) + , m_prefix(prefix) + , m_l2_address(l2_address) +{ +} + +rc_t +tapv2_create_cmd::issue(connection& con) +{ + msg_t req(con.ctx(), std::ref(*this)); + + auto& payload = req.get_request().get_payload(); + memset(payload.host_if_name, 0, sizeof(payload.host_if_name)); + memcpy(payload.host_if_name, m_name.c_str(), + std::min(m_name.length(), sizeof(payload.host_if_name))); + payload.host_if_name_set = 1; + + if (m_prefix != route::prefix_t::ZERO) { + if (m_prefix.address().is_v6()) { + m_prefix.to_vpp(&payload.host_ip6_addr_set, payload.host_ip6_addr, + &payload.host_ip6_prefix_len); + } else { + m_prefix.to_vpp(&payload.host_ip4_addr_set, payload.host_ip4_addr, + &payload.host_ip4_prefix_len); + payload.host_ip4_addr_set = 1; + } + } + + if (m_l2_address != l2_address_t::ZERO) { + m_l2_address.to_bytes(payload.host_mac_addr, 6); + payload.host_mac_addr_set = 1; + } + + payload.id = 0xffffffff; + payload.use_random_mac = 1; + payload.tx_ring_sz = 1024; + payload.rx_ring_sz = 1024; + + VAPI_CALL(req.execute()); + + m_hw_item = wait(); + if (m_hw_item.rc() == rc_t::OK) { + insert_interface(); + } + + return rc_t::OK; +} + +std::string +tapv2_create_cmd::to_string() const +{ + std::ostringstream s; + s << "tapv2-intf-create: " << m_hw_item.to_string() + << " ip-prefix:" << m_prefix.to_string(); + + return (s.str()); +} + +tapv2_delete_cmd::tapv2_delete_cmd(HW::item<handle_t>& item) + : interface::delete_cmd<vapi::Tap_delete_v2>(item) +{ +} + +rc_t +tapv2_delete_cmd::issue(connection& con) +{ + + msg_t req(con.ctx(), std::ref(*this)); + + auto& payload = req.get_request().get_payload(); + + payload.sw_if_index = m_hw_item.data().value(); + + VAPI_CALL(req.execute()); + + wait(); + m_hw_item.set(rc_t::NOOP); + + remove_interface(); + return rc_t::OK; +} +std::string +tapv2_delete_cmd::to_string() const +{ + std::ostringstream s; + s << "tapv2-itf-delete: " << m_hw_item.to_string(); + + return (s.str()); +} + +tapv2_dump_cmd::tapv2_dump_cmd() +{ +} + +bool +tapv2_dump_cmd::operator==(const tapv2_dump_cmd& other) const +{ + return (true); +} + +rc_t +tapv2_dump_cmd::issue(connection& con) +{ + m_dump.reset(new msg_t(con.ctx(), std::ref(*this))); + + VAPI_CALL(m_dump->execute()); + + wait(); + + return rc_t::OK; +} + +std::string +tapv2_dump_cmd::to_string() const +{ + return ("tapv2-itf-dump"); +} + } // namespace tap_interface_cmds } // namespace VOM |