From 20a64f5f8a3dc6132c79da074adc7de1f037a154 Mon Sep 17 00:00:00 2001 From: Shwetha Date: Fri, 25 Mar 2016 10:55:01 +0000 Subject: iOAM trace configuration APIs Change-Id: I6d31f0ddb812d148ad065e27775440d09f402def Signed-off-by: Shwetha --- vnet/vnet/ip/ip6_hop_by_hop.c | 13 ++++++++++--- vnet/vnet/ip/ip6_hop_by_hop.h | 3 +-- 2 files changed, 11 insertions(+), 5 deletions(-) (limited to 'vnet') diff --git a/vnet/vnet/ip/ip6_hop_by_hop.c b/vnet/vnet/ip/ip6_hop_by_hop.c index 339cbc30c48..74f79506007 100644 --- a/vnet/vnet/ip/ip6_hop_by_hop.c +++ b/vnet/vnet/ip/ip6_hop_by_hop.c @@ -1080,7 +1080,7 @@ int ip6_ioam_set_rewrite (u8 **rwp, u32 trace_type, u32 trace_option_elts, } clib_error_t * -clear_ioam_rewrite_fn() +clear_ioam_rewrite_fn(void) { ip6_hop_by_hop_main_t *hm = &ip6_hop_by_hop_main; @@ -1096,11 +1096,18 @@ clear_ioam_rewrite_fn() return 0; } + +clib_error_t * clear_ioam_rewrite_command_fn (vlib_main_t * vm, + unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + return(clear_ioam_rewrite_fn()); +} VLIB_CLI_COMMAND (ip6_clear_ioam_trace_cmd, static) = { .path = "clear ioam rewrite", .short_help = "clear ioam rewrite", - .function = clear_ioam_rewrite_fn, + .function = clear_ioam_rewrite_command_fn, }; clib_error_t * @@ -1126,7 +1133,7 @@ ip6_ioam_trace_profile_set(u32 trace_option_elts, u32 trace_type, u32 node_id, break; default: - return clib_error_return (0, "ip6_ioam_set_rewrite returned %d", rv); + return clib_error_return_code(0, rv, 0, "ip6_ioam_set_rewrite returned %d", rv); } return 0; diff --git a/vnet/vnet/ip/ip6_hop_by_hop.h b/vnet/vnet/ip/ip6_hop_by_hop.h index fc98ae2f668..2ec83f2be35 100644 --- a/vnet/vnet/ip/ip6_hop_by_hop.h +++ b/vnet/vnet/ip/ip6_hop_by_hop.h @@ -73,8 +73,7 @@ ip6_ioam_trace_profile_set(u32 trace_option_elts, u32 trace_type, u32 node_id, extern int ip6_ioam_set_destination (ip6_address_t *addr, u32 mask_width, u32 vrf_id, int is_add, int is_pop, int is_none); - -extern clib_error_t * clear_ioam_trace_fn(); +extern clib_error_t * clear_ioam_rewrite_fn(void); static inline u8 is_zero_ip4_address (ip4_address_t *a) { -- cgit 1.2.3-korg