Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
STN: Fix stn_rules_dump/details to follow API convention
[vpp.git]
/
src
/
plugins
/
stn
/
stn_api.c
diff --git
a/src/plugins/stn/stn_api.c
b/src/plugins/stn/stn_api.c
index
02ea29b
..
8f9e2ea
100644
(file)
--- a/
src/plugins/stn/stn_api.c
+++ b/
src/plugins/stn/stn_api.c
@@
-22,34
+22,27
@@
#include <vppinfra/byte_order.h>
/* define message IDs */
#include <vppinfra/byte_order.h>
/* define message IDs */
-#define vl_msg_id(n,h) n,
-typedef enum
-{
-#include <stn/stn.api.h>
- /* We'll want to know how many messages IDs we need... */
- VL_MSG_FIRST_AVAILABLE,
-} vl_msg_id_t;
-#undef vl_msg_id
+#include <stn/stn_msg_enum.h>
/* define message structures */
#define vl_typedefs
/* define message structures */
#define vl_typedefs
-#include <stn/stn
.api
.h>
+#include <stn/stn
_all_api_h
.h>
#undef vl_typedefs
/* define generated endian-swappers */
#define vl_endianfun
#undef vl_typedefs
/* define generated endian-swappers */
#define vl_endianfun
-#include <stn/stn
.api
.h>
+#include <stn/stn
_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
#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 <stn/stn
.api
.h>
+#include <stn/stn
_all_api_h
.h>
#undef vl_printfun
/* Get the API version number */
#define vl_api_version(n,v) static u32 api_version=(v);
#undef vl_printfun
/* Get the API version number */
#define vl_api_version(n,v) static u32 api_version=(v);
-#include <
nat/nat
_all_api_h.h>
+#include <
stn/stn
_all_api_h.h>
#undef vl_api_version
#define REPLY_MSG_ID_BASE stn_main.msg_id_base
#undef vl_api_version
#define REPLY_MSG_ID_BASE stn_main.msg_id_base
@@
-93,63
+86,61
@@
vl_api_stn_add_del_rule_t_handler (vl_api_stn_add_del_rule_t * mp)
if (mp->is_ip4)
{
ip4_address_t a;
if (mp->is_ip4)
{
ip4_address_t a;
- memcpy
(&a, mp->ip_address, sizeof
(a));
- ip46_address_set_ip4(&args.address, &a);
+ memcpy
(&a, mp->ip_address, sizeof
(a));
+ ip46_address_set_ip4
(&args.address, &a);
}
else
}
else
- memcpy
(&args.address.ip6, mp->ip_address, sizeof
(ip6_address_t));
+ memcpy
(&args.address.ip6, mp->ip_address, sizeof
(ip6_address_t));
- args.sw_if_index = clib_net_to_host_u32(mp->sw_if_index);
+ args.sw_if_index = clib_net_to_host_u32
(mp->sw_if_index);
args.del = !mp->is_add;
args.del = !mp->is_add;
- rv = stn_rule_add_del(&args);
+ rv = stn_rule_add_del
(&args);
REPLY_MACRO (VL_API_STN_ADD_DEL_RULE_REPLY);
}
static void
REPLY_MACRO (VL_API_STN_ADD_DEL_RULE_REPLY);
}
static void
-send_stn_rule (stn_rule_t *r, unix_shared_memory_queue_t *q, 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_rule
s
_details_t *rmp;
- rmp =
- vl_msg_api_alloc (sizeof (*rmp));
+ rmp = vl_msg_api_alloc (sizeof (*rmp));
memset (rmp, 0, sizeof (*rmp));
rmp->_vl_msg_id =
memset (rmp, 0, sizeof (*rmp));
rmp->_vl_msg_id =
-
clib_host_to_net_u32 (VL_API_STN_RULES_DUMP
+ 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))
+ if (ip46_address_is_ip4
(&r->address))
{
{
- clib_memcpy
(rmp->ip_address, &r->address.ip4, sizeof
(ip4_address_t));
+ clib_memcpy
(rmp->ip_address, &r->address.ip4, sizeof
(ip4_address_t));
rmp->is_ip4 = 1;
}
else
{
rmp->is_ip4 = 1;
}
else
{
- clib_memcpy
(rmp->ip_address, &r->address.ip6, sizeof
(ip6_address_t));
+ clib_memcpy
(rmp->ip_address, &r->address.ip6, sizeof
(ip6_address_t));
}
rmp->context = context;
}
rmp->context = context;
- rmp->sw_if_index = clib_host_to_net_u32(r->sw_if_index);
+ rmp->sw_if_index = clib_host_to_net_u32
(r->sw_if_index);
- vl_
msg_api_send_shmem (q, (u8 *) &
rmp);
+ vl_
api_send_msg (reg, (u8 *)
rmp);
}
static void
}
static void
-vl_api_stn_rules_dump_t_handler (vl_api_stn_rules_dump_t *mp)
+vl_api_stn_rules_dump_t_handler (vl_api_stn_rules_dump_t *
mp)
{
{
-
unix_shared_memory_queue_t *q
;
+
vl_api_registration_t *reg
;
stn_main_t *stn = &stn_main;
stn_rule_t *r;
stn_main_t *stn = &stn_main;
stn_rule_t *r;
-
q = vl_api_client_index_to_input_queue
(mp->client_index);
- if (
q
== 0)
+
reg = vl_api_client_index_to_registration
(mp->client_index);
+ if (
reg
== 0)
return;
/* *INDENT-OFF* */
return;
/* *INDENT-OFF* */
- pool_foreach (r, stn->rules,
- ({
-
- send_stn_rule (r, q, mp->context);
+ pool_foreach (r, stn->rules,({
+ send_stn_rules_details (r, reg, mp->context);
}));
/* *INDENT-ON* */
}
}));
/* *INDENT-ON* */
}
@@
-215,8
+206,8
@@
stn_api_init (vlib_main_t * vm, stn_main_t * sm)
name = format (0, "stn_%08x%c", api_version, 0);
/* Ask for a correctly-sized block of API message decode slots */
name = format (0, "stn_%08x%c", api_version, 0);
/* Ask for a correctly-sized block of API message decode slots */
- sm->msg_id_base =
-
vl_msg_api_get_msg_ids ((char *) name,
VL_MSG_FIRST_AVAILABLE);
+ sm->msg_id_base =
vl_msg_api_get_msg_ids ((char *) name,
+
VL_MSG_FIRST_AVAILABLE);
error = stn_plugin_api_hookup (vm);
error = stn_plugin_api_hookup (vm);
@@
-229,3
+220,11
@@
stn_api_init (vlib_main_t * vm, stn_main_t * sm)
return error;
}
return error;
}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */