From 62bab658e7ca782c8d35dacacfa5906ddbcaf437 Mon Sep 17 00:00:00 2001 From: Ole Troan Date: Thu, 1 Mar 2018 13:49:00 +0100 Subject: [PATCH] STN: Fix stn_rules_dump/details to follow API convention Change-Id: I94f6c35bf751d25ca7fe7c67054e676a3ad2241b Signed-off-by: Ole Troan --- src/plugins/stn/stn.api | 2 +- src/plugins/stn/stn_api.c | 10 +++++----- src/plugins/stn/stn_test.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/plugins/stn/stn.api b/src/plugins/stn/stn.api index 97731b3c25e..a3753a9abf9 100644 --- a/src/plugins/stn/stn.api +++ b/src/plugins/stn/stn.api @@ -53,7 +53,7 @@ define stn_rules_dump { @param ip_address - IP address @param sw_if_index - Interface index */ -define stn_rule_details { +define stn_rules_details { u32 context; u8 is_ip4; u8 ip_address[16]; diff --git a/src/plugins/stn/stn_api.c b/src/plugins/stn/stn_api.c index 2f52c74659f..8f9e2ea41ee 100644 --- a/src/plugins/stn/stn_api.c +++ b/src/plugins/stn/stn_api.c @@ -101,15 +101,15 @@ vl_api_stn_add_del_rule_t_handler (vl_api_stn_add_del_rule_t * mp) } static void -send_stn_rule_details (stn_rule_t * r, vl_api_registration_t * reg, - u32 context) +send_stn_rules_details (stn_rule_t * r, vl_api_registration_t * reg, + u32 context) { - vl_api_stn_rule_details_t *rmp; + vl_api_stn_rules_details_t *rmp; rmp = vl_msg_api_alloc (sizeof (*rmp)); memset (rmp, 0, sizeof (*rmp)); rmp->_vl_msg_id = - clib_host_to_net_u16 (VL_API_STN_RULE_DETAILS + stn_main.msg_id_base); + clib_host_to_net_u16 (VL_API_STN_RULES_DETAILS + stn_main.msg_id_base); if (ip46_address_is_ip4 (&r->address)) { @@ -140,7 +140,7 @@ vl_api_stn_rules_dump_t_handler (vl_api_stn_rules_dump_t * mp) /* *INDENT-OFF* */ pool_foreach (r, stn->rules,({ - send_stn_rule_details (r, reg, mp->context); + send_stn_rules_details (r, reg, mp->context); })); /* *INDENT-ON* */ } diff --git a/src/plugins/stn/stn_test.c b/src/plugins/stn/stn_test.c index a4497cd22ab..8fdbeb926b6 100644 --- a/src/plugins/stn/stn_test.c +++ b/src/plugins/stn/stn_test.c @@ -67,7 +67,7 @@ stn_test_main_t stn_test_main; * we just generated */ #define foreach_stn_api_reply_msg \ -_(STN_RULE_DETAILS, stn_rule_details) +_(STN_RULES_DETAILS, stn_rules_details) static int api_stn_rules_dump (vat_main_t * vam) @@ -102,7 +102,7 @@ api_stn_rules_dump (vat_main_t * vam) } static void -vl_api_stn_rule_details_t_handler (vl_api_stn_rule_details_t * mp) +vl_api_stn_rules_details_t_handler (vl_api_stn_rules_details_t * mp) { vat_main_t *vam = stn_test_main.vat_main; fformat (vam->ofp, "addr: %U sw_if_index: %u\n", -- 2.16.6