aboutsummaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
authorJakub Grajciar <jgrajcia@cisco.com>2020-03-02 13:55:31 +0100
committerJakub Grajciar <jgrajcia@cisco.com>2020-03-16 09:18:46 +0000
commit7c0eb56f40b3ccf8acd8f04e208aa50231aebeba (patch)
tree3df2939bf739d46eb6cb42767e5c402c3e0eac86 /extras
parentcd5a4a035c0c7a7ca9f915bee83abde085c05ad7 (diff)
vxlan: vxlan/vxlan.api API cleanup
Use consistent API types. Type: fix Signed-off-by: Jakub Grajciar <jgrajcia@cisco.com> Change-Id: I7f6f37ec6eed780322e2488d6eb0f5681945ba09 Signed-off-by: Jakub Grajciar <jgrajcia@cisco.com>
Diffstat (limited to 'extras')
-rw-r--r--extras/vom/vom/vxlan_tunnel.cpp57
-rw-r--r--extras/vom/vom/vxlan_tunnel_cmds.cpp28
2 files changed, 49 insertions, 36 deletions
diff --git a/extras/vom/vom/vxlan_tunnel.cpp b/extras/vom/vom/vxlan_tunnel.cpp
index db2886321c5..e37d160e92b 100644
--- a/extras/vom/vom/vxlan_tunnel.cpp
+++ b/extras/vom/vom/vxlan_tunnel.cpp
@@ -33,8 +33,7 @@ const vxlan_tunnel::mode_t vxlan_tunnel::mode_t::GPE(3, "GPE");
vxlan_tunnel::mode_t::mode_t(int v, const std::string s)
: enum_base<vxlan_tunnel::mode_t>(v, s)
-{
-}
+{}
vxlan_tunnel::endpoint_t::endpoint_t(const boost::asio::ip::address& src,
const boost::asio::ip::address& dst,
@@ -42,15 +41,13 @@ vxlan_tunnel::endpoint_t::endpoint_t(const boost::asio::ip::address& src,
: src(src)
, dst(dst)
, vni(vni)
-{
-}
+{}
vxlan_tunnel::endpoint_t::endpoint_t()
: src()
, dst()
, vni(0)
-{
-}
+{}
bool
vxlan_tunnel::endpoint_t::operator==(const endpoint_t& other) const
@@ -96,8 +93,7 @@ vxlan_tunnel::vxlan_tunnel(const boost::asio::ip::address& src,
, m_mcast_itf()
, m_rd()
, m_table_id(route::DEFAULT_TABLE)
-{
-}
+{}
vxlan_tunnel::vxlan_tunnel(const boost::asio::ip::address& src,
const boost::asio::ip::address& dst,
@@ -112,8 +108,7 @@ vxlan_tunnel::vxlan_tunnel(const boost::asio::ip::address& src,
, m_mcast_itf(mcast_itf.singular())
, m_rd()
, m_table_id(route::DEFAULT_TABLE)
-{
-}
+{}
vxlan_tunnel::vxlan_tunnel(const boost::asio::ip::address& src,
const boost::asio::ip::address& dst,
@@ -128,8 +123,7 @@ vxlan_tunnel::vxlan_tunnel(const boost::asio::ip::address& src,
, m_mcast_itf()
, m_rd(rd.singular())
, m_table_id(m_rd->table_id())
-{
-}
+{}
vxlan_tunnel::vxlan_tunnel(const vxlan_tunnel& o)
: interface(o)
@@ -138,8 +132,7 @@ vxlan_tunnel::vxlan_tunnel(const vxlan_tunnel& o)
, m_mcast_itf(o.m_mcast_itf)
, m_rd(o.m_rd)
, m_table_id(o.m_table_id)
-{
-}
+{}
bool
vxlan_tunnel::operator==(const vxlan_tunnel& other) const
@@ -178,15 +171,23 @@ vxlan_tunnel::replay()
if (m_hdl) {
if (mode_t::STANDARD == m_mode)
HW::enqueue(new vxlan_tunnel_cmds::create_cmd(
- m_hdl, name(), m_tep,
+ m_hdl,
+ name(),
+ m_tep,
(m_mcast_itf ? m_mcast_itf->handle() : handle_t::INVALID)));
else if (mode_t::GBP_L2 == m_mode)
HW::enqueue(new vxlan_gbp_tunnel_cmds::create_cmd(
- m_hdl, name(), m_tep, true,
+ m_hdl,
+ name(),
+ m_tep,
+ true,
(m_mcast_itf ? m_mcast_itf->handle() : handle_t::INVALID)));
else if (mode_t::GBP_L3 == m_mode)
HW::enqueue(new vxlan_gbp_tunnel_cmds::create_cmd(
- m_hdl, name(), m_tep, false,
+ m_hdl,
+ name(),
+ m_tep,
+ false,
(m_mcast_itf ? m_mcast_itf->handle() : handle_t::INVALID)));
}
if (m_rd && (m_rd->table_id() != route::DEFAULT_TABLE)) {
@@ -224,15 +225,23 @@ vxlan_tunnel::update(const vxlan_tunnel& desired)
if (rc_t::OK != m_hdl.rc()) {
if (mode_t::STANDARD == m_mode)
HW::enqueue(new vxlan_tunnel_cmds::create_cmd(
- m_hdl, name(), m_tep,
+ m_hdl,
+ name(),
+ m_tep,
(m_mcast_itf ? m_mcast_itf->handle() : handle_t::INVALID)));
else if (mode_t::GBP_L2 == m_mode)
HW::enqueue(new vxlan_gbp_tunnel_cmds::create_cmd(
- m_hdl, name(), m_tep, true,
+ m_hdl,
+ name(),
+ m_tep,
+ true,
(m_mcast_itf ? m_mcast_itf->handle() : handle_t::INVALID)));
else if (mode_t::GBP_L3 == m_mode)
HW::enqueue(new vxlan_gbp_tunnel_cmds::create_cmd(
- m_hdl, name(), m_tep, false,
+ m_hdl,
+ name(),
+ m_tep,
+ false,
(m_mcast_itf ? m_mcast_itf->handle() : handle_t::INVALID)));
}
if (!m_table_id && m_rd) {
@@ -272,9 +281,9 @@ vxlan_tunnel::event_handler::handle_populate(const client_db::key_t& key)
auto& payload = record.get_payload();
handle_t hdl(payload.sw_if_index);
boost::asio::ip::address src =
- from_bytes(payload.is_ipv6, payload.src_address);
+ from_bytes(payload.src_address.af, (uint8_t*)&payload.src_address.un);
boost::asio::ip::address dst =
- from_bytes(payload.is_ipv6, payload.dst_address);
+ from_bytes(payload.dst_address.af, (uint8_t*)&payload.dst_address.un);
std::shared_ptr<vxlan_tunnel> vt =
vxlan_tunnel(src, dst, payload.vni).singular();
@@ -299,7 +308,9 @@ vxlan_tunnel::event_handler::handle_populate(const client_db::key_t& key)
boost::asio::ip::address dst = from_api(payload.tunnel.dst);
std::shared_ptr<vxlan_tunnel> vt =
- vxlan_tunnel(src, dst, payload.tunnel.vni,
+ vxlan_tunnel(src,
+ dst,
+ payload.tunnel.vni,
(payload.tunnel.mode == VXLAN_GBP_API_TUNNEL_MODE_L2
? mode_t::GBP_L2
: mode_t::GBP_L3))
diff --git a/extras/vom/vom/vxlan_tunnel_cmds.cpp b/extras/vom/vom/vxlan_tunnel_cmds.cpp
index 24879ce4d45..da71a99967e 100644
--- a/extras/vom/vom/vxlan_tunnel_cmds.cpp
+++ b/extras/vom/vom/vxlan_tunnel_cmds.cpp
@@ -27,8 +27,7 @@ create_cmd::create_cmd(HW::item<handle_t>& item,
: interface::create_cmd<vapi::Vxlan_add_del_tunnel>(item, name)
, m_ep(ep)
, m_mcast_itf(mcast_itf)
-{
-}
+{}
bool
create_cmd::operator==(const create_cmd& other) const
@@ -43,9 +42,12 @@ create_cmd::issue(connection& con)
auto& payload = req.get_request().get_payload();
payload.is_add = 1;
- payload.is_ipv6 = 0;
- to_bytes(m_ep.src, &payload.is_ipv6, payload.src_address);
- to_bytes(m_ep.dst, &payload.is_ipv6, payload.dst_address);
+ to_bytes(m_ep.src,
+ (uint8_t*)&payload.src_address.af,
+ (uint8_t*)&payload.src_address.un);
+ to_bytes(m_ep.dst,
+ (uint8_t*)&payload.dst_address.af,
+ (uint8_t*)&payload.dst_address.un);
payload.mcast_sw_if_index = m_mcast_itf.value();
payload.encap_vrf_id = 0;
payload.decap_next_index = ~0;
@@ -76,8 +78,7 @@ delete_cmd::delete_cmd(HW::item<handle_t>& item,
const vxlan_tunnel::endpoint_t& ep)
: interface::delete_cmd<vapi::Vxlan_add_del_tunnel>(item)
, m_ep(ep)
-{
-}
+{}
bool
delete_cmd::operator==(const delete_cmd& other) const
@@ -92,9 +93,12 @@ delete_cmd::issue(connection& con)
auto payload = req.get_request().get_payload();
payload.is_add = 0;
- payload.is_ipv6 = 0;
- to_bytes(m_ep.src, &payload.is_ipv6, payload.src_address);
- to_bytes(m_ep.dst, &payload.is_ipv6, payload.dst_address);
+ to_bytes(m_ep.src,
+ (uint8_t*)&payload.src_address.af,
+ (uint8_t*)&payload.src_address.un);
+ to_bytes(m_ep.dst,
+ (uint8_t*)&payload.dst_address.af,
+ (uint8_t*)&payload.dst_address.un);
payload.mcast_sw_if_index = ~0;
payload.encap_vrf_id = 0;
payload.decap_next_index = ~0;
@@ -118,9 +122,7 @@ delete_cmd::to_string() const
return (s.str());
}
-dump_cmd::dump_cmd()
-{
-}
+dump_cmd::dump_cmd() {}
bool
dump_cmd::operator==(const dump_cmd& other) const