X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Fvom%2Fvom%2Fapi_types.cpp;h=5eea7654eee57eaa374cd4e492d3fc3c01dae0bf;hb=cbe25aab3be72154f2c706c39eeba6a77f34450f;hp=ea75d7fd8ee40f1dd2e04013e8bcd987dd414fcc;hpb=6fef74ad3083f630648eae65545a0dd46af1102e;p=vpp.git

diff --git a/extras/vom/vom/api_types.cpp b/extras/vom/vom/api_types.cpp
index ea75d7fd8ee..5eea7654eee 100644
--- a/extras/vom/vom/api_types.cpp
+++ b/extras/vom/vom/api_types.cpp
@@ -45,6 +45,10 @@ from_api(vapi_enum_ip_neighbor_flags f)
   return out;
 }
 
+invalid_decode::invalid_decode(const std::string reason)
+  : reason(reason)
+{}
+
 void
 to_api(const boost::asio::ip::address_v4& a, vapi_type_ip4_address& v)
 {
@@ -82,6 +86,16 @@ to_api(const ip_address_t& a,
   }
 }
 
+void
+to_api(const ip_address_t& a, vapi_union_address_union& u)
+{
+  if (a.is_v4()) {
+    memcpy(u.ip4, a.to_v4().to_bytes().data(), 4);
+  } else {
+    memcpy(u.ip6, a.to_v6().to_bytes().data(), 16);
+  }
+}
+
 boost::asio::ip::address_v6
 from_api(const vapi_type_ip6_address& v)
 {
@@ -122,6 +136,26 @@ from_api(const vapi_type_address& v)
   return addr;
 }
 
+ip_address_t
+from_api(const vapi_union_address_union& u, vapi_enum_fib_path_nh_proto proto)
+{
+  boost::asio::ip::address addr;
+
+  if (FIB_API_PATH_NH_PROTO_IP6 == proto) {
+    std::array<uint8_t, 16> a;
+    std::copy(u.ip6, u.ip6 + 16, std::begin(a));
+    boost::asio::ip::address_v6 v6(a);
+    addr = v6;
+  } else if (FIB_API_PATH_NH_PROTO_IP4 == proto) {
+    std::array<uint8_t, 4> a;
+    std::copy(u.ip6, u.ip6 + 4, std::begin(a));
+    boost::asio::ip::address_v4 v4(a);
+    addr = v4;
+  }
+
+  return addr;
+}
+
 ip_address_t
 from_api(const vapi_union_address_union& u, vapi_enum_address_family af)
 {
@@ -157,7 +191,7 @@ from_api(const vapi_type_mac_address& v)
 route::prefix_t
 from_api(const vapi_type_prefix& v)
 {
-  return route::prefix_t(from_api(v.address), v.address_length);
+  return route::prefix_t(from_api(v.address), v.len);
 }
 
 vapi_type_prefix
@@ -165,7 +199,7 @@ to_api(const route::prefix_t& p)
 {
   vapi_type_prefix v;
   to_api(p.address(), v.address);
-  v.address_length = p.mask_width();
+  v.len = p.mask_width();
   return v;
 }
 
@@ -173,7 +207,8 @@ route::mprefix_t
 from_api(const vapi_type_mprefix& v)
 {
   return route::mprefix_t(from_api(v.src_address, v.af),
-                          from_api(v.grp_address, v.af), v.grp_address_length);
+                          from_api(v.grp_address, v.af),
+                          v.grp_address_length);
 }
 
 vapi_type_mprefix
@@ -187,7 +222,52 @@ to_api(const route::mprefix_t& p)
   v.af = af;
   return v;
 }
-};
+
+vapi_enum_fib_path_nh_proto
+to_api(const nh_proto_t& p)
+{
+  if (p == nh_proto_t::IPV4) {
+    return FIB_API_PATH_NH_PROTO_IP4;
+  } else if (p == nh_proto_t::IPV6) {
+    return FIB_API_PATH_NH_PROTO_IP6;
+  } else if (p == nh_proto_t::ETHERNET) {
+    return FIB_API_PATH_NH_PROTO_ETHERNET;
+  } else if (p == nh_proto_t::MPLS) {
+    return FIB_API_PATH_NH_PROTO_MPLS;
+  }
+
+  return FIB_API_PATH_NH_PROTO_IP4;
+}
+
+vapi_enum_address_family
+to_api(const l3_proto_t p)
+{
+  if (p == l3_proto_t::IPV6) {
+    return ADDRESS_IP6;
+  }
+  return ADDRESS_IP4;
+}
+
+const nh_proto_t&
+from_api(vapi_enum_fib_path_nh_proto p)
+{
+  switch (p) {
+    case FIB_API_PATH_NH_PROTO_IP4:
+      return nh_proto_t::IPV4;
+    case FIB_API_PATH_NH_PROTO_IP6:
+      return nh_proto_t::IPV6;
+    case FIB_API_PATH_NH_PROTO_ETHERNET:
+      return nh_proto_t::ETHERNET;
+    case FIB_API_PATH_NH_PROTO_MPLS:
+      return nh_proto_t::MPLS;
+    case FIB_API_PATH_NH_PROTO_BIER:
+      break;
+  }
+
+  return nh_proto_t::IPV4;
+}
+
+}; // VOM
 
 /*
  * fd.io coding-style-patch-verification: ON