aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFilip Tehlar <ftehlar@cisco.com>2017-02-22 18:09:49 +0100
committerFlorin Coras <florin.coras@gmail.com>2017-02-22 19:17:34 +0000
commit974cdc6faacc49ef393eeea6e4c9643f767d2792 (patch)
tree90e76314952a95e39b114fc3068bc4834536eaea
parent04f8d3fe25ab8f7088d6817350903197915e7669 (diff)
Fix LISP and ONE crc marcos
Change-Id: Icd0dba04d8929456228136d1f25c459bffcc6a7a Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
-rw-r--r--Makefile1
-rw-r--r--src/vnet/lisp-cp/lisp_api.c2
-rw-r--r--src/vnet/lisp-cp/one.api19
-rw-r--r--src/vnet/lisp-cp/one_api.c16
4 files changed, 27 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 8122c6a4c38..9161a384536 100644
--- a/Makefile
+++ b/Makefile
@@ -368,5 +368,6 @@ ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
endif
$(call banner,"Building $(PKG) packages")
@make pkg-$(PKG)
+ @make test
diff --git a/src/vnet/lisp-cp/lisp_api.c b/src/vnet/lisp-cp/lisp_api.c
index 6a8b4cc9687..d91f9907752 100644
--- a/src/vnet/lisp-cp/lisp_api.c
+++ b/src/vnet/lisp-cp/lisp_api.c
@@ -1278,7 +1278,7 @@ static void
setup_message_id_table (api_main_t * am)
{
#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
- foreach_vl_msg_name_crc_one;
+ foreach_vl_msg_name_crc_lisp;
#undef _
}
diff --git a/src/vnet/lisp-cp/one.api b/src/vnet/lisp-cp/one.api
index 38937a3eda9..14f6d47fd15 100644
--- a/src/vnet/lisp-cp/one.api
+++ b/src/vnet/lisp-cp/one.api
@@ -13,6 +13,13 @@
* limitations under the License.
*/
+typeonly manual_print manual_endian define one_local_locator
+{
+ u32 sw_if_index;
+ u8 priority;
+ u8 weight;
+};
+
/** \brief add or delete locator_set
@param client_index - opaque cookie to identify the sender
@param context - sender context, to match reply w/ request
@@ -28,7 +35,7 @@ manual_endian manual_print define one_add_del_locator_set
u8 is_add;
u8 locator_set_name[64];
u32 locator_num;
- vl_api_local_locator_t locators[locator_num];
+ vl_api_one_local_locator_t locators[locator_num];
};
/** \brief Reply for locator_set add/del
@@ -398,6 +405,14 @@ define show_one_map_request_mode_reply
u8 mode;
};
+typeonly manual_endian manual_print define one_remote_locator
+{
+ u8 is_ip4;
+ u8 priority;
+ u8 weight;
+ u8 addr[16];
+};
+
/** \brief add or delete remote static mapping
@param client_index - opaque cookie to identify the sender
@param context - sender context, to match reply w/ request
@@ -430,7 +445,7 @@ manual_print manual_endian define one_add_del_remote_mapping
u8 seid[16];
u8 seid_len;
u32 rloc_num;
- vl_api_remote_locator_t rlocs[rloc_num];
+ vl_api_one_remote_locator_t rlocs[rloc_num];
};
/** \brief Reply for one_add_del_remote_mapping
diff --git a/src/vnet/lisp-cp/one_api.c b/src/vnet/lisp-cp/one_api.c
index 8fdf0821982..d0a9309b368 100644
--- a/src/vnet/lisp-cp/one_api.c
+++ b/src/vnet/lisp-cp/one_api.c
@@ -27,10 +27,10 @@
#include <vnet/vnet_msg_enum.h>
-#define vl_api_remote_locator_t_endian vl_noop_handler
-#define vl_api_remote_locator_t_print vl_noop_handler
-#define vl_api_local_locator_t_endian vl_noop_handler
-#define vl_api_local_locator_t_print vl_noop_handler
+#define vl_api_one_remote_locator_t_endian vl_noop_handler
+#define vl_api_one_remote_locator_t_print vl_noop_handler
+#define vl_api_one_local_locator_t_endian vl_noop_handler
+#define vl_api_one_local_locator_t_print vl_noop_handler
#define vl_api_one_add_del_locator_set_t_endian vl_noop_handler
#define vl_api_one_add_del_locator_set_t_print vl_noop_handler
@@ -92,11 +92,11 @@ _(ONE_USE_PETR, one_use_petr) \
_(SHOW_ONE_USE_PETR, show_one_use_petr) \
static locator_t *
-unformat_one_locs (vl_api_remote_locator_t * rmt_locs, u32 rloc_num)
+unformat_one_locs (vl_api_one_remote_locator_t * rmt_locs, u32 rloc_num)
{
u32 i;
locator_t *locs = 0, loc;
- vl_api_remote_locator_t *r;
+ vl_api_one_remote_locator_t *r;
for (i = 0; i < rloc_num; i++)
{
@@ -121,7 +121,7 @@ vl_api_one_add_del_locator_set_t_handler (vl_api_one_add_del_locator_set_t *
int rv = 0;
vnet_lisp_add_del_locator_set_args_t _a, *a = &_a;
locator_t locator;
- vl_api_local_locator_t *ls_loc;
+ vl_api_one_local_locator_t *ls_loc;
u32 ls_index = ~0, locator_num;
u8 *locator_name = NULL;
int i;
@@ -1271,7 +1271,7 @@ static void
setup_message_id_table (api_main_t * am)
{
#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
- foreach_vl_msg_name_crc_lisp;
+ foreach_vl_msg_name_crc_one;
#undef _
}