#include <vlibapi/api.h>
#include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
#include <vnet/ip/ip6_hop_by_hop.h>
#include "ioam_cache.h"
#define REPLY_MSG_ID_BASE cm->msg_id_base
#include <vlibapi/api_helper_macros.h>
+ioam_cache_main_t ioam_cache_main;
+
/* List of message types that this plugin understands */
#define foreach_ioam_cache_plugin_api_msg \
_(IOAM_CACHE_IP6_ENABLE_DISABLE, ioam_cache_ip6_enable_disable)
/* Action function shared between message handler and debug CLI */
int
-ioam_cache_ip6_enable_disable (ioam_cache_main_t * em, u8 is_disable)
+ioam_cache_ip6_enable_disable (ioam_cache_main_t * em,
+ ip6_address_t * sr_localsid, u8 is_disable)
{
vlib_main_t *vm = em->vlib_main;
if (is_disable == 0)
{
ioam_cache_table_init (vm);
+ em->sr_localsid_cache.as_u64[0] = sr_localsid->as_u64[0];
+ em->sr_localsid_cache.as_u64[1] = sr_localsid->as_u64[1];
ip6_hbh_set_next_override (em->cache_hbh_slot);
ip6_hbh_register_option (HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE_ID,
0, ioam_e2e_id_trace_handler);
{
ip6_hbh_set_next_override (IP6_LOOKUP_NEXT_POP_HOP_BY_HOP);
ioam_cache_table_destroy (vm);
+ em->sr_localsid_cache.as_u64[0] = 0;
+ em->sr_localsid_cache.as_u64[1] = 0;
ip6_hbh_unregister_option (HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE_ID);
ip6_hbh_unregister_option (HBH_OPTION_TYPE_IOAM_E2E_CACHE_ID);
}
int
ioam_tunnel_select_ip6_enable_disable (ioam_cache_main_t * em,
u8 criteria,
- u8 no_of_responses, u8 is_disable)
+ u8 no_of_responses,
+ ip6_address_t * sr_localsid,
+ u8 is_disable)
{
vlib_main_t *vm = em->vlib_main;
ioam_cache_ts_table_init (vm);
em->criteria_oneway = criteria;
em->wait_for_responses = no_of_responses;
+ em->sr_localsid_ts.as_u64[0] = sr_localsid->as_u64[0];
+ em->sr_localsid_ts.as_u64[1] = sr_localsid->as_u64[1];
ip6_hbh_set_next_override (em->ts_hbh_slot);
ip6_ioam_ts_cache_set_rewrite ();
ip6_hbh_register_option (HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE_ID,
{
ioam_cache_ts_timer_node_enable (vm, 0);
ip6_hbh_set_next_override (IP6_LOOKUP_NEXT_POP_HOP_BY_HOP);
+ em->sr_localsid_ts.as_u64[0] = 0;
+ em->sr_localsid_ts.as_u64[1] = 0;
ioam_cache_ts_table_destroy (vm);
ip6_ioam_ts_cache_cleanup_rewrite ();
ip6_hbh_unregister_option (HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE_ID);
{
vl_api_ioam_cache_ip6_enable_disable_reply_t *rmp;
ioam_cache_main_t *cm = &ioam_cache_main;
+ ip6_address_t sr_localsid;
int rv;
- rv = ioam_cache_ip6_enable_disable (cm, (int) (mp->is_disable));
+ sr_localsid.as_u64[0] = 0;
+ sr_localsid.as_u64[1] = 0;
+ rv =
+ ioam_cache_ip6_enable_disable (cm, &sr_localsid, (int) (mp->is_disable));
REPLY_MACRO (VL_API_IOAM_CACHE_IP6_ENABLE_DISABLE_REPLY);
}
return 0;
}
+#define vl_msg_name_crc_list
+#include <ioam/ip6/ioam_cache_all_api_h.h>
+#undef vl_msg_name_crc_list
+
+static void
+setup_message_id_table (ioam_cache_main_t * sm, api_main_t * am)
+{
+#define _(id,n,crc) \
+ vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + sm->msg_id_base);
+ foreach_vl_msg_name_crc_ioam_cache;
+#undef _
+}
+
static clib_error_t *
set_ioam_cache_command_fn (vlib_main_t * vm,
unformat_input_t * input, vlib_cli_command_t * cmd)
{
ioam_cache_main_t *em = &ioam_cache_main;
u8 is_disable = 0;
+ ip6_address_t sr_localsid;
+ u8 address_set = 0;
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
if (unformat (input, "disable"))
is_disable = 1;
+ else if (!address_set
+ && unformat (input, "sr_localsid %U", unformat_ip6_address,
+ &sr_localsid))
+ address_set = 1;
else
break;
}
- ioam_cache_ip6_enable_disable (em, is_disable);
+
+ if (is_disable == 0 && !address_set)
+ return clib_error_return (0, "Error: SRv6 LocalSID address is mandatory");
+
+ ioam_cache_ip6_enable_disable (em, &sr_localsid, is_disable);
return 0;
}
VLIB_CLI_COMMAND (set_ioam_cache_command, static) =
{
.path = "set ioam ip6 cache",.short_help =
- "set ioam ip6 cache [disable]",.function = set_ioam_cache_command_fn};
+ "set ioam ip6 cache sr_localsid <ip6 address> [disable]",.function =
+ set_ioam_cache_command_fn};
/* *INDENT_ON* */
#define IOAM_TS_WAIT_FOR_RESPONSES 3
ioam_cache_main_t *em = &ioam_cache_main;
u8 is_disable = 0;
u8 one_way = 0;
+ ip6_address_t sr_localsid;
+ u8 address_set = 0;
u8 no_of_responses = IOAM_TS_WAIT_FOR_RESPONSES;
+
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
if (unformat (input, "disable"))
one_way = 1;
else if (unformat (input, "wait_for_responses %d", &no_of_responses))
;
+ else if (!address_set
+ && unformat (input, "sr_localsid %U", unformat_ip6_address,
+ &sr_localsid))
+ address_set = 1;
else
break;
}
+ if (is_disable == 0 && !address_set)
+ return clib_error_return (0,
+ "Error: SRv6 LocalSID address is mandatory to receive response.");
ioam_tunnel_select_ip6_enable_disable (em, one_way, no_of_responses,
- is_disable);
+ &sr_localsid, is_disable);
return 0;
}
VLIB_CLI_COMMAND (set_ioam_cache_ts_command, static) =
{
.path = "set ioam ip6 sr-tunnel-select",.short_help =
- "set ioam ip6 sr-tunnel-select [disable] [oneway|rtt] [wait_for_responses <n|default 3>]",.function
- = set_ioam_tunnel_select_command_fn};
+ "set ioam ip6 sr-tunnel-select [disable] [oneway|rtt] [wait_for_responses <n|default 3>] \
+ [sr_localsid <ip6 address>]",.function = set_ioam_tunnel_select_command_fn};
/* *INDENT_ON* */
static void
{
if (unformat (input, "verbose"))
verbose = 1;
+ else
+ return clib_error_return (0, "unknown input `%U'",
+ format_unformat_error, input);
}
ioam_cache_table_print (vm, verbose);
name = format (0, "ioam_cache_%08x%c", api_version, 0);
- memset (&ioam_cache_main, 0, sizeof (ioam_cache_main));
+ clib_memset (&ioam_cache_main, 0, sizeof (ioam_cache_main));
/* Ask for a correctly-sized block of API message decode slots */
em->msg_id_base = vl_msg_api_get_msg_ids
((char *) name, VL_MSG_FIRST_AVAILABLE);
error = ioam_cache_plugin_api_hookup (vm);
+
+ /* Add our API messages to the global name_crc hash table */
+ setup_message_id_table (em, &api_main);
+
/* Hook this node to ip6-hop-by-hop */
ip6_hbyh_node = vlib_get_node_by_name (vm, (u8 *) "ip6-hop-by-hop");
em->cache_hbh_slot =
Code Review / vpp.git / blobdiff