diff options
| -rw-r--r-- | MAINTAINERS | 5 | ||||
| -rw-r--r-- | src/plugins/l2e/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/l2e/l2e_all_api_h.h | 17 | ||||
| -rw-r--r-- | src/plugins/l2e/l2e_api.c | 74 | ||||
| -rw-r--r-- | src/plugins/l2e/l2e_msg_enum.h | 28 |
5 files changed, 9 insertions, 117 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 75230890be5..b31ee737f37 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -533,6 +533,11 @@ I: svs M: Neale Ranns <nranns@cisco.com> F: src/plugins/svs/ +LAN Emulation +I: l2e +M: Neale Ranns <nranns@cisco.com> +F: src/plugins/l2e/ + THE REST I: misc C: Contact vpp-dev Mailing List <vpp-dev@fd.io> diff --git a/src/plugins/l2e/CMakeLists.txt b/src/plugins/l2e/CMakeLists.txt index 3b472356361..2bfb05a43e6 100644 --- a/src/plugins/l2e/CMakeLists.txt +++ b/src/plugins/l2e/CMakeLists.txt @@ -25,6 +25,4 @@ add_vpp_plugin(l2e INSTALL_HEADERS l2e.h - l2e_all_api_h.h - l2e_msg_enum.h ) diff --git a/src/plugins/l2e/l2e_all_api_h.h b/src/plugins/l2e/l2e_all_api_h.h deleted file mode 100644 index 44fad6bf64e..00000000000 --- a/src/plugins/l2e/l2e_all_api_h.h +++ /dev/null @@ -1,17 +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. - */ -/* Include the generated file, see BUILT_SOURCES in Makefile.am */ -#include <l2e/l2e.api.h> - diff --git a/src/plugins/l2e/l2e_api.c b/src/plugins/l2e/l2e_api.c index b42fef3d3d7..fe2fb7ee06e 100644 --- a/src/plugins/l2e/l2e_api.c +++ b/src/plugins/l2e/l2e_api.c @@ -30,32 +30,11 @@ #include <vlibmemory/api.h> /* define message IDs */ -#include <l2e/l2e_msg_enum.h> - -#define vl_typedefs /* define message structures */ -#include <l2e/l2e_all_api_h.h> -#undef vl_typedefs - -#define vl_endianfun /* define message structures */ -#include <l2e/l2e_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 <l2e/l2e_all_api_h.h> -#undef vl_printfun - -/* Get the API version number */ -#define vl_api_version(n,v) static u32 api_version=(v); -#include <l2e/l2e_all_api_h.h> -#undef vl_api_version +#include <l2e/l2e.api_enum.h> +#include <l2e/l2e.api_types.h> #include <vlibapi/api_helper_macros.h> -#define foreach_l2e_api_msg \ -_(L2_EMULATION, l2_emulation) - #define L2E_MSG_BASE l2em->msg_id_base static void @@ -79,60 +58,15 @@ vl_api_l2_emulation_t_handler (vl_api_l2_emulation_t * mp) REPLY_MACRO (VL_API_L2_EMULATION_REPLY + L2E_MSG_BASE); } -/* - * l2_api_hookup - * Add vpe's API message handlers to the table. - * vlib has already mapped shared memory and - * added the client registration handlers. - * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process() - */ -#define vl_msg_name_crc_list -#include <l2e/l2e_all_api_h.h> -#undef vl_msg_name_crc_list - -static void -setup_message_id_table (api_main_t * am) -{ - l2_emulation_main_t *l2em = &l2_emulation_main; -#define _(id,n,crc) \ - vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + L2E_MSG_BASE); - foreach_vl_msg_name_crc_l2e; -#undef _ -} - -static void -l2e_api_hookup (vlib_main_t * vm) -{ - l2_emulation_main_t *l2em = &l2_emulation_main; -#define _(N,n) \ - vl_msg_api_set_handlers(VL_API_##N + L2E_MSG_BASE, \ - #n, \ - vl_api_##n##_t_handler, \ - vl_noop_handler, \ - vl_api_##n##_t_endian, \ - vl_api_##n##_t_print, \ - sizeof(vl_api_##n##_t), 1); - foreach_l2e_api_msg; -#undef _ -} - +#include <l2e/l2e.api.c> static clib_error_t * l2e_init (vlib_main_t * vm) { - api_main_t *am = &api_main; l2_emulation_main_t *l2em = &l2_emulation_main; - u8 *name = format (0, "l2e_%08x%c", api_version, 0); /* Ask for a correctly-sized block of API message decode slots */ - l2em->msg_id_base = vl_msg_api_get_msg_ids ((char *) name, - VL_MSG_FIRST_AVAILABLE); - - l2e_api_hookup (vm); - - /* Add our API messages to the global name_crc hash table */ - setup_message_id_table (am); + l2em->msg_id_base = setup_message_id_table (); - vec_free (name); return (NULL); } diff --git a/src/plugins/l2e/l2e_msg_enum.h b/src/plugins/l2e/l2e_msg_enum.h deleted file mode 100644 index 85c8328c703..00000000000 --- a/src/plugins/l2e/l2e_msg_enum.h +++ /dev/null @@ -1,28 +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_l2e_msg_enum_h -#define included_l2e_msg_enum_h - -#include <vppinfra/byte_order.h> - -#define vl_msg_id(n,h) n, -typedef enum { -#include <l2e/l2e_all_api_h.h> - /* We'll want to know how many messages IDs we need... */ - VL_MSG_FIRST_AVAILABLE, -} vl_msg_id_t; -#undef vl_msg_id - -#endif |