X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip_types_api.h;h=a80158052b8e8c123f57c56371a26a36fc89f3c8;hb=c025329bb244952938c8575a1d5602a1e54e5fe7;hp=be41bf59ec34ca98bf2c477540d4fb5cce597d60;hpb=86327be9751ad54cb24d16c161cacb001dc20772;p=vpp.git

diff --git a/src/vnet/ip/ip_types_api.h b/src/vnet/ip/ip_types_api.h
index be41bf59ec3..a80158052b8 100644
--- a/src/vnet/ip/ip_types_api.h
+++ b/src/vnet/ip/ip_types_api.h
@@ -23,18 +23,35 @@
 #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);
 
+/**
+ * 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,
 			       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);