aboutsummaryrefslogtreecommitdiffstats
path: root/extras/vom
diff options
context:
space:
mode:
authorOle Troan <ot@cisco.com>2018-12-18 12:23:13 +0100
committerDamjan Marion <dmarion@me.com>2018-12-18 13:30:40 +0000
commit003d5da298b2cd1e20400fb5fdcefce752ca616e (patch)
treef348793bd749e504b80b483191e95168c9df44bd /extras/vom
parent91bfa6e2666c56f79cc97407c929d188cb34e90f (diff)
VAPI/VOM: Removing legacy stats tests, add string type.
Fix misc VAPI/VOM generation and test cases. Change-Id: I1abf9ecdb6f8a2129f11e0a9ed1c0fe04cdf5c47 Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'extras/vom')
-rw-r--r--extras/vom/vom/igmp_listen_cmds.cpp11
-rw-r--r--extras/vom/vom/igmp_listen_cmds.hpp8
2 files changed, 10 insertions, 9 deletions
diff --git a/extras/vom/vom/igmp_listen_cmds.cpp b/extras/vom/vom/igmp_listen_cmds.cpp
index 683b2b9a0b6..69e243d9b4a 100644
--- a/extras/vom/vom/igmp_listen_cmds.cpp
+++ b/extras/vom/vom/igmp_listen_cmds.cpp
@@ -22,7 +22,7 @@ namespace VOM {
namespace igmp_listen_cmds {
listen_cmd::listen_cmd(HW::item<bool>& item,
const handle_t& itf,
- const boost::asio::ip::address& gaddr,
+ const boost::asio::ip::address_v4& gaddr,
const igmp_listen::src_addrs_t& saddrs)
: rpc_cmd(item)
, m_itf(itf)
@@ -34,7 +34,8 @@ listen_cmd::listen_cmd(HW::item<bool>& item,
bool
listen_cmd::operator==(const listen_cmd& other) const
{
- return ((m_itf == other.m_itf) && (m_gaddr == other.m_gaddr));
+ return ((m_itf == other.m_itf) && (m_gaddr == other.m_gaddr) &&
+ (m_saddrs == other.m_saddrs));
}
rc_t
@@ -45,7 +46,7 @@ listen_cmd::issue(connection& con)
auto& payload = req.get_request().get_payload();
payload.group.sw_if_index = m_itf.value();
- to_api(m_gaddr.to_v4(), payload.group.gaddr);
+ to_api(m_gaddr, payload.group.gaddr);
if (0 == size) {
// no sources => (*,G) join
@@ -85,7 +86,7 @@ listen_cmd::to_string() const
unlisten_cmd::unlisten_cmd(HW::item<bool>& item,
const handle_t& itf,
- const boost::asio::ip::address& gaddr)
+ const boost::asio::ip::address_v4& gaddr)
: rpc_cmd(item)
, m_itf(itf)
, m_gaddr(gaddr)
@@ -107,7 +108,7 @@ unlisten_cmd::issue(connection& con)
payload.group.sw_if_index = m_itf.value();
payload.group.n_srcs = 0;
payload.group.filter = INCLUDE;
- to_api(m_gaddr.to_v4(), payload.group.gaddr);
+ to_api(m_gaddr, payload.group.gaddr);
VAPI_CALL(req.execute());
diff --git a/extras/vom/vom/igmp_listen_cmds.hpp b/extras/vom/vom/igmp_listen_cmds.hpp
index c062358e4dd..5bfea47914b 100644
--- a/extras/vom/vom/igmp_listen_cmds.hpp
+++ b/extras/vom/vom/igmp_listen_cmds.hpp
@@ -36,7 +36,7 @@ public:
*/
listen_cmd(HW::item<bool>& item,
const handle_t& itf,
- const boost::asio::ip::address& gaddr,
+ const boost::asio::ip::address_v4& gaddr,
const igmp_listen::src_addrs_t& saddrs);
/**
@@ -62,7 +62,7 @@ private:
/**
* The igmp group to bind
*/
- const boost::asio::ip::address& m_gaddr;
+ const boost::asio::ip::address_v4& m_gaddr;
/**
* The igmp srouce specific addresses to listen them
@@ -81,7 +81,7 @@ public:
*/
unlisten_cmd(HW::item<bool>& item,
const handle_t& itf,
- const boost::asio::ip::address& gaddr);
+ const boost::asio::ip::address_v4& gaddr);
/**
* Issue the command to VPP/HW
@@ -107,7 +107,7 @@ private:
/**
* The igmp group to unlisten
*/
- const boost::asio::ip::address& m_gaddr;
+ const boost::asio::ip::address_v4& m_gaddr;
};
/**