Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
misc: move to new pool_foreach macros
[vpp.git]
/
src
/
plugins
/
cdp
/
cdp_input.c
diff --git
a/src/plugins/cdp/cdp_input.c
b/src/plugins/cdp/cdp_input.c
index
a27113d
..
76a3d70
100644
(file)
--- a/
src/plugins/cdp/cdp_input.c
+++ b/
src/plugins/cdp/cdp_input.c
@@
-408,14
+408,7
@@
cdp_input (vlib_main_t * vm, vlib_buffer_t * b0, u32 bi0)
static clib_error_t *
cdp_input_init (vlib_main_t * vm)
{
static clib_error_t *
cdp_input_init (vlib_main_t * vm)
{
- clib_error_t *error;
cdp_main_t *cm = &cdp_main;
cdp_main_t *cm = &cdp_main;
- void vnet_cdp_node_reference (void);
-
- vnet_cdp_node_reference ();
-
- if ((error = vlib_call_init_function (vm, cdp_periodic_init)))
- return error;
cm->vlib_main = vm;
cm->vnet_main = vnet_get_main ();
cm->vlib_main = vm;
cm->vnet_main = vnet_get_main ();
@@
-424,7
+417,12
@@
cdp_input_init (vlib_main_t * vm)
return 0;
}
return 0;
}
-VLIB_INIT_FUNCTION (cdp_input_init);
+/* *INDENT-OFF* */
+VLIB_INIT_FUNCTION (cdp_input_init) =
+{
+ .runs_after = VLIB_INITS("cdp_periodic_init"),
+};
+/* *INDENT-ON* */
static u8 *
static u8 *
@@
-437,19
+435,19
@@
format_cdp_neighbors (u8 * s, va_list * va)
vnet_hw_interface_t *hw;
s = format (s,
vnet_hw_interface_t *hw;
s = format (s,
- "%=25s %=
1
5s %=25s %=10s\n",
+ "%=25s %=
2
5s %=25s %=10s\n",
"Our Port", "Peer System", "Peer Port", "Last Heard");
/* *INDENT-OFF* */
"Our Port", "Peer System", "Peer Port", "Last Heard");
/* *INDENT-OFF* */
- pool_foreach (n, cm->neighbors
,
-
(
{
+ pool_foreach (n, cm->neighbors
)
+
{
hw = vnet_get_sup_hw_interface (vnm, n->sw_if_index);
if (n->disabled == 0)
hw = vnet_get_sup_hw_interface (vnm, n->sw_if_index);
if (n->disabled == 0)
- s = format (s, "%=25
s %=1
5s %=25s %=10.1f\n",
+ s = format (s, "%=25
v %=2
5s %=25s %=10.1f\n",
hw->name, n->device_name, n->port_id,
n->last_heard);
hw->name, n->device_name, n->port_id,
n->last_heard);
- }
));
+ }
/* *INDENT-ON* */
return s;
}
/* *INDENT-ON* */
return s;
}