X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip_types_api.h;h=62764e6c96eb3e9442b01087814473160e113197;hb=7dd63e5c;hp=fc7a416a06d40128fa7613af80f8088f2984f176;hpb=038e1dfbdfd0bd785852c364011da0a1d828093e;p=vpp.git

diff --git a/src/vnet/ip/ip_types_api.h b/src/vnet/ip/ip_types_api.h
index fc7a416a06d..62764e6c96e 100644
--- a/src/vnet/ip/ip_types_api.h
+++ b/src/vnet/ip/ip_types_api.h
@@ -23,34 +23,34 @@
 #include <vnet/ip/ip.h>
 #include <vnet/fib/fib_types.h>
 #include <vnet/mfib/mfib_types.h>
+#include <vlibapi/api_types.h>
+#include <vnet/ip/ip.api_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;
-
-/**
- * These enum decode/encodes use 'int' as the type for the enum becuase
+ * These enum decode/encodes use 'int' as the type for the enum because
  * 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);
+extern int ip_address_family_decode (vl_api_address_family_t af,
+				     ip_address_family_t * out);
+extern vl_api_address_family_t ip_address_family_encode (ip_address_family_t
+							 af);
+extern int ip_proto_decode (vl_api_ip_proto_t ipp, ip_protocol_t * out);
+extern vl_api_ip_proto_t ip_proto_encode (ip_protocol_t ipp);
+extern ip_dscp_t ip_dscp_decode (vl_api_ip_dscp_t _dscp);
+extern vl_api_ip_dscp_t 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,
+extern ip46_type_t ip_address_decode (const vl_api_address_t * in,
 				      ip46_address_t * out);
+extern void ip_address_decode2 (const vl_api_address_t * in,
+				ip_address_t * out);
 extern void ip_address_encode (const ip46_address_t * in,
-			       ip46_type_t type, struct _vl_api_address *out);
+			       ip46_type_t type, vl_api_address_t * out);
+extern void ip_address_encode2 (const ip_address_t * in,
+				vl_api_address_t * 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,
@@ -60,15 +60,15 @@ extern void ip4_address_encode (const ip4_address_t * in,
 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_prefix_decode (const vl_api_prefix_t * in, fib_prefix_t * out);
+extern void ip_prefix_encode (const fib_prefix_t * in, vl_api_prefix_t * out);
+extern int ip_prefix_decode2 (const vl_api_prefix_t * in, ip_prefix_t * out);
+extern void ip_prefix_encode2 (const ip_prefix_t * in, vl_api_prefix_t * out);
 
-extern void ip_mprefix_decode (const struct _vl_api_mprefix *in,
+extern void ip_mprefix_decode (const vl_api_mprefix_t * in,
 			       mfib_prefix_t * out);
 extern void ip_mprefix_encode (const mfib_prefix_t * in,
-			       struct _vl_api_mprefix *out);
+			       vl_api_mprefix_t * out);
 
 #endif