X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Fvom%2Fvom%2Fapi_types.cpp;h=53cd047332a9066d4a60084a143ed02c0b948510;hb=8006c6a;hp=1bde8be9dcc68464debc283342bf3bcad2031a6b;hpb=8c8acc027871f97370ee549306876690030c3bbb;p=vpp.git diff --git a/extras/vom/vom/api_types.cpp b/extras/vom/vom/api_types.cpp index 1bde8be9dcc..53cd047332a 100644 --- a/extras/vom/vom/api_types.cpp +++ b/extras/vom/vom/api_types.cpp @@ -28,6 +28,11 @@ to_api(const ip_address_t& a, vapi_type_address& v) memcpy(v.un.ip6, a.to_v6().to_bytes().data(), 16); } } +void +to_api(const boost::asio::ip::address& a, vapi_type_ip4_address& v) +{ + memcpy(v, a.to_v4().to_bytes().data(), 4); +} ip_address_t from_api(const vapi_type_address& v) @@ -49,20 +54,16 @@ from_api(const vapi_type_address& v) return addr; } -vapi_type_mac_address -to_api(const mac_address_t& a) +void +to_api(const mac_address_t& a, vapi_type_mac_address& v) { - vapi_type_mac_address v; - - std::copy(std::begin(a.bytes), std::end(a.bytes), v.bytes); - - return (v); + std::copy(std::begin(a.bytes), std::end(a.bytes), v); } mac_address_t from_api(const vapi_type_mac_address& v) { - return mac_address_t(v.bytes); + return mac_address_t(v); } route::prefix_t @@ -71,11 +72,13 @@ from_api(const vapi_type_prefix& v) return route::prefix_t(from_api(v.address), v.address_length); } -void -to_api(const route::prefix_t& p, vapi_type_prefix& v) +vapi_type_prefix +to_api(const route::prefix_t& p) { + vapi_type_prefix v; to_api(p.address(), v.address); v.address_length = p.mask_width(); + return v; } };