X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fvnet%2Fteib%2Fteib_api.c;fp=src%2Fvnet%2Fnhrp%2Fnhrp_api.c;h=a51dd6d0f7fde5d0bccb431a43794c5ab9c16f71;hb=03ce46219cd0fabfd4918822c5b9fed9ef880de8;hp=d36adf99e1449fa84ee6837ff3aabdf93853372b;hpb=0860b2e19365c092f10dd1ce639caaded0e87ded;p=vpp.git

diff --git a/src/vnet/nhrp/nhrp_api.c b/src/vnet/teib/teib_api.c
similarity index 64%
rename from src/vnet/nhrp/nhrp_api.c
rename to src/vnet/teib/teib_api.c
index d36adf99e14..a51dd6d0f7f 100644
--- a/src/vnet/nhrp/nhrp_api.c
+++ b/src/vnet/teib/teib_api.c
@@ -1,6 +1,6 @@
 /*
  *------------------------------------------------------------------
- * nhrp_api.c - nhrp api
+ * teib_api.c - teib api
  *
  * Copyright (c) 2016 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,24 +21,24 @@
 #include <vlibmemory/api.h>
 
 #include <vnet/api_errno.h>
-#include <vnet/nhrp/nhrp.h>
+#include <vnet/teib/teib.h>
 #include <vnet/ip/ip_types_api.h>
 #include <vnet/fib/fib_table.h>
 
 /* define message IDs */
 #include <vnet/format_fns.h>
-#include <vnet/nhrp/nhrp.api_enum.h>
-#include <vnet/nhrp/nhrp.api_types.h>
+#include <vnet/teib/teib.api_enum.h>
+#include <vnet/teib/teib.api_types.h>
 
-static u32 nhrp_base_msg_id;
-#define REPLY_MSG_ID_BASE nhrp_base_msg_id
+static u32 teib_base_msg_id;
+#define REPLY_MSG_ID_BASE teib_base_msg_id
 
 #include <vlibapi/api_helper_macros.h>
 
 static void
-vl_api_nhrp_entry_add_del_t_handler (vl_api_nhrp_entry_add_del_t * mp)
+vl_api_teib_entry_add_del_t_handler (vl_api_teib_entry_add_del_t * mp)
 {
-  vl_api_nhrp_entry_add_del_reply_t *rmp;
+  vl_api_teib_entry_add_del_reply_t *rmp;
   ip46_address_t peer, nh;
   int rv;
 
@@ -48,45 +48,45 @@ vl_api_nhrp_entry_add_del_t_handler (vl_api_nhrp_entry_add_del_t * mp)
   ip_address_decode (&mp->entry.nh, &nh);
 
   if (mp->is_add)
-    rv = nhrp_entry_add (ntohl (mp->entry.sw_if_index), &peer,
+    rv = teib_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);
+    rv = teib_entry_del (ntohl (mp->entry.sw_if_index), &peer);
 
   BAD_SW_IF_INDEX_LABEL;
 
-  REPLY_MACRO (VL_API_NHRP_ENTRY_ADD_DEL_REPLY);
+  REPLY_MACRO (VL_API_TEIB_ENTRY_ADD_DEL_REPLY);
 }
 
-typedef struct vl_api_nhrp_send_t_
+typedef struct vl_api_teib_send_t_
 {
   vl_api_registration_t *reg;
   u32 context;
-} vl_api_nhrp_send_t;
+} vl_api_teib_send_t;
 
 static walk_rc_t
-vl_api_nhrp_send_one (index_t nei, void *arg)
+vl_api_teib_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;
+  vl_api_teib_details_t *mp;
+  vl_api_teib_send_t *ctx = arg;
+  const teib_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->_vl_msg_id = ntohs (VL_API_TEIB_DETAILS + REPLY_MSG_ID_BASE);
   mp->context = ctx->context;
 
-  ne = nhrp_entry_get (nei);
-  pfx = nhrp_entry_get_nh (ne);
+  ne = teib_entry_get (nei);
+  pfx = teib_entry_get_nh (ne);
 
-  ip_address_encode (nhrp_entry_get_peer (ne), IP46_TYPE_ANY,
+  ip_address_encode (teib_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));
+	   (teib_entry_get_fib_index (ne), pfx->fp_proto));
+  mp->entry.sw_if_index = htonl (teib_entry_get_sw_if_index (ne));
 
   vl_api_send_msg (ctx->reg, (u8 *) mp);
 
@@ -94,7 +94,7 @@ vl_api_nhrp_send_one (index_t nei, void *arg)
 }
 
 static void
-vl_api_nhrp_dump_t_handler (vl_api_nhrp_dump_t * mp)
+vl_api_teib_dump_t_handler (vl_api_teib_dump_t * mp)
 {
   vl_api_registration_t *reg;
 
@@ -102,32 +102,32 @@ vl_api_nhrp_dump_t_handler (vl_api_nhrp_dump_t * mp)
   if (!reg)
     return;
 
-  vl_api_nhrp_send_t ctx = {
+  vl_api_teib_send_t ctx = {
     .reg = reg,
     .context = mp->context,
   };
 
-  nhrp_walk (vl_api_nhrp_send_one, &ctx);
+  teib_walk (vl_api_teib_send_one, &ctx);
 }
 
 /*
- * nhrp_api_hookup
+ * teib_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 <vnet/nhrp/nhrp.api.c>
+#include <vnet/teib/teib.api.c>
 
 static clib_error_t *
-nhrp_api_hookup (vlib_main_t * vm)
+teib_api_hookup (vlib_main_t * vm)
 {
-  nhrp_base_msg_id = setup_message_id_table ();
+  teib_base_msg_id = setup_message_id_table ();
 
   return (NULL);
 }
 
-VLIB_API_INIT_FUNCTION (nhrp_api_hookup);
+VLIB_API_INIT_FUNCTION (teib_api_hookup);
 
 /*
  * fd.io coding-style-patch-verification: ON