#include <vpp/app/version.h>
/* define message IDs */
-#include <mactime/mactime_msg_enum.h>
+#include <mactime/mactime.api_enum.h>
+#include <mactime/mactime.api_types.h>
-/* define message structures */
-#define vl_typedefs
-#include <mactime/mactime_all_api_h.h>
-#undef vl_typedefs
-
-/* define generated endian-swappers */
-#define vl_endianfun
-#include <mactime/mactime_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
-#include <mactime/mactime_all_api_h.h>
-#undef vl_printfun
-
-/* Get the API version number */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <mactime/mactime_all_api_h.h>
-#undef vl_api_version
#define REPLY_MSG_ID_BASE mm->msg_id_base
#include <vlibapi/api_helper_macros.h>
/** \file time-base src-mac filter device-input feature arc implementation
*/
-/* List of message types that this plugin understands */
-
-#define foreach_mactime_plugin_api_msg \
-_(MACTIME_ENABLE_DISABLE, mactime_enable_disable) \
-_(MACTIME_ADD_DEL_RANGE, mactime_add_del_range)
-
static void
feature_init (mactime_main_t * mm)
{
REPLY_MACRO (VL_API_MACTIME_ENABLE_DISABLE_REPLY);
}
+static void
+vl_api_mactime_dump_t_handler (vl_api_mactime_dump_t * mp)
+{
+ vl_api_mactime_details_t *ep;
+ vl_api_mactime_dump_reply_t *rmp;
+ mactime_device_t *dev;
+ mactime_main_t *mm = &mactime_main;
+ vl_api_registration_t *rp;
+ int rv = 0, i;
+ u32 his_table_epoch = clib_net_to_host_u32 (mp->my_table_epoch);
+ u32 message_size;
+ u32 name_len;
+ u32 nranges;
+
+ rp = vl_api_client_index_to_registration (mp->client_index);
+ if (rp == 0)
+ return;
+
+ if (his_table_epoch == mm->device_table_epoch)
+ {
+ rv = VNET_API_ERROR_NO_CHANGE;
+ goto send_reply;
+ }
+
+ /* *INDENT-OFF* */
+ pool_foreach (dev, mm->devices,
+ ({
+ message_size = sizeof(*ep) + vec_len(dev->device_name) +
+ vec_len(dev->ranges) * sizeof(ep->ranges[0]);
+
+ ep = vl_msg_api_alloc (message_size);
+ memset (ep, 0, message_size);
+ ep->_vl_msg_id = clib_host_to_net_u16 (VL_API_MACTIME_DETAILS
+ + mm->msg_id_base);
+ /* Index is the key for the stats segment combined counters */
+ ep->pool_index = clib_host_to_net_u32 (dev - mm->devices);
+
+ clib_memcpy_fast (ep->mac_address, dev->mac_address,
+ sizeof (ep->mac_address));
+ ep->data_quota = clib_host_to_net_u64 (dev->data_quota);
+ ep->data_used_in_range = clib_host_to_net_u64 (dev->data_used_in_range);
+ ep->flags = clib_host_to_net_u32 (dev->flags);
+ nranges = vec_len (dev->ranges);
+ ep->nranges = clib_host_to_net_u32 (nranges);
+
+ for (i = 0; i < vec_len (dev->ranges); i++)
+ {
+ ep->ranges[i].start = dev->ranges[i].start;
+ ep->ranges[i].end = dev->ranges[i].end;
+ }
+
+ name_len = vec_len (dev->device_name);
+ name_len = (name_len < ARRAY_LEN(ep->device_name)) ?
+ name_len : ARRAY_LEN(ep->device_name) - 1;
+
+ clib_memcpy_fast (ep->device_name, dev->device_name,
+ 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* */
+ REPLY_MACRO2 (VL_API_MACTIME_DUMP_REPLY,
+ ({
+ rmp->table_epoch = clib_host_to_net_u32 (mm->device_table_epoch);
+ }));
+ /* *INDENT-ON* */
+}
+
/** Create a lookup table entry for the indicated mac address
*/
void
feature_init (mm);
+ /*
+ * Change the table epoch. Skip 0 so clients can code my_table_epoch = 0
+ * to receive a full dump.
+ */
+ mm->device_table_epoch++;
+ if (PREDICT_FALSE (mm->device_table_epoch == 0))
+ mm->device_table_epoch++;
+
data_quota = clib_net_to_host_u64 (mp->data_quota);
clib_memset (&kv, 0, sizeof (kv));
dp->flags = MACTIME_DEVICE_FLAG_DYNAMIC_DROP;
if (mp->allow)
dp->flags = MACTIME_DEVICE_FLAG_DYNAMIC_ALLOW;
+ if (mp->allow_quota)
+ dp->flags = MACTIME_DEVICE_FLAG_DYNAMIC_ALLOW_QUOTA;
}
else
{
dp->flags = MACTIME_DEVICE_FLAG_DYNAMIC_DROP;
if (mp->allow)
dp->flags = MACTIME_DEVICE_FLAG_DYNAMIC_ALLOW;
+ if (mp->allow_quota)
+ dp->flags = MACTIME_DEVICE_FLAG_DYNAMIC_ALLOW_QUOTA;
}
else
{
REPLY_MACRO (VL_API_MACTIME_ADD_DEL_RANGE_REPLY);
}
-/* Set up the API message handling tables */
-static clib_error_t *
-mactime_plugin_api_hookup (vlib_main_t * vm)
-{
- mactime_main_t *mm = &mactime_main;
-#define _(N,n) \
- vl_msg_api_set_handlers((VL_API_##N + mm->msg_id_base), \
- #n, \
- vl_api_##n##_t_handler, \
- vl_noop_handler, \
- vl_api_##n##_t_endian, \
- vl_api_##n##_t_print, \
- sizeof(vl_api_##n##_t), 1);
- foreach_mactime_plugin_api_msg;
-#undef _
-
- return 0;
-}
-
-#define vl_msg_name_crc_list
-#include <mactime/mactime_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (mactime_main_t * mm, api_main_t * am)
-{
-#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + mm->msg_id_base);
- foreach_vl_msg_name_crc_mactime;
-#undef _
-}
-
+#include <mactime/mactime.api.c>
static clib_error_t *
mactime_init (vlib_main_t * vm)
{
mactime_main_t *mm = &mactime_main;
- clib_error_t *error = 0;
- u8 *name;
mm->vlib_main = vm;
mm->vnet_main = vnet_get_main ();
- name = format (0, "mactime_%08x%c", api_version, 0);
-
/* Ask for a correctly-sized block of API message decode slots */
- mm->msg_id_base = vl_msg_api_get_msg_ids
- ((char *) name, VL_MSG_FIRST_AVAILABLE);
-
- error = mactime_plugin_api_hookup (vm);
-
- /* Add our API messages to the global name_crc hash table */
- setup_message_id_table (mm, &api_main);
-
- vec_free (name);
+ mm->msg_id_base = setup_message_id_table ();
mm->lookup_table_num_buckets = MACTIME_NUM_BUCKETS;
mm->lookup_table_memory_size = MACTIME_MEMORY_SIZE;
mm->timezone_offset = -5; /* US EST / EDT */
- return error;
+ return 0;
}
VLIB_INIT_FUNCTION (mactime_init);
u8 *fmt;
char *suffix = "";
- fmt = format (0, "%%%d.3f%%s%c", width, 0);
+ if (width > 0)
+ fmt = format (0, "%%%d.3f%%s%c", width, 0);
+ else
+ fmt = format (0, "%%.3f%%s%c", 0);
if (nbytes > (1024ULL * 1024ULL * 1024ULL))
{
suffix = "K";
}
else
- nbytes_f64 = (f64) nbytes;
+ {
+ nbytes_f64 = (f64) nbytes;
+ suffix = "B";
+ }
s = format (s, (char *) fmt, nbytes_f64, suffix);
vec_free (fmt);
}));
/* *INDENT-ON* */
- vlib_cli_output (vm, "%-15s %18s %14s %10s %11s %10s",
+ vlib_cli_output (vm, "%-15s %18s %14s %10s %11s %13s",
"Device Name", "Addresses", "Status",
"AllowPkt", "AllowByte", "DropPkt");
{
if (dp->flags & MACTIME_DEVICE_FLAG_DYNAMIC_ALLOW)
current_status = 3;
+ else if (dp->flags & MACTIME_DEVICE_FLAG_DYNAMIC_ALLOW_QUOTA)
+ current_status = 5;
else
current_status = 2;
if (verbose)
current_status = 2;
if (dp->flags & MACTIME_DEVICE_FLAG_DYNAMIC_DROP)
current_status = 3;
+ if (dp->flags & MACTIME_DEVICE_FLAG_DYNAMIC_ALLOW_QUOTA)
+ current_status = 4;
print:
vec_reset_length (macstring);
case 3:
status_string = "dynamic allow";
break;
+ case 4:
+ status_string = "d-quota inact";
+ break;
+ case 5:
+ status_string = "d-quota activ";
+ break;
default:
status_string = "code bug!";
break;
vlib_get_combined_counter (&mm->allow_counters, dp - mm->devices,
&allow);
vlib_get_combined_counter (&mm->drop_counters, dp - mm->devices, &drop);
- vlib_cli_output (vm, "%-15s %18s %14s %10lld %U %10lld",
+ vlib_cli_output (vm, "%-15s %18s %14s %10lld %U %13lld",
dp->device_name, macstring, status_string,
allow.packets, format_bytes_with_width, allow.bytes,
10, drop.packets);
if (dp->data_quota > 0)
- vlib_cli_output (vm, "%-54s %s%U", " ", "Quota ",
- format_bytes_with_width, dp->data_quota, 10);
+ vlib_cli_output (vm, "%-54s %s%U %s%U", " ", "Quota ",
+ format_bytes_with_width, dp->data_quota, 10,
+ "Use ", format_bytes_with_width,
+ dp->data_used_in_range, 8);
/* This is really only good for small N... */
for (j = 0; j < vec_len (mm->arp_cache_copy); j++)
{
Code Review / vpp.git / blobdiff