X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip_types_api.c;h=d201d387f02169b1a6ba6f65a74b8520c4ca86f8;hb=23a386b71b287bc95000a8980856c5dbe7cdaf5a;hp=fd8d24f36fe194a2fe11463c3a2368940553f72d;hpb=b538dd868665009f9a3737610177342f88e3ba80;p=vpp.git

diff --git a/src/vnet/ip/ip_types_api.c b/src/vnet/ip/ip_types_api.c
index fd8d24f36fe..d201d387f02 100644
--- a/src/vnet/ip/ip_types_api.c
+++ b/src/vnet/ip/ip_types_api.c
@@ -95,6 +95,18 @@ ip_proto_encode (ip_protocol_t ipp)
   return (clib_host_to_net_u32 (IP_API_PROTO_TCP));
 }
 
+ip_dscp_t
+ip_dscp_decode (u8 in)
+{
+  return ((ip_dscp_t) in);
+}
+
+u8
+ip_dscp_encode (ip_dscp_t dscp)
+{
+  return (dscp);
+}
+
 void
 ip6_address_encode (const ip6_address_t * in, vl_api_ip6_address_t out)
 {
@@ -137,7 +149,7 @@ ip_address_union_decode (const vl_api_address_union_t * in,
       type = IP46_TYPE_IP6;
       break;
     default:
-      ASSERT (!"Unkown address family in API address type");
+      ASSERT (!"Unknown address family in API address type");
       type = IP46_TYPE_ANY;
       break;
     }
@@ -151,6 +163,26 @@ ip_address_decode (const vl_api_address_t * in, ip46_address_t * out)
   return (ip_address_union_decode (&in->un, in->af, out));
 }
 
+void
+ip_address_decode2 (const vl_api_address_t * in, ip_address_t * out)
+{
+  switch (clib_net_to_host_u32 (in->af))
+    {
+    case ADDRESS_IP4:
+      clib_memset (out, 0, sizeof (*out));
+      clib_memcpy (&ip_addr_v4 (out), &in->un.ip4, sizeof (ip_addr_v4 (out)));
+      out->version = AF_IP4;
+      break;
+    case ADDRESS_IP6:
+      clib_memcpy (&ip_addr_v6 (out), &in->un.ip6, sizeof (ip_addr_v6 (out)));
+      out->version = AF_IP6;
+      break;
+    default:
+      ASSERT (!"Unknown address family in API address type");
+      break;
+    }
+}
+
 static void
 ip_address_union_encode (const ip46_address_t * in,
 			 vl_api_address_family_t af,
@@ -184,6 +216,22 @@ ip_address_encode (const ip46_address_t * in,
   ip_address_union_encode (in, out->af, &out->un);
 }
 
+void
+ip_address_encode2 (const ip_address_t * in, vl_api_address_t * out)
+{
+  switch (in->version)
+    {
+    case AF_IP4:
+      out->af = clib_net_to_host_u32 (ADDRESS_IP4);
+      ip4_address_encode (&in->ip.v4, out->un.ip4);
+      break;
+    case AF_IP6:
+      out->af = clib_net_to_host_u32 (ADDRESS_IP6);
+      ip6_address_encode (&in->ip.v6, out->un.ip6);
+      break;
+    }
+}
+
 void
 ip_prefix_decode (const vl_api_prefix_t * in, fib_prefix_t * out)
 {
@@ -196,7 +244,7 @@ ip_prefix_decode (const vl_api_prefix_t * in, fib_prefix_t * out)
       out->fp_proto = FIB_PROTOCOL_IP6;
       break;
     }
-  out->fp_len = in->address_length;
+  out->fp_len = in->len;
   out->___fp___pad = 0;
   ip_address_decode (&in->address, &out->fp_addr);
 }
@@ -204,9 +252,25 @@ ip_prefix_decode (const vl_api_prefix_t * in, fib_prefix_t * out)
 void
 ip_prefix_encode (const fib_prefix_t * in, vl_api_prefix_t * out)
 {
-  out->address_length = in->fp_len;
-  ip_address_encode (&in->fp_addr,
-		     fib_proto_to_ip46 (in->fp_proto), &out->address);
+  out->len = in->fp_len;
+  ip46_type_t ip46_type;
+
+  switch (in->fp_proto)
+    {
+    case FIB_PROTOCOL_IP4:
+      ip46_type = (IP46_TYPE_IP4);
+      break;
+    case FIB_PROTOCOL_IP6:
+      ip46_type = (IP46_TYPE_IP6);
+      break;
+    case FIB_PROTOCOL_MPLS:
+      ip46_type = (IP46_TYPE_ANY);
+      break;
+    default:
+      ip46_type = (IP46_TYPE_ANY);
+    }
+
+  ip_address_encode (&in->fp_addr, ip46_type, &out->address);
 }
 
 void
@@ -226,9 +290,13 @@ ip_mprefix_decode (const vl_api_mprefix_t * in, mfib_prefix_t * out)
   out->fp_proto = (ADDRESS_IP6 == clib_net_to_host_u32 (in->af) ?
 		   FIB_PROTOCOL_IP6 : FIB_PROTOCOL_IP4);
   out->fp_len = clib_net_to_host_u16 (in->grp_address_length);
+  out->___fp___pad = 0;
 
   ip_address_union_decode (&in->grp_address, in->af, &out->fp_grp_addr);
   ip_address_union_decode (&in->src_address, in->af, &out->fp_src_addr);
+
+  if (!ip46_address_is_zero (&out->fp_src_addr))
+    out->fp_len = (out->fp_proto == FIB_PROTOCOL_IP6 ? 256 : 64);
 }
 
 /*