From 03ce46219cd0fabfd4918822c5b9fed9ef880de8 Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Mon, 3 Feb 2020 10:55:09 +0000 Subject: teib: Rename NHRP to TEIB Type: refactor The Tunnel Endpoint Informatiob Base (TEIB) is a better description of what it is (a mapping between tunnel endpoint address, in the overlay, and next-hop address, in the underlay) whereas NHRP is one instanc eof a control protocol that might add such endpoints. Signed-off-by: Neale Ranns Change-Id: Idcb2ad0b6543d3e5d9f6e96f9d14dafb5ce2aa85 --- src/vnet/nhrp/nhrp.api | 57 ----------- src/vnet/nhrp/nhrp.c | 244 ----------------------------------------------- src/vnet/nhrp/nhrp.h | 81 ---------------- src/vnet/nhrp/nhrp_api.c | 138 --------------------------- src/vnet/nhrp/nhrp_cli.c | 194 ------------------------------------- 5 files changed, 714 deletions(-) delete mode 100644 src/vnet/nhrp/nhrp.api delete mode 100644 src/vnet/nhrp/nhrp.c delete mode 100644 src/vnet/nhrp/nhrp.h delete mode 100644 src/vnet/nhrp/nhrp_api.c delete mode 100644 src/vnet/nhrp/nhrp_cli.c (limited to 'src/vnet/nhrp') diff --git a/src/vnet/nhrp/nhrp.api b/src/vnet/nhrp/nhrp.api deleted file mode 100644 index de0630c9c88..00000000000 --- a/src/vnet/nhrp/nhrp.api +++ /dev/null @@ -1,57 +0,0 @@ -/* Hey Emacs use -*- mode: C -*- */ -/* - * Copyright (c) 2019 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. - */ - -option version = "1.0.0"; - -import "vnet/ip/ip_types.api"; -import "vnet/interface_types.api"; - -/** \brief NHRP Entry - @param sw_if_index -*/ -typedef nhrp_entry -{ - vl_api_interface_index_t sw_if_index; - vl_api_address_t peer; - vl_api_address_t nh; - u32 nh_table_id; -}; - -autoreply define nhrp_entry_add_del -{ - u32 client_index; - u32 context; - u8 is_add; - vl_api_nhrp_entry_t entry; -}; - -define nhrp_dump -{ - u32 client_index; - u32 context; -}; - -define nhrp_details -{ - u32 context; - vl_api_nhrp_entry_t entry; -}; - -/* - * Local Variables: - * eval: (c-set-style "gnu") - * End: - */ diff --git a/src/vnet/nhrp/nhrp.c b/src/vnet/nhrp/nhrp.c deleted file mode 100644 index 11d2c2be027..00000000000 --- a/src/vnet/nhrp/nhrp.c +++ /dev/null @@ -1,244 +0,0 @@ -/* - * nhrp.h: next-hop resolution - * - * 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 -#include -#include - -typedef struct nhrp_key_t_ -{ - ip46_address_t nk_peer; - u32 nk_sw_if_index; -} nhrp_key_t; - -struct nhrp_entry_t_ -{ - nhrp_key_t *ne_key; - fib_prefix_t ne_nh; - u32 ne_fib_index; -}; - -static uword *nhrp_db; -static nhrp_entry_t *nhrp_pool; -static nhrp_vft_t *nhrp_vfts; - -#define NHRP_NOTIFY(_ne, _fn) { \ - nhrp_vft_t *_vft; \ - vec_foreach(_vft, nhrp_vfts) { \ - if (_vft->_fn) { \ - _vft->_fn(_ne); \ - } \ - } \ -} - -u32 -nhrp_entry_get_sw_if_index (const nhrp_entry_t * ne) -{ - return (ne->ne_key->nk_sw_if_index); -} - -u32 -nhrp_entry_get_fib_index (const nhrp_entry_t * ne) -{ - return (ne->ne_fib_index); -} - -const ip46_address_t * -nhrp_entry_get_peer (const nhrp_entry_t * ne) -{ - return (&ne->ne_key->nk_peer); -} - -const fib_prefix_t * -nhrp_entry_get_nh (const nhrp_entry_t * ne) -{ - return (&ne->ne_nh); -} - -void -nhrp_entry_adj_stack (const nhrp_entry_t * ne, adj_index_t ai) -{ - adj_midchain_delegate_stack (ai, ne->ne_fib_index, &ne->ne_nh); -} - -nhrp_entry_t * -nhrp_entry_get (index_t nei) -{ - return pool_elt_at_index (nhrp_pool, nei); -} - -nhrp_entry_t * -nhrp_entry_find (u32 sw_if_index, const ip46_address_t * peer) -{ - nhrp_key_t nk = { - .nk_peer = *peer, - .nk_sw_if_index = sw_if_index, - }; - uword *p; - - p = hash_get_mem (nhrp_db, &nk); - - if (NULL != p) - return nhrp_entry_get (p[0]); - - return (NULL); -} - -int -nhrp_entry_add (u32 sw_if_index, - const ip46_address_t * peer, - u32 nh_table_id, const ip46_address_t * nh) -{ - fib_protocol_t fproto; - nhrp_entry_t *ne; - u32 fib_index; - index_t nei; - - fproto = (ip46_address_is_ip4 (nh) ? FIB_PROTOCOL_IP4 : FIB_PROTOCOL_IP6); - - fib_index = fib_table_find (fproto, nh_table_id); - - if (~0 == fib_index) - { - return (VNET_API_ERROR_NO_SUCH_FIB); - } - - ne = nhrp_entry_find (sw_if_index, peer); - - if (NULL == ne) - { - nhrp_key_t nk = { - .nk_peer = *peer, - .nk_sw_if_index = sw_if_index, - }; - nhrp_entry_t *ne; - - pool_get_zero (nhrp_pool, ne); - - nei = ne - nhrp_pool; - ne->ne_key = clib_mem_alloc (sizeof (*ne->ne_key)); - clib_memcpy (ne->ne_key, &nk, sizeof (*ne->ne_key)); - - ip46_address_copy (&ne->ne_nh.fp_addr, nh); - ne->ne_nh.fp_proto = fproto; - ne->ne_nh.fp_len = (ne->ne_nh.fp_proto == FIB_PROTOCOL_IP4 ? 32 : 128); - ne->ne_fib_index = fib_index; - - hash_set_mem (nhrp_db, ne->ne_key, nei); - - NHRP_NOTIFY (ne, nv_added); - } - else - return (VNET_API_ERROR_ENTRY_ALREADY_EXISTS); - - return 0; -} - -int -nhrp_entry_del (u32 sw_if_index, const ip46_address_t * peer) -{ - nhrp_entry_t *ne; - - ne = nhrp_entry_find (sw_if_index, peer); - - if (ne != NULL) - { - hash_unset_mem (nhrp_db, ne->ne_key); - - NHRP_NOTIFY (ne, nv_deleted); - - clib_mem_free (ne->ne_key); - pool_put (nhrp_pool, ne); - } - else - return (VNET_API_ERROR_ENTRY_ALREADY_EXISTS); - - return 0; -} - -u8 * -format_nhrp_entry (u8 * s, va_list * args) -{ - index_t nei = va_arg (*args, index_t); - vnet_main_t *vnm = vnet_get_main (); - nhrp_entry_t *ne; - - ne = nhrp_entry_get (nei); - - s = format (s, "[%d] ", nei); - s = format (s, "%U:", format_vnet_sw_if_index_name, - vnm, ne->ne_key->nk_sw_if_index); - s = format (s, " %U", format_ip46_address, - &ne->ne_key->nk_peer, IP46_TYPE_ANY); - s = format (s, " via [%d]:%U", - fib_table_get_table_id (ne->ne_fib_index, ne->ne_nh.fp_proto), - format_fib_prefix, &ne->ne_nh); - - return (s); -} - -void -nhrp_walk (nhrp_walk_cb_t fn, void *ctx) -{ - index_t nei; - - /* *INDENT-OFF* */ - pool_foreach_index(nei, nhrp_pool, - ({ - fn(nei, ctx); - })); - /* *INDENT-ON* */ -} - -void -nhrp_walk_itf (u32 sw_if_index, nhrp_walk_cb_t fn, void *ctx) -{ - index_t nei; - - /* *INDENT-OFF* */ - pool_foreach_index(nei, nhrp_pool, - ({ - if (sw_if_index == nhrp_entry_get_sw_if_index(nhrp_entry_get(nei))) - fn(nei, ctx); - })); - /* *INDENT-ON* */ -} - -void -nhrp_register (const nhrp_vft_t * vft) -{ - vec_add1 (nhrp_vfts, *vft); -} - -static clib_error_t * -nhrp_init (vlib_main_t * vm) -{ - nhrp_db = hash_create_mem (0, sizeof (nhrp_key_t), sizeof (u32)); - - return (NULL); -} - -VLIB_INIT_FUNCTION (nhrp_init); - -/* - * fd.io coding-style-patch-verification: ON - * - * Local Variables: - * eval: (c-set-style "gnu") - * End: - */ diff --git a/src/vnet/nhrp/nhrp.h b/src/vnet/nhrp/nhrp.h deleted file mode 100644 index 5b46b0d8a92..00000000000 --- a/src/vnet/nhrp/nhrp.h +++ /dev/null @@ -1,81 +0,0 @@ -/* - * nhrp.h: next-hop resolution - * - * 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 __NHRP_H__ -#define __NHRP_H__ - -#include - -/** - * An NHRP entry represents the mapping between a peer on an interface in the overlay - * and a next-hop address in the underlay. - * i.e. there's a multipoint tunnel providing the overlay (henace a peer on - * that tunnel) which is reachable via 'tunnel destination' address in the - * underlay. - */ -typedef struct nhrp_entry_t_ nhrp_entry_t; - -/** accessors for the opaque struct */ -extern u32 nhrp_entry_get_sw_if_index (const nhrp_entry_t * ne); -extern u32 nhrp_entry_get_fib_index (const nhrp_entry_t * ne); -extern const ip46_address_t *nhrp_entry_get_peer (const nhrp_entry_t * ne); -extern const fib_prefix_t *nhrp_entry_get_nh (const nhrp_entry_t * ne); -extern u8 *format_nhrp_entry (u8 * s, va_list * args); - -/** - * Create a new NHRP entry - */ -extern int nhrp_entry_add (u32 sw_if_index, - const ip46_address_t * peer, - u32 nh_table_id, const ip46_address_t * nh); - -extern int nhrp_entry_del (u32 sw_if_index, const ip46_address_t * peer); - -extern nhrp_entry_t *nhrp_entry_find (u32 sw_if_index, - const ip46_address_t * peer); -extern nhrp_entry_t *nhrp_entry_get (index_t nei); - -extern void nhrp_entry_adj_stack (const nhrp_entry_t * ne, adj_index_t ai); - -typedef walk_rc_t (*nhrp_walk_cb_t) (index_t nei, void *ctx); - -extern void nhrp_walk (nhrp_walk_cb_t fn, void *ctx); -extern void nhrp_walk_itf (u32 sw_if_index, nhrp_walk_cb_t fn, void *ctx); - -/** - * Notifications for the creation and deletion of NHRP entries - */ -typedef void (*nhrp_entry_added_t) (const nhrp_entry_t * ne); -typedef void (*nhrp_entry_deleted_t) (const nhrp_entry_t * ne); - -typedef struct nhrp_vft_t_ -{ - nhrp_entry_added_t nv_added; - nhrp_entry_deleted_t nv_deleted; -} nhrp_vft_t; - -extern void nhrp_register (const nhrp_vft_t * vft); - -#endif - -/* - * fd.io coding-style-patch-verification: ON - * - * Local Variables: - * eval: (c-set-style "gnu") - * End: - */ diff --git a/src/vnet/nhrp/nhrp_api.c b/src/vnet/nhrp/nhrp_api.c deleted file mode 100644 index d36adf99e14..00000000000 --- a/src/vnet/nhrp/nhrp_api.c +++ /dev/null @@ -1,138 +0,0 @@ -/* - *------------------------------------------------------------------ - * nhrp_api.c - nhrp api - * - * 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 -#include - -#include -#include -#include -#include - -/* define message IDs */ -#include -#include -#include - -static u32 nhrp_base_msg_id; -#define REPLY_MSG_ID_BASE nhrp_base_msg_id - -#include - -static void -vl_api_nhrp_entry_add_del_t_handler (vl_api_nhrp_entry_add_del_t * mp) -{ - vl_api_nhrp_entry_add_del_reply_t *rmp; - ip46_address_t peer, nh; - int rv; - - VALIDATE_SW_IF_INDEX ((&mp->entry)); - - ip_address_decode (&mp->entry.peer, &peer); - ip_address_decode (&mp->entry.nh, &nh); - - if (mp->is_add) - rv = nhrp_entry_add (ntohl (mp->entry.sw_if_index), &peer, - ntohl (mp->entry.nh_table_id), &nh); - else - rv = nhrp_entry_del (ntohl (mp->entry.sw_if_index), &peer); - - BAD_SW_IF_INDEX_LABEL; - - REPLY_MACRO (VL_API_NHRP_ENTRY_ADD_DEL_REPLY); -} - -typedef struct vl_api_nhrp_send_t_ -{ - vl_api_registration_t *reg; - u32 context; -} vl_api_nhrp_send_t; - -static walk_rc_t -vl_api_nhrp_send_one (index_t nei, void *arg) -{ - vl_api_nhrp_details_t *mp; - vl_api_nhrp_send_t *ctx = arg; - const nhrp_entry_t *ne; - const fib_prefix_t *pfx; - - mp = vl_msg_api_alloc (sizeof (*mp)); - clib_memset (mp, 0, sizeof (*mp)); - mp->_vl_msg_id = ntohs (VL_API_NHRP_DETAILS + REPLY_MSG_ID_BASE); - mp->context = ctx->context; - - ne = nhrp_entry_get (nei); - pfx = nhrp_entry_get_nh (ne); - - ip_address_encode (nhrp_entry_get_peer (ne), IP46_TYPE_ANY, - &mp->entry.peer); - ip_address_encode (&pfx->fp_addr, IP46_TYPE_ANY, &mp->entry.nh); - mp->entry.nh_table_id = - htonl (fib_table_get_table_id - (nhrp_entry_get_fib_index (ne), pfx->fp_proto)); - mp->entry.sw_if_index = htonl (nhrp_entry_get_sw_if_index (ne)); - - vl_api_send_msg (ctx->reg, (u8 *) mp); - - return (WALK_CONTINUE); -} - -static void -vl_api_nhrp_dump_t_handler (vl_api_nhrp_dump_t * mp) -{ - vl_api_registration_t *reg; - - reg = vl_api_client_index_to_registration (mp->client_index); - if (!reg) - return; - - vl_api_nhrp_send_t ctx = { - .reg = reg, - .context = mp->context, - }; - - nhrp_walk (vl_api_nhrp_send_one, &ctx); -} - -/* - * nhrp_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() - */ -#include - -static clib_error_t * -nhrp_api_hookup (vlib_main_t * vm) -{ - nhrp_base_msg_id = setup_message_id_table (); - - return (NULL); -} - -VLIB_API_INIT_FUNCTION (nhrp_api_hookup); - -/* - * fd.io coding-style-patch-verification: ON - * - * Local Variables: - * eval: (c-set-style "gnu") - * End: - */ diff --git a/src/vnet/nhrp/nhrp_cli.c b/src/vnet/nhrp/nhrp_cli.c deleted file mode 100644 index 654c750197e..00000000000 --- a/src/vnet/nhrp/nhrp_cli.c +++ /dev/null @@ -1,194 +0,0 @@ -/* - * Copyright (c) 2019 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 - -static clib_error_t * -nhrp_add (vlib_main_t * vm, - unformat_input_t * input, vlib_cli_command_t * cmd) -{ - unformat_input_t _line_input, *line_input = &_line_input; - ip46_address_t peer = ip46_address_initializer; - ip46_address_t nh = ip46_address_initializer; - u32 sw_if_index, nh_table_id; - clib_error_t *error = NULL; - int rv; - - sw_if_index = ~0; - nh_table_id = 0; - - /* Get a line of input. */ - if (!unformat_user (input, unformat_line_input, line_input)) - return 0; - - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (line_input, "%U", unformat_vnet_sw_interface, - vnet_get_main (), &sw_if_index)) - ; - else if (unformat (line_input, "peer %U", unformat_ip46_address, &peer)) - ; - else if (unformat (line_input, "nh %U", unformat_ip46_address, &nh)) - ; - else if (unformat (line_input, "nh-table-id %d", &nh_table_id)) - ; - else - { - error = clib_error_return (0, "unknown input `%U'", - format_unformat_error, line_input); - goto done; - } - } - - if (~0 == sw_if_index) - { - error = clib_error_return (0, "interface required'", - format_unformat_error, line_input); - goto done; - } - if (ip46_address_is_zero (&peer)) - { - error = clib_error_return (0, "peer required'", - format_unformat_error, line_input); - goto done; - } - if (ip46_address_is_zero (&nh)) - { - error = clib_error_return (0, "next-hop required'", - format_unformat_error, line_input); - goto done; - } - - rv = nhrp_entry_add (sw_if_index, &peer, nh_table_id, &nh); - - if (rv) - { - error = clib_error_return_code (NULL, rv, 0, - "NRHP error", - format_unformat_error, line_input); - } - -done: - unformat_free (line_input); - - return error; -} - -/* *INDENT-OFF* */ -VLIB_CLI_COMMAND (nhrp_create_command, static) = { - .path = "create nhrp", - .short_help = "create nhrp peer nh [nh-table-id ]", - .function = nhrp_add, -}; -/* *INDENT-ON* */ - -static clib_error_t * -nhrp_del (vlib_main_t * vm, - unformat_input_t * input, vlib_cli_command_t * cmd) -{ - unformat_input_t _line_input, *line_input = &_line_input; - ip46_address_t peer = ip46_address_initializer; - clib_error_t *error = NULL; - u32 sw_if_index; - int rv; - - sw_if_index = ~0; - - /* Get a line of input. */ - if (!unformat_user (input, unformat_line_input, line_input)) - return 0; - - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (line_input, "%U", unformat_vnet_sw_interface, - vnet_get_main (), &sw_if_index)) - ; - else if (unformat (line_input, "peer %U", unformat_ip46_address, &peer)) - ; - else - { - error = clib_error_return (0, "unknown input `%U'", - format_unformat_error, line_input); - goto done; - } - } - - if (~0 == sw_if_index) - { - error = clib_error_return (0, "interface required'", - format_unformat_error, line_input); - } - if (ip46_address_is_zero (&peer)) - { - error = clib_error_return (0, "peer required'", - format_unformat_error, line_input); - goto done; - } - - rv = nhrp_entry_del (sw_if_index, &peer); - - if (rv) - { - error = clib_error_return_code (NULL, rv, 0, - "NRHP error", - format_unformat_error, line_input); - } - -done: - unformat_free (line_input); - - return error; -} - -/* *INDENT-OFF* */ -VLIB_CLI_COMMAND (nhrp_delete_command, static) = { - .path = "delete nhrp", - .short_help = "delete nhrp peer ", - .function = nhrp_del, -}; -/* *INDENT-ON* */ - -static walk_rc_t -nhrp_show_one (index_t nei, void *ctx) -{ - vlib_cli_output (ctx, "%U", format_nhrp_entry, nei); - - return (WALK_CONTINUE); -} - - -static clib_error_t * -nhrp_show (vlib_main_t * vm, - unformat_input_t * input, vlib_cli_command_t * cmd) -{ - nhrp_walk (nhrp_show_one, vm); - return (NULL); -} - -/* *INDENT-OFF* */ -VLIB_CLI_COMMAND (nhrp_show_command, static) = { - .path = "show nhrp", - .short_help = "show nhrp", - .function = nhrp_show, -}; -/* *INDENT-ON* */ - -/* - * fd.io coding-style-patch-verification: ON - * - * Local Variables: - * eval: (c-set-style "gnu") - * End: - */ -- cgit 1.2.3-korg