aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/plugins/dhcp/dhcp6_ia_na_client_cp.c1
-rw-r--r--src/tools/vppapigen/vppapigen_c.py4
-rw-r--r--src/vnet/CMakeLists.txt2
-rw-r--r--src/vnet/ethernet/ethernet_types_api.c14
-rw-r--r--src/vnet/flow/flow_api.c1
-rw-r--r--src/vnet/ip/ip_types_api.c14
-rw-r--r--src/vnet/ipsec/ipsec_types_api.c4
-rw-r--r--src/vnet/mfib/mfib_api.c16
-rw-r--r--src/vnet/vnet_all_api_h.h40
-rw-r--r--src/vnet/vnet_msg_enum.h37
-rw-r--r--src/vpp/api/vpe_all_api_h.h5
11 files changed, 3 insertions, 135 deletions
diff --git a/src/plugins/dhcp/dhcp6_ia_na_client_cp.c b/src/plugins/dhcp/dhcp6_ia_na_client_cp.c
index edc6f49768e..4a1156f6e8a 100644
--- a/src/plugins/dhcp/dhcp6_ia_na_client_cp.c
+++ b/src/plugins/dhcp/dhcp6_ia_na_client_cp.c
@@ -15,7 +15,6 @@
#include <vnet/vnet.h>
#include <vlibmemory/api.h>
-#include <vnet/vnet_msg_enum.h>
#include <dhcp/dhcp6_packet.h>
#include <dhcp/dhcp6_ia_na_client_dp.h>
#include <vnet/ip/ip.h>
diff --git a/src/tools/vppapigen/vppapigen_c.py b/src/tools/vppapigen/vppapigen_c.py
index b298c3334de..3d3854bcacb 100644
--- a/src/tools/vppapigen/vppapigen_c.py
+++ b/src/tools/vppapigen/vppapigen_c.py
@@ -1683,7 +1683,9 @@ def generate_c_test2_boilerplate(services, defines, module, stream):
#include <vnet/ethernet/ethernet_format_fns.h>
#define vl_typedefs /* define message structures */
-#include <vpp/api/vpe_all_api_h.h>
+#include <vlibmemory/vl_memory_api_h.h>
+#include <vpp/api/vpe_types.api.h>
+#include <vpp/api/vpe.api.h>
#undef vl_typedefs
#include "{module}.api_enum.h"
diff --git a/src/vnet/CMakeLists.txt b/src/vnet/CMakeLists.txt
index a24b87bd6e0..a800230c9d5 100644
--- a/src/vnet/CMakeLists.txt
+++ b/src/vnet/CMakeLists.txt
@@ -67,8 +67,6 @@ list(APPEND VNET_HEADERS
plugin/plugin.h
pipeline.h
vnet.h
- vnet_all_api_h.h
- vnet_msg_enum.h
util/radix.h
util/refcount.h
format_fns.h
diff --git a/src/vnet/ethernet/ethernet_types_api.c b/src/vnet/ethernet/ethernet_types_api.c
index 145cf6ca40b..6c1f2b5622c 100644
--- a/src/vnet/ethernet/ethernet_types_api.c
+++ b/src/vnet/ethernet/ethernet_types_api.c
@@ -16,20 +16,6 @@
#include <vlibapi/api_types.h>
#include <vnet/ethernet/ethernet_types_api.h>
-#define vl_typedefs /* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun /* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <vnet/vnet_all_api_h.h>
-#undef vl_printfun
-
void
mac_address_decode (const u8 * in, mac_address_t * out)
{
diff --git a/src/vnet/flow/flow_api.c b/src/vnet/flow/flow_api.c
index 4fcff896f47..6f08f0314a4 100644
--- a/src/vnet/flow/flow_api.c
+++ b/src/vnet/flow/flow_api.c
@@ -28,7 +28,6 @@
#include <vnet/udp/udp_local.h>
#include <vnet/tunnel/tunnel_types_api.h>
#include <vnet/ip/ip_types_api.h>
-#include <vnet/vnet_msg_enum.h>
#include <vnet/format_fns.h>
#include <vnet/flow/flow.api_enum.h>
diff --git a/src/vnet/ip/ip_types_api.c b/src/vnet/ip/ip_types_api.c
index 6e5f997a3c4..7a9d4d6446a 100644
--- a/src/vnet/ip/ip_types_api.c
+++ b/src/vnet/ip/ip_types_api.c
@@ -16,20 +16,6 @@
#include <vlibapi/api_types.h>
#include <vnet/ip/ip_types_api.h>
-#define vl_typedefs /* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun /* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <vnet/vnet_all_api_h.h>
-#undef vl_printfun
-
int
ip_address_family_decode (vl_api_address_family_t af,
ip_address_family_t * out)
diff --git a/src/vnet/ipsec/ipsec_types_api.c b/src/vnet/ipsec/ipsec_types_api.c
index 7044f1eb046..c647449ba4d 100644
--- a/src/vnet/ipsec/ipsec_types_api.c
+++ b/src/vnet/ipsec/ipsec_types_api.c
@@ -17,10 +17,6 @@
#include <vnet/ipsec/ipsec_types_api.h>
#include <vlibapi/api_types.h>
-#define vl_typedefs /* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_typedefs
-
int
ipsec_proto_decode (vl_api_ipsec_proto_t in, ipsec_protocol_t * out)
{
diff --git a/src/vnet/mfib/mfib_api.c b/src/vnet/mfib/mfib_api.c
index 4743d889aef..170796b83c7 100644
--- a/src/vnet/mfib/mfib_api.c
+++ b/src/vnet/mfib/mfib_api.c
@@ -20,22 +20,6 @@
#include <vnet/fib/fib_api.h>
#include <vnet/ip/ip_types_api.h>
-#include <vnet/vnet_msg_enum.h>
-
-#define vl_typedefs /* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun /* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <vnet/vnet_all_api_h.h>
-#undef vl_printfun
-
static vl_api_mfib_itf_flags_t
mfib_api_path_itf_flags_encode (mfib_itf_flags_t flags)
{
diff --git a/src/vnet/vnet_all_api_h.h b/src/vnet/vnet_all_api_h.h
deleted file mode 100644
index 8b50f3946e6..00000000000
--- a/src/vnet/vnet_all_api_h.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * ------------------------------------------------------------------
- * vl_memory_api_h.h - memory API headers, in a specific order.
- *
- * Copyright (c) 2009-2010 Cisco and/or its affiliates. Licensed under the
- * Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the
- * License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- * ------------------------------------------------------------------
- */
-
-/*
- * Add to the bottom of the #include list, or elves will steal your keyboard
- * in the middle of the night!
- *
- * Include current layer (2) last, or an artistic disagreement about message
- * numbering will occur
- */
-
-#ifndef included_from_layer_3
-#include <vlibmemory/vl_memory_api_h.h>
-#endif /* included_from_layer_3 */
-
-#ifdef vl_printfun
-#include <vnet/format_fns.h>
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables: eval: (c-set-style "gnu") End:
- */
diff --git a/src/vnet/vnet_msg_enum.h b/src/vnet/vnet_msg_enum.h
deleted file mode 100644
index 9899471ecd3..00000000000
--- a/src/vnet/vnet_msg_enum.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_vnet_msg_enum_h
-#define included_vnet_msg_enum_h
-
-#include <vppinfra/byte_order.h>
-
-#define vl_msg_id(n,h) n,
-typedef enum
-{
- VL_ILLEGAL_MESSAGE_ID = 0,
-#include <vnet/vnet_all_api_h.h>
- VL_MSG_FIRST_AVAILABLE,
-} vl_msg_id_t;
-#undef vl_msg_id
-
-#endif /* included_vnet_msg_enum_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/src/vpp/api/vpe_all_api_h.h b/src/vpp/api/vpe_all_api_h.h
index 7f8a2265aae..7559208d997 100644
--- a/src/vpp/api/vpe_all_api_h.h
+++ b/src/vpp/api/vpe_all_api_h.h
@@ -20,11 +20,6 @@
/* Include the (first) vlib-api API definition layer */
#include <vlibmemory/vl_memory_api_h.h>
-/* Include the (second) vnet API definition layer */
-#define included_from_layer_3
-#include <vnet/vnet_all_api_h.h>
-#undef included_from_layer_3
-
/* Include the current layer (third) vpp API definition layer */
#include <vpp/api/vpe_types.api.h>
#include <vpp/api/vpe.api.h>