Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
interface: interface-output end node rework
[vpp.git]
/
src
/
plugins
/
mactime
/
mactime.c
diff --git
a/src/plugins/mactime/mactime.c
b/src/plugins/mactime/mactime.c
index
9192a26
..
b8b1884
100644
(file)
--- a/
src/plugins/mactime/mactime.c
+++ b/
src/plugins/mactime/mactime.c
@@
-33,9
+33,12
@@
#define REPLY_MSG_ID_BASE mm->msg_id_base
#include <vlibapi/api_helper_macros.h>
#define REPLY_MSG_ID_BASE mm->msg_id_base
#include <vlibapi/api_helper_macros.h>
+#include <vnet/ip-neighbor/ip_neighbor.h>
+
mactime_main_t mactime_main;
mactime_main_t mactime_main;
-/** \file time-base src-mac filter device-input feature arc implementation
+/** \file mactime.c
+ * time-base src-mac filter device-input feature arc implementation
*/
static void
*/
static void
@@
-48,7
+51,8
@@
feature_init (mactime_main_t * mm)
mm->lookup_table_num_buckets,
mm->lookup_table_memory_size);
clib_timebase_init (&mm->timebase, mm->timezone_offset,
mm->lookup_table_num_buckets,
mm->lookup_table_memory_size);
clib_timebase_init (&mm->timebase, mm->timezone_offset,
- CLIB_TIMEBASE_DAYLIGHT_USA);
+ CLIB_TIMEBASE_DAYLIGHT_USA,
+ &(mm->vlib_main->clib_time));
mm->allow_counters.name = "allow";
mm->allow_counters.stat_segment_name = "/mactime/allow";
mm->drop_counters.name = "drop";
mm->allow_counters.name = "allow";
mm->allow_counters.stat_segment_name = "/mactime/allow";
mm->drop_counters.name = "drop";
@@
-191,8
+195,8
@@
vl_api_mactime_dump_t_handler (vl_api_mactime_dump_t * mp)
}
/* *INDENT-OFF* */
}
/* *INDENT-OFF* */
- pool_foreach (dev, mm->devices
,
-
(
{
+ pool_foreach (dev, mm->devices
)
+
{
message_size = sizeof(*ep) + vec_len(dev->device_name) +
vec_len(dev->ranges) * sizeof(ep->ranges[0]);
message_size = sizeof(*ep) + vec_len(dev->device_name) +
vec_len(dev->ranges) * sizeof(ep->ranges[0]);
@@
-226,7
+230,7
@@
vl_api_mactime_dump_t_handler (vl_api_mactime_dump_t * mp)
name_len);
ep->device_name [ARRAY_LEN(ep->device_name) -1] = 0;
vl_api_send_msg (rp, (u8 *)ep);
name_len);
ep->device_name [ARRAY_LEN(ep->device_name) -1] = 0;
vl_api_send_msg (rp, (u8 *)ep);
- }
));
+ }
/* *INDENT-OFF* */
send_reply:
/* *INDENT-OFF* */
send_reply:
@@
-425,7
+429,12
@@
mactime_init (vlib_main_t * vm)
return 0;
}
return 0;
}
-VLIB_INIT_FUNCTION (mactime_init);
+/* *INDENT-OFF* */
+VLIB_INIT_FUNCTION (mactime_init) =
+{
+ .runs_after = VLIB_INITS("ip_neighbor_init"),
+};
+/* *INDENT-ON* */
static clib_error_t *
mactime_config (vlib_main_t * vm, unformat_input_t * input)
static clib_error_t *
mactime_config (vlib_main_t * vm, unformat_input_t * input)
@@
-463,11
+472,10
@@
VNET_FEATURE_INIT (mactime, static) =
/* *INDENT-ON */
/* *INDENT-OFF* */
/* *INDENT-ON */
/* *INDENT-OFF* */
-VNET_FEATURE_INIT (mactime_tx, static) =
-{
+VNET_FEATURE_INIT (mactime_tx, static) = {
.arc_name = "interface-output",
.node_name = "mactime-tx",
.arc_name = "interface-output",
.node_name = "mactime-tx",
- .runs_before = VNET_FEATURES ("interface-
tx
"),
+ .runs_before = VNET_FEATURES ("interface-
output-arc-end
"),
};
/* *INDENT-ON */
};
/* *INDENT-ON */
@@
-519,6
+527,16
@@
format_bytes_with_width (u8 * s, va_list * va)
return s;
}
return s;
}
+static walk_rc_t
+mactime_ip_neighbor_copy (index_t ipni, void *ctx)
+{
+ mactime_main_t *mm = ctx;
+
+ vec_add1 (mm->arp_cache_copy, ipni);
+
+ return (WALK_CONTINUE);
+}
+
static clib_error_t *
show_mactime_command_fn (vlib_main_t * vm,
unformat_input_t * input, vlib_cli_command_t * cmd)
static clib_error_t *
show_mactime_command_fn (vlib_main_t * vm,
unformat_input_t * input, vlib_cli_command_t * cmd)
@@
-533,17
+551,16
@@
show_mactime_command_fn (vlib_main_t * vm,
int i, j;
f64 now;
vlib_counter_t allow, drop;
int i, j;
f64 now;
vlib_counter_t allow, drop;
-
ethernet_arp_ip4_entry_t *n, *pool
;
+
ip_neighbor_t *ipn
;
- vec_reset_length (mm->arp_cache_copy);
- pool = ip4_neighbors_pool ();
+ if (mm->feature_initialized == 0)
+ return clib_error_return
+ (0,
+ "Feature not initialized, suggest 'help mactime enable-disable'...");
- /* *INDENT-OFF* */
- pool_foreach (n, pool,
- ({
- vec_add1 (mm->arp_cache_copy, n[0]);
- }));
- /* *INDENT-ON* */
+ vec_reset_length (mm->arp_cache_copy);
+ /* Walk all ip4 neighbours on all interfaces */
+ ip_neighbor_walk (AF_IP4, ~0, mactime_ip_neighbor_copy, mm);
now = clib_timebase_now (&mm->timebase);
now = clib_timebase_now (&mm->timebase);
@@
-560,10
+577,10
@@
show_mactime_command_fn (vlib_main_t * vm,
vlib_cli_output (vm, "Time now: %U", format_clib_timebase_time, now);
/* *INDENT-OFF* */
vlib_cli_output (vm, "Time now: %U", format_clib_timebase_time, now);
/* *INDENT-OFF* */
- pool_foreach (dp, mm->devices
,
-
(
{
+ pool_foreach (dp, mm->devices
)
+
{
vec_add1 (pool_indices, dp - mm->devices);
vec_add1 (pool_indices, dp - mm->devices);
- }
));
+ }
/* *INDENT-ON* */
vlib_cli_output (vm, "%-15s %18s %14s %10s %11s %13s",
/* *INDENT-ON* */
vlib_cli_output (vm, "%-15s %18s %14s %10s %11s %13s",
@@
-660,11
+677,12
@@
show_mactime_command_fn (vlib_main_t * vm,
/* This is really only good for small N... */
for (j = 0; j < vec_len (mm->arp_cache_copy); j++)
{
/* This is really only good for small N... */
for (j = 0; j < vec_len (mm->arp_cache_copy); j++)
{
- n = mm->arp_cache_copy + j;
- if (!memcmp (dp->mac_address, n->mac.bytes, sizeof (n->mac)))
+ ipn = ip_neighbor_get (mm->arp_cache_copy[j]);
+ if (!memcmp
+ (dp->mac_address, ipn->ipn_mac.bytes, sizeof (ipn->ipn_mac)))
{
{
- vlib_cli_output (vm, "%17s%U", " ", format_ip4_address,
-
&n->ip4_address
);
+ vlib_cli_output (vm, "%17s%U", " ", format_ip4
6
_address,
+
ip_neighbor_get_ip (ipn), IP46_TYPE_IP4
);
}
}
}
}
}
}
@@
-690,7
+708,9
@@
clear_mactime_command_fn (vlib_main_t * vm,
mactime_main_t *mm = &mactime_main;
if (mm->feature_initialized == 0)
mactime_main_t *mm = &mactime_main;
if (mm->feature_initialized == 0)
- return clib_error_return (0, "feature not enabled");
+ return clib_error_return
+ (0,
+ "Feature not initialized, suggest 'help mactime enable-disable'...");
vlib_clear_combined_counters (&mm->allow_counters);
vlib_clear_combined_counters (&mm->drop_counters);
vlib_clear_combined_counters (&mm->allow_counters);
vlib_clear_combined_counters (&mm->drop_counters);