X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip_types_api.h;h=fc7a416a06d40128fa7613af80f8088f2984f176;hb=038e1dfbd;hp=2ad59ae438e7e18d542547e16a1a7ffb5057a35c;hpb=947ea6222dad1ef04595c34273e9231395aef443;p=vpp.git

diff --git a/src/vnet/ip/ip_types_api.h b/src/vnet/ip/ip_types_api.h
index 2ad59ae438e..fc7a416a06d 100644
--- a/src/vnet/ip/ip_types_api.h
+++ b/src/vnet/ip/ip_types_api.h
@@ -22,23 +22,54 @@
 
 #include <vnet/ip/ip.h>
 #include <vnet/fib/fib_types.h>
+#include <vnet/mfib/mfib_types.h>
 
 /**
  * Forward declarations so we need not #include the API definitions here
  */
+typedef u8 vl_api_ip6_address_t[16];
+typedef u8 vl_api_ip4_address_t[4];
 struct _vl_api_address;
 struct _vl_api_prefix;
+struct _vl_api_mprefix;
 
-extern void ip_address_decode (const struct _vl_api_address *in,
-			       ip46_address_t * out);
+/**
+ * These enum decode/encodes use 'int' as the type for the enum becuase
+ * one cannot forward declare an enum
+ */
+extern int ip_address_family_decode (int _af, ip_address_family_t * out);
+extern int ip_address_family_encode (ip_address_family_t af);
+extern int ip_proto_decode (int _af, ip_protocol_t * out);
+extern int ip_proto_encode (ip_protocol_t af);
+extern ip_dscp_t ip_dscp_decode (u8 _dscp);
+extern u8 ip_dscp_encode (ip_dscp_t dscp);
+
+/**
+ * Decode/Encode for struct/union types
+ */
+extern ip46_type_t ip_address_decode (const struct _vl_api_address *in,
+				      ip46_address_t * out);
 extern void ip_address_encode (const ip46_address_t * in,
-			       struct _vl_api_address *out);
+			       ip46_type_t type, struct _vl_api_address *out);
+extern void ip6_address_encode (const ip6_address_t * in,
+				vl_api_ip6_address_t out);
+extern void ip6_address_decode (const vl_api_ip6_address_t in,
+				ip6_address_t * out);
+extern void ip4_address_encode (const ip4_address_t * in,
+				vl_api_ip4_address_t out);
+extern void ip4_address_decode (const vl_api_ip4_address_t in,
+				ip4_address_t * out);
 
 extern void ip_prefix_decode (const struct _vl_api_prefix *in,
 			      fib_prefix_t * out);
 extern void ip_prefix_encode (const fib_prefix_t * in,
 			      struct _vl_api_prefix *out);
 
+extern void ip_mprefix_decode (const struct _vl_api_mprefix *in,
+			       mfib_prefix_t * out);
+extern void ip_mprefix_encode (const mfib_prefix_t * in,
+			       struct _vl_api_mprefix *out);
+
 #endif
 
 /*