#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
+ * These enum decode/encodes use 'int' as the type for the enum because
+ * one cannot forward declare an enum
*/
-struct _vl_api_address;
-struct _vl_api_prefix;
-struct _vl_api_mprefix;
+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 ip46_type_t ip_address_decode (const struct _vl_api_address *in,
+/**
+ * Decode/Encode for struct/union types
+ */
+extern ip46_type_t ip_address_decode (const vl_api_address_t * in,
ip46_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_decode2 (const vl_api_address_t * in,
+ ip_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,
+ 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_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 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