aboutsummaryrefslogtreecommitdiffstats
path: root/vpp-api-test/vat
diff options
context:
space:
mode:
authorDave Barach <dave@barachs.net>2016-08-04 10:15:08 -0400
committerDave Barach <dave@barachs.net>2016-08-04 10:15:21 -0400
commit72d7223163b2a54735f5c900089c8683d6eed74e (patch)
tree38ed8b0e9665d437801562e0bbbcb88586c0cefc /vpp-api-test/vat
parentc08f5a7aefc90d344e1ebee4bcce3f53f2d26c3d (diff)
VPP-237 vpp-api-test coding style cleanup
Change-Id: I50a5412463e9346149a7504344a68c8b5762dc97 Signed-off-by: Dave Barach <dave@barachs.net>
Diffstat (limited to 'vpp-api-test/vat')
-rw-r--r--vpp-api-test/vat/api_format.c20091
-rw-r--r--vpp-api-test/vat/json_format.c339
-rw-r--r--vpp-api-test/vat/json_format.h271
-rw-r--r--vpp-api-test/vat/json_test.c68
-rw-r--r--vpp-api-test/vat/main.c478
-rw-r--r--vpp-api-test/vat/plugin.c157
-rw-r--r--vpp-api-test/vat/plugin.h20
-rw-r--r--vpp-api-test/vat/plugin_api.c65
-rw-r--r--vpp-api-test/vat/restart.c142
-rw-r--r--vpp-api-test/vat/vat.h292
10 files changed, 11709 insertions, 10214 deletions
diff --git a/vpp-api-test/vat/api_format.c b/vpp-api-test/vat/api_format.c
index 051f95f9470..93007fb45f3 100644
--- a/vpp-api-test/vat/api_format.c
+++ b/vpp-api-test/vat/api_format.c
@@ -54,13 +54,13 @@
#include <sys/stat.h>
-#define vl_typedefs /* define message structures */
+#define vl_typedefs /* define message structures */
#include <vpp-api/vpe_all_api_h.h>
#undef vl_typedefs
/* declare message handlers for each api */
-#define vl_endianfun /* define message structures */
+#define vl_endianfun /* define message structures */
#include <vpp-api/vpe_all_api_h.h>
#undef vl_endianfun
@@ -70,30 +70,32 @@
#include <vpp-api/vpe_all_api_h.h>
#undef vl_printfun
-uword unformat_sw_if_index (unformat_input_t * input, va_list * args)
+uword
+unformat_sw_if_index (unformat_input_t * input, va_list * args)
{
- vat_main_t * vam = va_arg (*args, vat_main_t *);
- u32 * result = va_arg (*args, u32 *);
- u8 * if_name;
- uword * p;
+ vat_main_t *vam = va_arg (*args, vat_main_t *);
+ u32 *result = va_arg (*args, u32 *);
+ u8 *if_name;
+ uword *p;
if (!unformat (input, "%s", &if_name))
- return 0;
+ return 0;
p = hash_get_mem (vam->sw_if_index_by_interface_name, if_name);
if (p == 0)
- return 0;
+ return 0;
*result = p[0];
return 1;
}
/* Parse an IP4 address %d.%d.%d.%d. */
-uword unformat_ip4_address (unformat_input_t * input, va_list * args)
+uword
+unformat_ip4_address (unformat_input_t * input, va_list * args)
{
- u8 * result = va_arg (*args, u8 *);
+ u8 *result = va_arg (*args, u8 *);
unsigned a[4];
- if (! unformat (input, "%d.%d.%d.%d", &a[0], &a[1], &a[2], &a[3]))
+ if (!unformat (input, "%d.%d.%d.%d", &a[0], &a[1], &a[2], &a[3]))
return 0;
if (a[0] >= 256 || a[1] >= 256 || a[2] >= 256 || a[3] >= 256)
@@ -111,11 +113,11 @@ uword unformat_ip4_address (unformat_input_t * input, va_list * args)
uword
unformat_ethernet_address (unformat_input_t * input, va_list * args)
{
- u8 * result = va_arg (*args, u8 *);
+ u8 *result = va_arg (*args, u8 *);
u32 i, a[6];
- if (! unformat (input, "%_%x:%x:%x:%x:%x:%x%_",
- &a[0], &a[1], &a[2], &a[3], &a[4], &a[5]))
+ if (!unformat (input, "%_%x:%x:%x:%x:%x:%x%_",
+ &a[0], &a[1], &a[2], &a[3], &a[4], &a[5]))
return 0;
/* Check range. */
@@ -134,12 +136,11 @@ uword
unformat_ethernet_type_host_byte_order (unformat_input_t * input,
va_list * args)
{
- u16 * result = va_arg (*args, u16 *);
+ u16 *result = va_arg (*args, u16 *);
int type;
/* Numeric type. */
- if (unformat (input, "0x%x", &type)
- || unformat (input, "%d", &type))
+ if (unformat (input, "0x%x", &type) || unformat (input, "%d", &type))
{
if (type >= (1 << 16))
return 0;
@@ -150,9 +151,10 @@ unformat_ethernet_type_host_byte_order (unformat_input_t * input,
}
/* Parse an IP6 address. */
-uword unformat_ip6_address (unformat_input_t * input, va_list * args)
+uword
+unformat_ip6_address (unformat_input_t * input, va_list * args)
{
- ip6_address_t * result = va_arg (*args, ip6_address_t *);
+ ip6_address_t *result = va_arg (*args, ip6_address_t *);
u16 hex_quads[8];
uword hex_quad, n_hex_quads, hex_digit, n_hex_digits;
uword c, n_colon, double_colon_index;
@@ -244,13 +246,13 @@ uword
unformat_ipsec_policy_action (unformat_input_t * input, va_list * args)
{
#if DPDK > 0
- u32 * r = va_arg (*args, u32 *);
+ u32 *r = va_arg (*args, u32 *);
- if (0) ;
+ if (0);
#define _(v,f,s) else if (unformat (input, s)) *r = IPSEC_POLICY_ACTION_##f;
foreach_ipsec_policy_action
#undef _
- else
+ else
return 0;
return 1;
#else
@@ -262,13 +264,13 @@ uword
unformat_ipsec_crypto_alg (unformat_input_t * input, va_list * args)
{
#if DPDK > 0
- u32 * r = va_arg (*args, u32 *);
+ u32 *r = va_arg (*args, u32 *);
- if (0) ;
+ if (0);
#define _(v,f,s) else if (unformat (input, s)) *r = IPSEC_CRYPTO_ALG_##f;
foreach_ipsec_crypto_alg
#undef _
- else
+ else
return 0;
return 1;
#else
@@ -281,15 +283,15 @@ format_ipsec_crypto_alg (u8 * s, va_list * args)
{
#if DPDK > 0
u32 i = va_arg (*args, u32);
- u8 * t = 0;
+ u8 *t = 0;
switch (i)
{
#define _(v,f,str) case IPSEC_CRYPTO_ALG_##f: t = (u8 *) str; break;
- foreach_ipsec_crypto_alg
+ foreach_ipsec_crypto_alg
#undef _
- default:
- return format (s, "unknown");
+ default:
+ return format (s, "unknown");
}
return format (s, "%s", t);
#else
@@ -301,13 +303,13 @@ uword
unformat_ipsec_integ_alg (unformat_input_t * input, va_list * args)
{
#if DPDK > 0
- u32 * r = va_arg (*args, u32 *);
+ u32 *r = va_arg (*args, u32 *);
- if (0) ;
+ if (0);
#define _(v,f,s) else if (unformat (input, s)) *r = IPSEC_INTEG_ALG_##f;
foreach_ipsec_integ_alg
#undef _
- else
+ else
return 0;
return 1;
#else
@@ -320,15 +322,15 @@ format_ipsec_integ_alg (u8 * s, va_list * args)
{
#if DPDK > 0
u32 i = va_arg (*args, u32);
- u8 * t = 0;
+ u8 *t = 0;
switch (i)
{
#define _(v,f,str) case IPSEC_INTEG_ALG_##f: t = (u8 *) str; break;
- foreach_ipsec_integ_alg
+ foreach_ipsec_integ_alg
#undef _
- default:
- return format (s, "unknown");
+ default:
+ return format (s, "unknown");
}
return format (s, "%s", t);
#else
@@ -340,13 +342,13 @@ uword
unformat_ikev2_auth_method (unformat_input_t * input, va_list * args)
{
#if DPDK > 0
- u32 * r = va_arg (*args, u32 *);
+ u32 *r = va_arg (*args, u32 *);
- if (0) ;
+ if (0);
#define _(v,f,s) else if (unformat (input, s)) *r = IKEV2_AUTH_METHOD_##f;
foreach_ikev2_auth_method
#undef _
- else
+ else
return 0;
return 1;
#else
@@ -358,13 +360,13 @@ uword
unformat_ikev2_id_type (unformat_input_t * input, va_list * args)
{
#if DPDK > 0
- u32 * r = va_arg (*args, u32 *);
+ u32 *r = va_arg (*args, u32 *);
- if (0) ;
+ if (0);
#define _(v,f,s) else if (unformat (input, s)) *r = IKEV2_ID_TYPE_##f;
foreach_ikev2_id_type
#undef _
- else
+ else
return 0;
return 1;
#else
@@ -375,11 +377,11 @@ unformat_ikev2_id_type (unformat_input_t * input, va_list * args)
uword
unformat_policer_rate_type (unformat_input_t * input, va_list * args)
{
- u8 * r = va_arg (*args, u8 *);
+ u8 *r = va_arg (*args, u8 *);
if (unformat (input, "kbps"))
*r = SSE2_QOS_RATE_KBPS;
- else if (unformat(input, "pps"))
+ else if (unformat (input, "pps"))
*r = SSE2_QOS_RATE_PPS;
else
return 0;
@@ -389,9 +391,9 @@ unformat_policer_rate_type (unformat_input_t * input, va_list * args)
uword
unformat_policer_round_type (unformat_input_t * input, va_list * args)
{
- u8 * r = va_arg (*args, u8 *);
+ u8 *r = va_arg (*args, u8 *);
- if (unformat(input, "closest"))
+ if (unformat (input, "closest"))
*r = SSE2_QOS_ROUND_TO_CLOSEST;
else if (unformat (input, "up"))
*r = SSE2_QOS_ROUND_TO_UP;
@@ -405,7 +407,7 @@ unformat_policer_round_type (unformat_input_t * input, va_list * args)
uword
unformat_policer_type (unformat_input_t * input, va_list * args)
{
- u8 * r = va_arg (*args, u8 *);
+ u8 *r = va_arg (*args, u8 *);
if (unformat (input, "1r2c"))
*r = SSE2_QOS_POLICER_TYPE_1R2C;
@@ -425,13 +427,13 @@ unformat_policer_type (unformat_input_t * input, va_list * args)
uword
unformat_dscp (unformat_input_t * input, va_list * va)
{
- u8 * r = va_arg (*va, u8 *);
+ u8 *r = va_arg (*va, u8 *);
- if (0) ;
+ if (0);
#define _(v,f,str) else if (unformat (input, str)) *r = VNET_DSCP_##f;
- foreach_vnet_dscp
+ foreach_vnet_dscp
#undef _
- else
+ else
return 0;
return 1;
}
@@ -439,7 +441,7 @@ unformat_dscp (unformat_input_t * input, va_list * va)
uword
unformat_policer_action_type (unformat_input_t * input, va_list * va)
{
- sse2_qos_pol_action_params_st * a
+ sse2_qos_pol_action_params_st *a
= va_arg (*va, sse2_qos_pol_action_params_st *);
if (unformat (input, "drop"))
@@ -456,7 +458,7 @@ unformat_policer_action_type (unformat_input_t * input, va_list * va)
uword
unformat_classify_table_type (unformat_input_t * input, va_list * va)
{
- u32 * r = va_arg (*va, u32 *);
+ u32 *r = va_arg (*va, u32 *);
u32 tid;
if (unformat (input, "ip4"))
@@ -472,63 +474,66 @@ unformat_classify_table_type (unformat_input_t * input, va_list * va)
return 1;
}
-u8 * format_ip4_address (u8 * s, va_list * args)
+u8 *
+format_ip4_address (u8 * s, va_list * args)
{
- u8 * a = va_arg (*args, u8 *);
+ u8 *a = va_arg (*args, u8 *);
return format (s, "%d.%d.%d.%d", a[0], a[1], a[2], a[3]);
}
-u8 * format_ip6_address (u8 * s, va_list * args)
+u8 *
+format_ip6_address (u8 * s, va_list * args)
{
- ip6_address_t * a = va_arg (*args, ip6_address_t *);
- u32 i, i_max_n_zero, max_n_zeros, i_first_zero, n_zeros, last_double_colon;
+ ip6_address_t *a = va_arg (*args, ip6_address_t *);
+ u32 i, i_max_n_zero, max_n_zeros, i_first_zero, n_zeros, last_double_colon;
- i_max_n_zero = ARRAY_LEN (a->as_u16);
- max_n_zeros = 0;
- i_first_zero = i_max_n_zero;
- n_zeros = 0;
- for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
- {
- u32 is_zero = a->as_u16[i] == 0;
- if (is_zero && i_first_zero >= ARRAY_LEN (a->as_u16))
- {
- i_first_zero = i;
- n_zeros = 0;
- }
- n_zeros += is_zero;
- if ((! is_zero && n_zeros > max_n_zeros)
- || (i + 1 >= ARRAY_LEN (a->as_u16) && n_zeros > max_n_zeros))
- {
- i_max_n_zero = i_first_zero;
- max_n_zeros = n_zeros;
- i_first_zero = ARRAY_LEN (a->as_u16);
- n_zeros = 0;
- }
- }
+ i_max_n_zero = ARRAY_LEN (a->as_u16);
+ max_n_zeros = 0;
+ i_first_zero = i_max_n_zero;
+ n_zeros = 0;
+ for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
+ {
+ u32 is_zero = a->as_u16[i] == 0;
+ if (is_zero && i_first_zero >= ARRAY_LEN (a->as_u16))
+ {
+ i_first_zero = i;
+ n_zeros = 0;
+ }
+ n_zeros += is_zero;
+ if ((!is_zero && n_zeros > max_n_zeros)
+ || (i + 1 >= ARRAY_LEN (a->as_u16) && n_zeros > max_n_zeros))
+ {
+ i_max_n_zero = i_first_zero;
+ max_n_zeros = n_zeros;
+ i_first_zero = ARRAY_LEN (a->as_u16);
+ n_zeros = 0;
+ }
+ }
- last_double_colon = 0;
- for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
- {
- if (i == i_max_n_zero && max_n_zeros > 1)
- {
- s = format (s, "::");
- i += max_n_zeros - 1;
- last_double_colon = 1;
- }
- else
- {
- s = format (s, "%s%x",
- (last_double_colon || i == 0) ? "" : ":",
- clib_net_to_host_u16 (a->as_u16[i]));
- last_double_colon = 0;
- }
- }
+ last_double_colon = 0;
+ for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
+ {
+ if (i == i_max_n_zero && max_n_zeros > 1)
+ {
+ s = format (s, "::");
+ i += max_n_zeros - 1;
+ last_double_colon = 1;
+ }
+ else
+ {
+ s = format (s, "%s%x",
+ (last_double_colon || i == 0) ? "" : ":",
+ clib_net_to_host_u16 (a->as_u16[i]));
+ last_double_colon = 0;
+ }
+ }
- return s;
+ return s;
}
/* Format an IP46 address. */
-u8 * format_ip46_address (u8 * s, va_list * args)
+u8 *
+format_ip46_address (u8 * s, va_list * args)
{
ip46_address_t *ip46 = va_arg (*args, ip46_address_t *);
ip46_type_t type = va_arg (*args, ip46_type_t);
@@ -536,202 +541,206 @@ u8 * format_ip46_address (u8 * s, va_list * args)
switch (type)
{
- case IP46_TYPE_ANY:
- is_ip4 = ip46_address_is_ip4(ip46);
- break;
- case IP46_TYPE_IP4:
- is_ip4 = 1;
- break;
- case IP46_TYPE_IP6:
- is_ip4 = 0;
- break;
+ case IP46_TYPE_ANY:
+ is_ip4 = ip46_address_is_ip4 (ip46);
+ break;
+ case IP46_TYPE_IP4:
+ is_ip4 = 1;
+ break;
+ case IP46_TYPE_IP6:
+ is_ip4 = 0;
+ break;
}
return is_ip4 ?
- format(s, "%U", format_ip4_address, &ip46->ip4):
- format(s, "%U", format_ip6_address, &ip46->ip6);
+ format (s, "%U", format_ip4_address, &ip46->ip4) :
+ format (s, "%U", format_ip6_address, &ip46->ip6);
}
-u8 * format_ethernet_address (u8 * s, va_list * args)
+u8 *
+format_ethernet_address (u8 * s, va_list * args)
{
- u8 * a = va_arg (*args, u8 *);
+ u8 *a = va_arg (*args, u8 *);
return format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
- a[0], a[1], a[2], a[3], a[4], a[5]);
+ a[0], a[1], a[2], a[3], a[4], a[5]);
}
-void increment_v4_address (ip4_address_t * a)
+void
+increment_v4_address (ip4_address_t * a)
{
- u32 v;
+ u32 v;
- v = ntohl(a->as_u32) + 1;
- a->as_u32 = ntohl(v);
+ v = ntohl (a->as_u32) + 1;
+ a->as_u32 = ntohl (v);
}
-void increment_v6_address (ip6_address_t * a)
+void
+increment_v6_address (ip6_address_t * a)
{
- u64 v0, v1;
+ u64 v0, v1;
- v0 = clib_net_to_host_u64 (a->as_u64[0]);
- v1 = clib_net_to_host_u64 (a->as_u64[1]);
+ v0 = clib_net_to_host_u64 (a->as_u64[0]);
+ v1 = clib_net_to_host_u64 (a->as_u64[1]);
- v1 += 1;
- if (v1 == 0)
- v0 += 1;
- a->as_u64[0] = clib_net_to_host_u64 (v0);
- a->as_u64[1] = clib_net_to_host_u64 (v1);
+ v1 += 1;
+ if (v1 == 0)
+ v0 += 1;
+ a->as_u64[0] = clib_net_to_host_u64 (v0);
+ a->as_u64[1] = clib_net_to_host_u64 (v1);
}
-void increment_mac_address (u64 *mac)
+void
+increment_mac_address (u64 * mac)
{
- u64 tmp = *mac;
+ u64 tmp = *mac;
- tmp = clib_net_to_host_u64(tmp);
- tmp += 1<<16; /* skip unused (least significant) octets */
- tmp = clib_host_to_net_u64 (tmp);
- *mac = tmp;
+ tmp = clib_net_to_host_u64 (tmp);
+ tmp += 1 << 16; /* skip unused (least significant) octets */
+ tmp = clib_host_to_net_u64 (tmp);
+ *mac = tmp;
}
static void vl_api_create_loopback_reply_t_handler
-(vl_api_create_loopback_reply_t * mp)
+ (vl_api_create_loopback_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- i32 retval = ntohl(mp->retval);
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
- vam->retval = retval;
- vam->regenerate_interface_table = 1;
- vam->sw_if_index = ntohl (mp->sw_if_index);
- vam->result_ready = 1;
+ vam->retval = retval;
+ vam->regenerate_interface_table = 1;
+ vam->sw_if_index = ntohl (mp->sw_if_index);
+ vam->result_ready = 1;
}
static void vl_api_create_loopback_reply_t_handler_json
-(vl_api_create_loopback_reply_t * mp)
+ (vl_api_create_loopback_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t node;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
- vat_json_init_object(&node);
- vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
- vat_json_object_add_uint(&node, "sw_if_index", ntohl(mp->sw_if_index));
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+ vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
static void vl_api_af_packet_create_reply_t_handler
-(vl_api_af_packet_create_reply_t * mp)
+ (vl_api_af_packet_create_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- i32 retval = ntohl(mp->retval);
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
- vam->retval = retval;
- vam->regenerate_interface_table = 1;
- vam->sw_if_index = ntohl (mp->sw_if_index);
- vam->result_ready = 1;
+ vam->retval = retval;
+ vam->regenerate_interface_table = 1;
+ vam->sw_if_index = ntohl (mp->sw_if_index);
+ vam->result_ready = 1;
}
static void vl_api_af_packet_create_reply_t_handler_json
-(vl_api_af_packet_create_reply_t * mp)
+ (vl_api_af_packet_create_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t node;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
- vat_json_init_object(&node);
- vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
- vat_json_object_add_uint(&node, "sw_if_index", ntohl(mp->sw_if_index));
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+ vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
static void vl_api_create_vlan_subif_reply_t_handler
-(vl_api_create_vlan_subif_reply_t * mp)
+ (vl_api_create_vlan_subif_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- i32 retval = ntohl(mp->retval);
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
- vam->retval = retval;
- vam->regenerate_interface_table = 1;
- vam->sw_if_index = ntohl (mp->sw_if_index);
- vam->result_ready = 1;
+ vam->retval = retval;
+ vam->regenerate_interface_table = 1;
+ vam->sw_if_index = ntohl (mp->sw_if_index);
+ vam->result_ready = 1;
}
static void vl_api_create_vlan_subif_reply_t_handler_json
-(vl_api_create_vlan_subif_reply_t * mp)
+ (vl_api_create_vlan_subif_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t node;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
- vat_json_init_object(&node);
- vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
- vat_json_object_add_uint(&node, "sw_if_index", ntohl(mp->sw_if_index));
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+ vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
static void vl_api_create_subif_reply_t_handler
-(vl_api_create_subif_reply_t * mp)
+ (vl_api_create_subif_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- i32 retval = ntohl(mp->retval);
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
- vam->retval = retval;
- vam->regenerate_interface_table = 1;
- vam->sw_if_index = ntohl (mp->sw_if_index);
- vam->result_ready = 1;
+ vam->retval = retval;
+ vam->regenerate_interface_table = 1;
+ vam->sw_if_index = ntohl (mp->sw_if_index);
+ vam->result_ready = 1;
}
static void vl_api_create_subif_reply_t_handler_json
-(vl_api_create_subif_reply_t * mp)
+ (vl_api_create_subif_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t node;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
- vat_json_init_object(&node);
- vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
- vat_json_object_add_uint(&node, "sw_if_index", ntohl(mp->sw_if_index));
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+ vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
static void vl_api_interface_name_renumber_reply_t_handler
-(vl_api_interface_name_renumber_reply_t * mp)
+ (vl_api_interface_name_renumber_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- i32 retval = ntohl(mp->retval);
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
- vam->retval = retval;
- vam->regenerate_interface_table = 1;
- vam->result_ready = 1;
+ vam->retval = retval;
+ vam->regenerate_interface_table = 1;
+ vam->result_ready = 1;
}
static void vl_api_interface_name_renumber_reply_t_handler_json
-(vl_api_interface_name_renumber_reply_t * mp)
+ (vl_api_interface_name_renumber_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t node;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
- vat_json_init_object(&node);
- vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
/*
@@ -739,359 +748,390 @@ static void vl_api_interface_name_renumber_reply_t_handler_json
* the next loopback sw_if_index vbl.
*/
static void vl_api_sw_interface_details_t_handler
-(vl_api_sw_interface_details_t * mp)
+ (vl_api_sw_interface_details_t * mp)
{
- vat_main_t * vam = &vat_main;
- u8 * s = format (0, "%s%c", mp->interface_name, 0);
+ vat_main_t *vam = &vat_main;
+ u8 *s = format (0, "%s%c", mp->interface_name, 0);
- hash_set_mem (vam->sw_if_index_by_interface_name, s,
- ntohl(mp->sw_if_index));
+ hash_set_mem (vam->sw_if_index_by_interface_name, s,
+ ntohl (mp->sw_if_index));
- /* In sub interface case, fill the sub interface table entry */
- if (mp->sw_if_index != mp->sup_sw_if_index) {
- sw_interface_subif_t * sub = NULL;
+ /* In sub interface case, fill the sub interface table entry */
+ if (mp->sw_if_index != mp->sup_sw_if_index)
+ {
+ sw_interface_subif_t *sub = NULL;
- vec_add2(vam->sw_if_subif_table, sub, 1);
+ vec_add2 (vam->sw_if_subif_table, sub, 1);
- vec_validate(sub->interface_name, strlen((char *)s) + 1);
- strncpy((char *)sub->interface_name, (char *)s,
- vec_len(sub->interface_name));
- sub->sw_if_index = ntohl(mp->sw_if_index);
- sub->sub_id = ntohl(mp->sub_id);
+ vec_validate (sub->interface_name, strlen ((char *) s) + 1);
+ strncpy ((char *) sub->interface_name, (char *) s,
+ vec_len (sub->interface_name));
+ sub->sw_if_index = ntohl (mp->sw_if_index);
+ sub->sub_id = ntohl (mp->sub_id);
- sub->sub_dot1ad = mp->sub_dot1ad;
- sub->sub_number_of_tags = mp->sub_number_of_tags;
- sub->sub_outer_vlan_id = ntohs(mp->sub_outer_vlan_id);
- sub->sub_inner_vlan_id = ntohs(mp->sub_inner_vlan_id);
- sub->sub_exact_match = mp->sub_exact_match;
- sub->sub_default = mp->sub_default;
- sub->sub_outer_vlan_id_any = mp->sub_outer_vlan_id_any;
- sub->sub_inner_vlan_id_any = mp->sub_inner_vlan_id_any;
+ sub->sub_dot1ad = mp->sub_dot1ad;
+ sub->sub_number_of_tags = mp->sub_number_of_tags;
+ sub->sub_outer_vlan_id = ntohs (mp->sub_outer_vlan_id);
+ sub->sub_inner_vlan_id = ntohs (mp->sub_inner_vlan_id);
+ sub->sub_exact_match = mp->sub_exact_match;
+ sub->sub_default = mp->sub_default;
+ sub->sub_outer_vlan_id_any = mp->sub_outer_vlan_id_any;
+ sub->sub_inner_vlan_id_any = mp->sub_inner_vlan_id_any;
- /* vlan tag rewrite */
- sub->vtr_op = ntohl(mp->vtr_op);
- sub->vtr_push_dot1q = ntohl(mp->vtr_push_dot1q);
- sub->vtr_tag1 = ntohl(mp->vtr_tag1);
- sub->vtr_tag2 = ntohl(mp->vtr_tag2);
+ /* vlan tag rewrite */
+ sub->vtr_op = ntohl (mp->vtr_op);
+ sub->vtr_push_dot1q = ntohl (mp->vtr_push_dot1q);
+ sub->vtr_tag1 = ntohl (mp->vtr_tag1);
+ sub->vtr_tag2 = ntohl (mp->vtr_tag2);
}
}
static void vl_api_sw_interface_details_t_handler_json
-(vl_api_sw_interface_details_t * mp)
-{
- vat_main_t * vam = &vat_main;
- vat_json_node_t *node = NULL;
-
- if (VAT_JSON_ARRAY != vam->json_tree.type) {
- ASSERT(VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array(&vam->json_tree);
- }
- node = vat_json_array_add(&vam->json_tree);
-
- vat_json_init_object(node);
- vat_json_object_add_uint(node, "sw_if_index", ntohl(mp->sw_if_index));
- vat_json_object_add_uint(node, "sup_sw_if_index", ntohl(mp->sup_sw_if_index));
- vat_json_object_add_uint(node, "l2_address_length", ntohl(mp->l2_address_length));
- vat_json_object_add_bytes(node, "l2_address", mp->l2_address, sizeof(mp->l2_address));
- vat_json_object_add_string_copy(node, "interface_name", mp->interface_name);
- vat_json_object_add_uint(node, "admin_up_down", mp->admin_up_down);
- vat_json_object_add_uint(node, "link_up_down", mp->link_up_down);
- vat_json_object_add_uint(node, "link_duplex", mp->link_duplex);
- vat_json_object_add_uint(node, "link_speed", mp->link_speed);
- vat_json_object_add_uint(node, "mtu", ntohs(mp->link_mtu));
- vat_json_object_add_uint(node, "sub_id", ntohl(mp->sub_id));
- vat_json_object_add_uint(node, "sub_dot1ad", mp->sub_dot1ad);
- vat_json_object_add_uint(node, "sub_number_of_tags", mp->sub_number_of_tags);
- vat_json_object_add_uint(node, "sub_outer_vlan_id", ntohs(mp->sub_outer_vlan_id));
- vat_json_object_add_uint(node, "sub_inner_vlan_id", ntohs(mp->sub_inner_vlan_id));
- vat_json_object_add_uint(node, "sub_exact_match", mp->sub_exact_match);
- vat_json_object_add_uint(node, "sub_default", mp->sub_default);
- vat_json_object_add_uint(node, "sub_outer_vlan_id_any", mp->sub_outer_vlan_id_any);
- vat_json_object_add_uint(node, "sub_inner_vlan_id_any", mp->sub_inner_vlan_id_any);
- vat_json_object_add_uint(node, "vtr_op", ntohl(mp->vtr_op));
- vat_json_object_add_uint(node, "vtr_push_dot1q", ntohl(mp->vtr_push_dot1q));
- vat_json_object_add_uint(node, "vtr_tag1", ntohl(mp->vtr_tag1));
- vat_json_object_add_uint(node, "vtr_tag2", ntohl(mp->vtr_tag2));
+ (vl_api_sw_interface_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
+
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
+ }
+ node = vat_json_array_add (&vam->json_tree);
+
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+ vat_json_object_add_uint (node, "sup_sw_if_index",
+ ntohl (mp->sup_sw_if_index));
+ vat_json_object_add_uint (node, "l2_address_length",
+ ntohl (mp->l2_address_length));
+ vat_json_object_add_bytes (node, "l2_address", mp->l2_address,
+ sizeof (mp->l2_address));
+ vat_json_object_add_string_copy (node, "interface_name",
+ mp->interface_name);
+ vat_json_object_add_uint (node, "admin_up_down", mp->admin_up_down);
+ vat_json_object_add_uint (node, "link_up_down", mp->link_up_down);
+ vat_json_object_add_uint (node, "link_duplex", mp->link_duplex);
+ vat_json_object_add_uint (node, "link_speed", mp->link_speed);
+ vat_json_object_add_uint (node, "mtu", ntohs (mp->link_mtu));
+ vat_json_object_add_uint (node, "sub_id", ntohl (mp->sub_id));
+ vat_json_object_add_uint (node, "sub_dot1ad", mp->sub_dot1ad);
+ vat_json_object_add_uint (node, "sub_number_of_tags",
+ mp->sub_number_of_tags);
+ vat_json_object_add_uint (node, "sub_outer_vlan_id",
+ ntohs (mp->sub_outer_vlan_id));
+ vat_json_object_add_uint (node, "sub_inner_vlan_id",
+ ntohs (mp->sub_inner_vlan_id));
+ vat_json_object_add_uint (node, "sub_exact_match", mp->sub_exact_match);
+ vat_json_object_add_uint (node, "sub_default", mp->sub_default);
+ vat_json_object_add_uint (node, "sub_outer_vlan_id_any",
+ mp->sub_outer_vlan_id_any);
+ vat_json_object_add_uint (node, "sub_inner_vlan_id_any",
+ mp->sub_inner_vlan_id_any);
+ vat_json_object_add_uint (node, "vtr_op", ntohl (mp->vtr_op));
+ vat_json_object_add_uint (node, "vtr_push_dot1q",
+ ntohl (mp->vtr_push_dot1q));
+ vat_json_object_add_uint (node, "vtr_tag1", ntohl (mp->vtr_tag1));
+ vat_json_object_add_uint (node, "vtr_tag2", ntohl (mp->vtr_tag2));
}
static void vl_api_sw_interface_set_flags_t_handler
-(vl_api_sw_interface_set_flags_t * mp)
+ (vl_api_sw_interface_set_flags_t * mp)
{
- vat_main_t * vam = &vat_main;
- if (vam->interface_event_display)
- errmsg ("interface flags: sw_if_index %d %s %s\n",
- ntohl(mp->sw_if_index),
- mp->admin_up_down ? "admin-up" : "admin-down",
- mp->link_up_down ? "link-up" : "link-down");
+ vat_main_t *vam = &vat_main;
+ if (vam->interface_event_display)
+ errmsg ("interface flags: sw_if_index %d %s %s\n",
+ ntohl (mp->sw_if_index),
+ mp->admin_up_down ? "admin-up" : "admin-down",
+ mp->link_up_down ? "link-up" : "link-down");
}
static void vl_api_sw_interface_set_flags_t_handler_json
-(vl_api_sw_interface_set_flags_t * mp)
+ (vl_api_sw_interface_set_flags_t * mp)
{
- /* JSON output not supported */
+ /* JSON output not supported */
}
-static void vl_api_cli_reply_t_handler
-(vl_api_cli_reply_t * mp)
+static void
+vl_api_cli_reply_t_handler (vl_api_cli_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- i32 retval = ntohl(mp->retval);
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
- vam->retval = retval;
- vam->shmem_result = (u8 *) mp->reply_in_shmem;
- vam->result_ready = 1;
+ vam->retval = retval;
+ vam->shmem_result = (u8 *) mp->reply_in_shmem;
+ vam->result_ready = 1;
}
-static void vl_api_cli_reply_t_handler_json
-(vl_api_cli_reply_t * mp)
+static void
+vl_api_cli_reply_t_handler_json (vl_api_cli_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t node;
- api_main_t * am = &api_main;
- void * oldheap;
- u8 * reply;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
+ api_main_t *am = &api_main;
+ void *oldheap;
+ u8 *reply;
- vat_json_init_object(&node);
- vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
- vat_json_object_add_uint(&node, "reply_in_shmem",
- ntohl(mp->reply_in_shmem));
- /* Toss the shared-memory original... */
- pthread_mutex_lock (&am->vlib_rp->mutex);
- oldheap = svm_push_data_heap (am->vlib_rp);
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+ vat_json_object_add_uint (&node, "reply_in_shmem",
+ ntohl (mp->reply_in_shmem));
+ /* Toss the shared-memory original... */
+ pthread_mutex_lock (&am->vlib_rp->mutex);
+ oldheap = svm_push_data_heap (am->vlib_rp);
- reply = (u8 *)(mp->reply_in_shmem);
- vec_free (reply);
+ reply = (u8 *) (mp->reply_in_shmem);
+ vec_free (reply);
- svm_pop_heap (oldheap);
- pthread_mutex_unlock (&am->vlib_rp->mutex);
+ svm_pop_heap (oldheap);
+ pthread_mutex_unlock (&am->vlib_rp->mutex);
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
static void vl_api_classify_add_del_table_reply_t_handler
-(vl_api_classify_add_del_table_reply_t * mp)
-{
- vat_main_t * vam = &vat_main;
- i32 retval = ntohl(mp->retval);
- if (vam->async_mode) {
- vam->async_errors += (retval < 0);
- } else {
- vam->retval = retval;
- if (retval == 0 &&
- ((mp->new_table_index != 0xFFFFFFFF) ||
- (mp->skip_n_vectors != 0xFFFFFFFF) ||
- (mp->match_n_vectors != 0xFFFFFFFF)))
- /*
- * Note: this is just barely thread-safe, depends on
- * the main thread spinning waiting for an answer...
- */
- errmsg ("new index %d, skip_n_vectors %d, match_n_vectors %d\n",
- ntohl(mp->new_table_index),
- ntohl(mp->skip_n_vectors), ntohl(mp->match_n_vectors));
- vam->result_ready = 1;
+ (vl_api_classify_add_del_table_reply_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
+ if (vam->async_mode)
+ {
+ vam->async_errors += (retval < 0);
+ }
+ else
+ {
+ vam->retval = retval;
+ if (retval == 0 &&
+ ((mp->new_table_index != 0xFFFFFFFF) ||
+ (mp->skip_n_vectors != 0xFFFFFFFF) ||
+ (mp->match_n_vectors != 0xFFFFFFFF)))
+ /*
+ * Note: this is just barely thread-safe, depends on
+ * the main thread spinning waiting for an answer...
+ */
+ errmsg ("new index %d, skip_n_vectors %d, match_n_vectors %d\n",
+ ntohl (mp->new_table_index),
+ ntohl (mp->skip_n_vectors), ntohl (mp->match_n_vectors));
+ vam->result_ready = 1;
}
}
static void vl_api_classify_add_del_table_reply_t_handler_json
-(vl_api_classify_add_del_table_reply_t * mp)
+ (vl_api_classify_add_del_table_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t node;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
- vat_json_init_object(&node);
- vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
- vat_json_object_add_uint(&node, "new_table_index", ntohl(mp->new_table_index));
- vat_json_object_add_uint(&node, "skip_n_vectors", ntohl(mp->skip_n_vectors));
- vat_json_object_add_uint(&node, "match_n_vectors", ntohl(mp->match_n_vectors));
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+ vat_json_object_add_uint (&node, "new_table_index",
+ ntohl (mp->new_table_index));
+ vat_json_object_add_uint (&node, "skip_n_vectors",
+ ntohl (mp->skip_n_vectors));
+ vat_json_object_add_uint (&node, "match_n_vectors",
+ ntohl (mp->match_n_vectors));
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
static void vl_api_get_node_index_reply_t_handler
-(vl_api_get_node_index_reply_t * mp)
+ (vl_api_get_node_index_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- i32 retval = ntohl(mp->retval);
- if (vam->async_mode) {
- vam->async_errors += (retval < 0);
- } else {
- vam->retval = retval;
- if (retval == 0)
- errmsg ("node index %d\n", ntohl(mp->node_index));
- vam->result_ready = 1;
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
+ if (vam->async_mode)
+ {
+ vam->async_errors += (retval < 0);
+ }
+ else
+ {
+ vam->retval = retval;
+ if (retval == 0)
+ errmsg ("node index %d\n", ntohl (mp->node_index));
+ vam->result_ready = 1;
}
}
static void vl_api_get_node_index_reply_t_handler_json
-(vl_api_get_node_index_reply_t * mp)
+ (vl_api_get_node_index_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t node;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
- vat_json_init_object(&node);
- vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
- vat_json_object_add_uint(&node, "node_index", ntohl(mp->node_index));
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+ vat_json_object_add_uint (&node, "node_index", ntohl (mp->node_index));
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
static void vl_api_get_next_index_reply_t_handler
-(vl_api_get_next_index_reply_t * mp)
+ (vl_api_get_next_index_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- i32 retval = ntohl(mp->retval);
- if (vam->async_mode) {
- vam->async_errors += (retval < 0);
- } else {
- vam->retval = retval;
- if (retval == 0)
- errmsg ("next node index %d\n", ntohl(mp->next_index));
- vam->result_ready = 1;
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
+ if (vam->async_mode)
+ {
+ vam->async_errors += (retval < 0);
+ }
+ else
+ {
+ vam->retval = retval;
+ if (retval == 0)
+ errmsg ("next node index %d\n", ntohl (mp->next_index));
+ vam->result_ready = 1;
}
}
static void vl_api_get_next_index_reply_t_handler_json
-(vl_api_get_next_index_reply_t * mp)
+ (vl_api_get_next_index_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t node;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
- vat_json_init_object(&node);
- vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
- vat_json_object_add_uint(&node, "next_index", ntohl(mp->next_index));
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+ vat_json_object_add_uint (&node, "next_index", ntohl (mp->next_index));
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
static void vl_api_add_node_next_reply_t_handler
-(vl_api_add_node_next_reply_t * mp)
+ (vl_api_add_node_next_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- i32 retval = ntohl(mp->retval);
- if (vam->async_mode) {
- vam->async_errors += (retval < 0);
- } else {
- vam->retval = retval;
- if (retval == 0)
- errmsg ("next index %d\n", ntohl(mp->next_index));
- vam->result_ready = 1;
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
+ if (vam->async_mode)
+ {
+ vam->async_errors += (retval < 0);
+ }
+ else
+ {
+ vam->retval = retval;
+ if (retval == 0)
+ errmsg ("next index %d\n", ntohl (mp->next_index));
+ vam->result_ready = 1;
}
}
static void vl_api_add_node_next_reply_t_handler_json
-(vl_api_add_node_next_reply_t * mp)
+ (vl_api_add_node_next_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t node;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
- vat_json_init_object(&node);
- vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
- vat_json_object_add_uint(&node, "next_index", ntohl(mp->next_index));
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+ vat_json_object_add_uint (&node, "next_index", ntohl (mp->next_index));
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
static void vl_api_mpls_gre_add_del_tunnel_reply_t_handler
-(vl_api_mpls_gre_add_del_tunnel_reply_t * mp)
+ (vl_api_mpls_gre_add_del_tunnel_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- i32 retval = ntohl(mp->retval);
- u32 sw_if_index = ntohl(mp->tunnel_sw_if_index);
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
+ u32 sw_if_index = ntohl (mp->tunnel_sw_if_index);
- if (retval >= 0 && sw_if_index != (u32)~0) {
- errmsg ("tunnel_sw_if_index %d\n", sw_if_index);
+ if (retval >= 0 && sw_if_index != (u32) ~ 0)
+ {
+ errmsg ("tunnel_sw_if_index %d\n", sw_if_index);
}
- vam->retval = retval;
- vam->result_ready = 1;
+ vam->retval = retval;
+ vam->result_ready = 1;
}
static void vl_api_mpls_gre_add_del_tunnel_reply_t_handler_json
-(vl_api_mpls_gre_add_del_tunnel_reply_t * mp)
+ (vl_api_mpls_gre_add_del_tunnel_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t node;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
- vat_json_init_object(&node);
- vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
- vat_json_object_add_uint(&node, "tunnel_sw_if_index", ntohl(mp->tunnel_sw_if_index));
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+ vat_json_object_add_uint (&node, "tunnel_sw_if_index",
+ ntohl (mp->tunnel_sw_if_index));
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
static void vl_api_show_version_reply_t_handler
-(vl_api_show_version_reply_t * mp)
+ (vl_api_show_version_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- i32 retval = ntohl(mp->retval);
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
- if (retval >= 0) {
- errmsg (" program: %s\n", mp->program);
- errmsg (" version: %s\n", mp->version);
- errmsg (" build date: %s\n", mp->build_date);
- errmsg ("build directory: %s\n", mp->build_directory);
+ if (retval >= 0)
+ {
+ errmsg (" program: %s\n", mp->program);
+ errmsg (" version: %s\n", mp->version);
+ errmsg (" build date: %s\n", mp->build_date);
+ errmsg ("build directory: %s\n", mp->build_directory);
}
- vam->retval = retval;
- vam->result_ready = 1;
+ vam->retval = retval;
+ vam->result_ready = 1;
}
static void vl_api_show_version_reply_t_handler_json
-(vl_api_show_version_reply_t * mp)
+ (vl_api_show_version_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t node;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
- vat_json_init_object(&node);
- vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
- vat_json_object_add_string_copy(&node, "program", mp->program);
- vat_json_object_add_string_copy(&node, "version", mp->version);
- vat_json_object_add_string_copy(&node, "build_date", mp->build_date);
- vat_json_object_add_string_copy(&node, "build_directory", mp->build_directory);
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+ vat_json_object_add_string_copy (&node, "program", mp->program);
+ vat_json_object_add_string_copy (&node, "version", mp->version);
+ vat_json_object_add_string_copy (&node, "build_date", mp->build_date);
+ vat_json_object_add_string_copy (&node, "build_directory",
+ mp->build_directory);
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
-static void vl_api_ip4_arp_event_t_handler
-(vl_api_ip4_arp_event_t * mp)
+static void
+vl_api_ip4_arp_event_t_handler (vl_api_ip4_arp_event_t * mp)
{
- vat_main_t * vam = &vat_main;
- errmsg ("arp event: address %U new mac %U sw_if_index %d\n",
- format_ip4_address, &mp->address,
- format_ethernet_address, mp->new_mac, mp->sw_if_index);
+ vat_main_t *vam = &vat_main;
+ errmsg ("arp event: address %U new mac %U sw_if_index %d\n",
+ format_ip4_address, &mp->address,
+ format_ethernet_address, mp->new_mac, mp->sw_if_index);
}
-static void vl_api_ip4_arp_event_t_handler_json
-(vl_api_ip4_arp_event_t * mp)
+static void
+vl_api_ip4_arp_event_t_handler_json (vl_api_ip4_arp_event_t * mp)
{
- /* JSON output not supported */
+ /* JSON output not supported */
}
/*
@@ -1099,1140 +1139,1259 @@ static void vl_api_ip4_arp_event_t_handler_json
* the next bd id vbl.
*/
static void vl_api_bridge_domain_details_t_handler
-(vl_api_bridge_domain_details_t * mp)
+ (vl_api_bridge_domain_details_t * mp)
{
- vat_main_t * vam = &vat_main;
- u32 n_sw_ifs = ntohl (mp->n_sw_ifs);
+ vat_main_t *vam = &vat_main;
+ u32 n_sw_ifs = ntohl (mp->n_sw_ifs);
- fformat (vam->ofp, "\n%-3s %-3s %-3s %-3s %-3s %-3s\n",
- " ID", "LRN", "FWD", "FLD", "BVI", "#IF");
+ fformat (vam->ofp, "\n%-3s %-3s %-3s %-3s %-3s %-3s\n",
+ " ID", "LRN", "FWD", "FLD", "BVI", "#IF");
- fformat (vam->ofp, "%3d %3d %3d %3d %3d %3d\n",
- ntohl (mp->bd_id), mp->learn, mp->forward,
- mp->flood, ntohl (mp->bvi_sw_if_index), n_sw_ifs);
+ fformat (vam->ofp, "%3d %3d %3d %3d %3d %3d\n",
+ ntohl (mp->bd_id), mp->learn, mp->forward,
+ mp->flood, ntohl (mp->bvi_sw_if_index), n_sw_ifs);
- if (n_sw_ifs)
- fformat (vam->ofp, "\n\n%s %s %s\n", "sw_if_index", "SHG",
- "Interface Name");
+ if (n_sw_ifs)
+ fformat (vam->ofp, "\n\n%s %s %s\n", "sw_if_index", "SHG",
+ "Interface Name");
}
static void vl_api_bridge_domain_details_t_handler_json
-(vl_api_bridge_domain_details_t * mp)
+ (vl_api_bridge_domain_details_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t *node, *array = NULL;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node, *array = NULL;
- if (VAT_JSON_ARRAY != vam->json_tree.type) {
- ASSERT(VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array(&vam->json_tree);
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
}
- node = vat_json_array_add(&vam->json_tree);
+ node = vat_json_array_add (&vam->json_tree);
- vat_json_init_object(node);
- vat_json_object_add_uint(node, "bd_id", ntohl(mp->bd_id));
- vat_json_object_add_uint(node, "flood", mp->flood);
- vat_json_object_add_uint(node, "forward", mp->forward);
- vat_json_object_add_uint(node, "learn", mp->learn);
- vat_json_object_add_uint(node, "bvi_sw_if_index", ntohl(mp->bvi_sw_if_index));
- vat_json_object_add_uint(node, "n_sw_ifs", ntohl(mp->n_sw_ifs));
- array = vat_json_object_add(node, "sw_if");
- vat_json_init_array(array);
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "bd_id", ntohl (mp->bd_id));
+ vat_json_object_add_uint (node, "flood", mp->flood);
+ vat_json_object_add_uint (node, "forward", mp->forward);
+ vat_json_object_add_uint (node, "learn", mp->learn);
+ vat_json_object_add_uint (node, "bvi_sw_if_index",
+ ntohl (mp->bvi_sw_if_index));
+ vat_json_object_add_uint (node, "n_sw_ifs", ntohl (mp->n_sw_ifs));
+ array = vat_json_object_add (node, "sw_if");
+ vat_json_init_array (array);
}
/*
* Special-case: build the bridge domain sw if table.
*/
static void vl_api_bridge_domain_sw_if_details_t_handler
-(vl_api_bridge_domain_sw_if_details_t * mp)
-{
- vat_main_t * vam = &vat_main;
- hash_pair_t * p;
- u8 * sw_if_name = 0;
- u32 sw_if_index;
-
- sw_if_index = ntohl (mp->sw_if_index);
- hash_foreach_pair (p, vam->sw_if_index_by_interface_name,
- ({
- if ((u32) p->value[0] == sw_if_index) {
- sw_if_name = (u8 *)(p->key);
- break;
- }
- }));
+ (vl_api_bridge_domain_sw_if_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ hash_pair_t *p;
+ u8 *sw_if_name = 0;
+ u32 sw_if_index;
+
+ sw_if_index = ntohl (mp->sw_if_index);
+ /* *INDENT-OFF* */
+ hash_foreach_pair (p, vam->sw_if_index_by_interface_name,
+ ({
+ if ((u32) p->value[0] == sw_if_index)
+ {
+ sw_if_name = (u8 *)(p->key);
+ break;
+ }
+ }));
+ /* *INDENT-ON* */
- fformat (vam->ofp, "%7d %3d %s", sw_if_index,
- mp->shg, sw_if_name ? (char *)sw_if_name :
- "sw_if_index not found!");
+ fformat (vam->ofp, "%7d %3d %s", sw_if_index,
+ mp->shg, sw_if_name ? (char *) sw_if_name :
+ "sw_if_index not found!");
}
static void vl_api_bridge_domain_sw_if_details_t_handler_json
-(vl_api_bridge_domain_sw_if_details_t * mp)
+ (vl_api_bridge_domain_sw_if_details_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t *node = NULL;
- uword last_index = 0;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
+ uword last_index = 0;
- ASSERT(VAT_JSON_ARRAY == vam->json_tree.type);
- ASSERT(vec_len(vam->json_tree.array) >= 1);
- last_index = vec_len(vam->json_tree.array) - 1;
- node = &vam->json_tree.array[last_index];
- node = vat_json_object_get_element(node, "sw_if");
- ASSERT(NULL != node);
- node = vat_json_array_add(node);
+ ASSERT (VAT_JSON_ARRAY == vam->json_tree.type);
+ ASSERT (vec_len (vam->json_tree.array) >= 1);
+ last_index = vec_len (vam->json_tree.array) - 1;
+ node = &vam->json_tree.array[last_index];
+ node = vat_json_object_get_element (node, "sw_if");
+ ASSERT (NULL != node);
+ node = vat_json_array_add (node);
- vat_json_init_object(node);
- vat_json_object_add_uint(node, "bd_id", ntohl(mp->bd_id));
- vat_json_object_add_uint(node, "sw_if_index", ntohl(mp->sw_if_index));
- vat_json_object_add_uint(node, "shg", mp->shg);
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "bd_id", ntohl (mp->bd_id));
+ vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+ vat_json_object_add_uint (node, "shg", mp->shg);
}
static void vl_api_control_ping_reply_t_handler
-(vl_api_control_ping_reply_t * mp)
+ (vl_api_control_ping_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- i32 retval = ntohl(mp->retval);
- if (vam->async_mode) {
- vam->async_errors += (retval < 0);
- } else {
- vam->retval = retval;
- vam->result_ready = 1;
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
+ if (vam->async_mode)
+ {
+ vam->async_errors += (retval < 0);
+ }
+ else
+ {
+ vam->retval = retval;
+ vam->result_ready = 1;
}
}
static void vl_api_control_ping_reply_t_handler_json
-(vl_api_control_ping_reply_t * mp)
+ (vl_api_control_ping_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- i32 retval = ntohl(mp->retval);
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
- if (VAT_JSON_NONE != vam->json_tree.type) {
- vat_json_print(vam->ofp, &vam->json_tree);
- vat_json_free(&vam->json_tree);
- vam->json_tree.type = VAT_JSON_NONE;
- } else {
- /* just print [] */
- vat_json_init_array(&vam->json_tree);
- vat_json_print(vam->ofp, &vam->json_tree);
- vam->json_tree.type = VAT_JSON_NONE;
+ if (VAT_JSON_NONE != vam->json_tree.type)
+ {
+ vat_json_print (vam->ofp, &vam->json_tree);
+ vat_json_free (&vam->json_tree);
+ vam->json_tree.type = VAT_JSON_NONE;
+ }
+ else
+ {
+ /* just print [] */
+ vat_json_init_array (&vam->json_tree);
+ vat_json_print (vam->ofp, &vam->json_tree);
+ vam->json_tree.type = VAT_JSON_NONE;
}
- vam->retval = retval;
- vam->result_ready = 1;
+ vam->retval = retval;
+ vam->result_ready = 1;
}
static void vl_api_noprint_control_ping_reply_t_handler
-(vl_api_noprint_control_ping_reply_t * mp)
+ (vl_api_noprint_control_ping_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- i32 retval = ntohl(mp->retval);
- if (vam->async_mode) {
- vam->async_errors += (retval < 0);
- } else {
- vam->retval = retval;
- vam->result_ready = 1;
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
+ if (vam->async_mode)
+ {
+ vam->async_errors += (retval < 0);
+ }
+ else
+ {
+ vam->retval = retval;
+ vam->result_ready = 1;
}
}
static void vl_api_noprint_control_ping_reply_t_handler_json
-(vl_api_noprint_control_ping_reply_t * mp)
+ (vl_api_noprint_control_ping_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- i32 retval = ntohl(mp->retval);
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
- if (vam->noprint_msg) {
+ if (vam->noprint_msg)
+ {
vam->retval = retval;
vam->result_ready = 1;
return;
}
- if (VAT_JSON_NONE != vam->json_tree.type) {
- vat_json_print(vam->ofp, &vam->json_tree);
- vat_json_free(&vam->json_tree);
- vam->json_tree.type = VAT_JSON_NONE;
- } else {
- /* just print [] */
- vat_json_init_array(&vam->json_tree);
- vat_json_print(vam->ofp, &vam->json_tree);
- vam->json_tree.type = VAT_JSON_NONE;
+ if (VAT_JSON_NONE != vam->json_tree.type)
+ {
+ vat_json_print (vam->ofp, &vam->json_tree);
+ vat_json_free (&vam->json_tree);
+ vam->json_tree.type = VAT_JSON_NONE;
+ }
+ else
+ {
+ /* just print [] */
+ vat_json_init_array (&vam->json_tree);
+ vat_json_print (vam->ofp, &vam->json_tree);
+ vam->json_tree.type = VAT_JSON_NONE;
}
- vam->retval = retval;
- vam->result_ready = 1;
+ vam->retval = retval;
+ vam->result_ready = 1;
}
-static void vl_api_l2_flags_reply_t_handler
-(vl_api_l2_flags_reply_t * mp)
+static void
+vl_api_l2_flags_reply_t_handler (vl_api_l2_flags_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- i32 retval = ntohl(mp->retval);
- if (vam->async_mode) {
- vam->async_errors += (retval < 0);
- } else {
- vam->retval = retval;
- vam->result_ready = 1;
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
+ if (vam->async_mode)
+ {
+ vam->async_errors += (retval < 0);
+ }
+ else
+ {
+ vam->retval = retval;
+ vam->result_ready = 1;
}
}
static void vl_api_l2_flags_reply_t_handler_json
-(vl_api_l2_flags_reply_t * mp)
+ (vl_api_l2_flags_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t node;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
- vat_json_init_object(&node);
- vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
- vat_json_object_add_uint(&node, "resulting_feature_bitmap", ntohl(mp->resulting_feature_bitmap));
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+ vat_json_object_add_uint (&node, "resulting_feature_bitmap",
+ ntohl (mp->resulting_feature_bitmap));
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
static void vl_api_bridge_flags_reply_t_handler
-(vl_api_bridge_flags_reply_t * mp)
+ (vl_api_bridge_flags_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- i32 retval = ntohl(mp->retval);
- if (vam->async_mode) {
- vam->async_errors += (retval < 0);
- } else {
- vam->retval = retval;
- vam->result_ready = 1;
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
+ if (vam->async_mode)
+ {
+ vam->async_errors += (retval < 0);
+ }
+ else
+ {
+ vam->retval = retval;
+ vam->result_ready = 1;
}
}
static void vl_api_bridge_flags_reply_t_handler_json
-(vl_api_bridge_flags_reply_t * mp)
+ (vl_api_bridge_flags_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t node;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
- vat_json_init_object(&node);
- vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
- vat_json_object_add_uint(&node, "resulting_feature_bitmap", ntohl(mp->resulting_feature_bitmap));
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+ vat_json_object_add_uint (&node, "resulting_feature_bitmap",
+ ntohl (mp->resulting_feature_bitmap));
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
static void vl_api_tap_connect_reply_t_handler
-(vl_api_tap_connect_reply_t * mp)
+ (vl_api_tap_connect_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- i32 retval = ntohl(mp->retval);
- if (vam->async_mode) {
- vam->async_errors += (retval < 0);
- } else {
- vam->retval = retval;
- vam->sw_if_index = ntohl (mp->sw_if_index);
- vam->result_ready = 1;
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
+ if (vam->async_mode)
+ {
+ vam->async_errors += (retval < 0);
+ }
+ else
+ {
+ vam->retval = retval;
+ vam->sw_if_index = ntohl (mp->sw_if_index);
+ vam->result_ready = 1;
}
}
static void vl_api_tap_connect_reply_t_handler_json
-(vl_api_tap_connect_reply_t * mp)
+ (vl_api_tap_connect_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t node;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
- vat_json_init_object(&node);
- vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
- vat_json_object_add_uint(&node, "sw_if_index", ntohl(mp->sw_if_index));
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+ vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
-static void vl_api_tap_modify_reply_t_handler
-(vl_api_tap_modify_reply_t * mp)
+static void
+vl_api_tap_modify_reply_t_handler (vl_api_tap_modify_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- i32 retval = ntohl(mp->retval);
- if (vam->async_mode) {
- vam->async_errors += (retval < 0);
- } else {
- vam->retval = retval;
- vam->sw_if_index = ntohl (mp->sw_if_index);
- vam->result_ready = 1;
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
+ if (vam->async_mode)
+ {
+ vam->async_errors += (retval < 0);
+ }
+ else
+ {
+ vam->retval = retval;
+ vam->sw_if_index = ntohl (mp->sw_if_index);
+ vam->result_ready = 1;
}
}
static void vl_api_tap_modify_reply_t_handler_json
-(vl_api_tap_modify_reply_t * mp)
+ (vl_api_tap_modify_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t node;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
- vat_json_init_object(&node);
- vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
- vat_json_object_add_uint(&node, "sw_if_index", ntohl(mp->sw_if_index));
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+ vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
-static void vl_api_tap_delete_reply_t_handler
-(vl_api_tap_delete_reply_t * mp)
+static void
+vl_api_tap_delete_reply_t_handler (vl_api_tap_delete_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- i32 retval = ntohl(mp->retval);
- if (vam->async_mode) {
- vam->async_errors += (retval < 0);
- } else {
- vam->retval = retval;
- vam->result_ready = 1;
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
+ if (vam->async_mode)
+ {
+ vam->async_errors += (retval < 0);
+ }
+ else
+ {
+ vam->retval = retval;
+ vam->result_ready = 1;
}
}
static void vl_api_tap_delete_reply_t_handler_json
-(vl_api_tap_delete_reply_t * mp)
+ (vl_api_tap_delete_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t node;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
- vat_json_init_object(&node);
- vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
static void vl_api_mpls_ethernet_add_del_tunnel_reply_t_handler
-(vl_api_mpls_ethernet_add_del_tunnel_reply_t * mp)
+ (vl_api_mpls_ethernet_add_del_tunnel_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- i32 retval = ntohl(mp->retval);
- if (vam->async_mode) {
- vam->async_errors += (retval < 0);
- } else {
- vam->retval = retval;
- vam->result_ready = 1;
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
+ if (vam->async_mode)
+ {
+ vam->async_errors += (retval < 0);
+ }
+ else
+ {
+ vam->retval = retval;
+ vam->result_ready = 1;
}
}
static void vl_api_mpls_ethernet_add_del_tunnel_reply_t_handler_json
-(vl_api_mpls_ethernet_add_del_tunnel_reply_t * mp)
+ (vl_api_mpls_ethernet_add_del_tunnel_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t node;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
- vat_json_init_object(&node);
- vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
- vat_json_object_add_uint(&node, "tunnel_sw_if_index", ntohl(mp->tunnel_sw_if_index));
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+ vat_json_object_add_uint (&node, "tunnel_sw_if_index",
+ ntohl (mp->tunnel_sw_if_index));
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
static void vl_api_l2tpv3_create_tunnel_reply_t_handler
-(vl_api_l2tpv3_create_tunnel_reply_t * mp)
+ (vl_api_l2tpv3_create_tunnel_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- i32 retval = ntohl(mp->retval);
- if (vam->async_mode) {
- vam->async_errors += (retval < 0);
- } else {
- vam->retval = retval;
- vam->sw_if_index = ntohl (mp->sw_if_index);
- vam->result_ready = 1;
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
+ if (vam->async_mode)
+ {
+ vam->async_errors += (retval < 0);
+ }
+ else
+ {
+ vam->retval = retval;
+ vam->sw_if_index = ntohl (mp->sw_if_index);
+ vam->result_ready = 1;
}
}
static void vl_api_l2tpv3_create_tunnel_reply_t_handler_json
-(vl_api_l2tpv3_create_tunnel_reply_t * mp)
+ (vl_api_l2tpv3_create_tunnel_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t node;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
- vat_json_init_object(&node);
- vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
- vat_json_object_add_uint(&node, "sw_if_index", ntohl(mp->sw_if_index));
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+ vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
static void vl_api_vxlan_add_del_tunnel_reply_t_handler
-(vl_api_vxlan_add_del_tunnel_reply_t * mp)
+ (vl_api_vxlan_add_del_tunnel_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- i32 retval = ntohl(mp->retval);
- if (vam->async_mode) {
- vam->async_errors += (retval < 0);
- } else {
- vam->retval = retval;
- vam->sw_if_index = ntohl (mp->sw_if_index);
- vam->result_ready = 1;
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
+ if (vam->async_mode)
+ {
+ vam->async_errors += (retval < 0);
+ }
+ else
+ {
+ vam->retval = retval;
+ vam->sw_if_index = ntohl (mp->sw_if_index);
+ vam->result_ready = 1;
}
}
static void vl_api_vxlan_add_del_tunnel_reply_t_handler_json
-(vl_api_vxlan_add_del_tunnel_reply_t * mp)
+ (vl_api_vxlan_add_del_tunnel_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t node;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
- vat_json_init_object(&node);
- vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
- vat_json_object_add_uint(&node, "sw_if_index", ntohl(mp->sw_if_index));
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+ vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
static void vl_api_gre_add_del_tunnel_reply_t_handler
-(vl_api_gre_add_del_tunnel_reply_t * mp)
+ (vl_api_gre_add_del_tunnel_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- i32 retval = ntohl(mp->retval);
- if (vam->async_mode) {
- vam->async_errors += (retval < 0);
- } else {
- vam->retval = retval;
- vam->sw_if_index = ntohl (mp->sw_if_index);
- vam->result_ready = 1;
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
+ if (vam->async_mode)
+ {
+ vam->async_errors += (retval < 0);
+ }
+ else
+ {
+ vam->retval = retval;
+ vam->sw_if_index = ntohl (mp->sw_if_index);
+ vam->result_ready = 1;
}
}
static void vl_api_gre_add_del_tunnel_reply_t_handler_json
-(vl_api_gre_add_del_tunnel_reply_t * mp)
+ (vl_api_gre_add_del_tunnel_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t node;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
- vat_json_init_object(&node);
- vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
- vat_json_object_add_uint(&node, "sw_if_index", ntohl(mp->sw_if_index));
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+ vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
static void vl_api_create_vhost_user_if_reply_t_handler
-(vl_api_create_vhost_user_if_reply_t * mp)
+ (vl_api_create_vhost_user_if_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- i32 retval = ntohl(mp->retval);
- if (vam->async_mode) {
- vam->async_errors += (retval < 0);
- } else {
- vam->retval = retval;
- vam->sw_if_index = ntohl (mp->sw_if_index);
- vam->result_ready = 1;
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
+ if (vam->async_mode)
+ {
+ vam->async_errors += (retval < 0);
+ }
+ else
+ {
+ vam->retval = retval;
+ vam->sw_if_index = ntohl (mp->sw_if_index);
+ vam->result_ready = 1;
}
}
static void vl_api_create_vhost_user_if_reply_t_handler_json
-(vl_api_create_vhost_user_if_reply_t * mp)
+ (vl_api_create_vhost_user_if_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t node;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
- vat_json_init_object(&node);
- vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
- vat_json_object_add_uint(&node, "sw_if_index", ntohl(mp->sw_if_index));
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+ vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
static void vl_api_ip_address_details_t_handler
-(vl_api_ip_address_details_t * mp)
+ (vl_api_ip_address_details_t * mp)
{
- vat_main_t * vam = &vat_main;
- static ip_address_details_t empty_ip_address_details = {{0}};
- ip_address_details_t * address = NULL;
- ip_details_t * current_ip_details = NULL;
- ip_details_t * details = NULL;
+ vat_main_t *vam = &vat_main;
+ static ip_address_details_t empty_ip_address_details = { {0} };
+ ip_address_details_t *address = NULL;
+ ip_details_t *current_ip_details = NULL;
+ ip_details_t *details = NULL;
- details = vam->ip_details_by_sw_if_index[vam->is_ipv6];
+ details = vam->ip_details_by_sw_if_index[vam->is_ipv6];
- if (!details || vam->current_sw_if_index >= vec_len(details)
- || !details[vam->current_sw_if_index].present) {
- errmsg ("ip address details arrived but not stored\n");
- errmsg ("ip_dump should be called first\n");
- return;
+ if (!details || vam->current_sw_if_index >= vec_len (details)
+ || !details[vam->current_sw_if_index].present)
+ {
+ errmsg ("ip address details arrived but not stored\n");
+ errmsg ("ip_dump should be called first\n");
+ return;
}
- current_ip_details = vec_elt_at_index(details,
- vam->current_sw_if_index);
+ current_ip_details = vec_elt_at_index (details, vam->current_sw_if_index);
#define addresses (current_ip_details->addr)
- vec_validate_init_empty(addresses, vec_len(addresses),
- empty_ip_address_details);
+ vec_validate_init_empty (addresses, vec_len (addresses),
+ empty_ip_address_details);
- address = vec_elt_at_index(addresses, vec_len(addresses) - 1);
+ address = vec_elt_at_index (addresses, vec_len (addresses) - 1);
- clib_memcpy(&address->ip, &mp->ip, sizeof(address->ip));
- address->prefix_length = mp->prefix_length;
+ clib_memcpy (&address->ip, &mp->ip, sizeof (address->ip));
+ address->prefix_length = mp->prefix_length;
#undef addresses
}
static void vl_api_ip_address_details_t_handler_json
-(vl_api_ip_address_details_t * mp)
+ (vl_api_ip_address_details_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t *node = NULL;
- struct in6_addr ip6;
- struct in_addr ip4;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
+ struct in6_addr ip6;
+ struct in_addr ip4;
- if (VAT_JSON_ARRAY != vam->json_tree.type) {
- ASSERT(VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array(&vam->json_tree);
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
}
- node = vat_json_array_add(&vam->json_tree);
+ node = vat_json_array_add (&vam->json_tree);
- vat_json_init_object(node);
- if (vam->is_ipv6) {
- clib_memcpy(&ip6, mp->ip, sizeof(ip6));
- vat_json_object_add_ip6(node, "ip", ip6);
- } else {
- clib_memcpy(&ip4, mp->ip, sizeof(ip4));
- vat_json_object_add_ip4(node, "ip", ip4);
+ vat_json_init_object (node);
+ if (vam->is_ipv6)
+ {
+ clib_memcpy (&ip6, mp->ip, sizeof (ip6));
+ vat_json_object_add_ip6 (node, "ip", ip6);
+ }
+ else
+ {
+ clib_memcpy (&ip4, mp->ip, sizeof (ip4));
+ vat_json_object_add_ip4 (node, "ip", ip4);
}
- vat_json_object_add_uint(node, "prefix_length", mp->prefix_length);
+ vat_json_object_add_uint (node, "prefix_length", mp->prefix_length);
}
-static void vl_api_ip_details_t_handler (vl_api_ip_details_t * mp)
+static void
+vl_api_ip_details_t_handler (vl_api_ip_details_t * mp)
{
- vat_main_t * vam = &vat_main;
- static ip_details_t empty_ip_details = {0};
- ip_details_t * ip = NULL;
- u32 sw_if_index = ~0;
+ vat_main_t *vam = &vat_main;
+ static ip_details_t empty_ip_details = { 0 };
+ ip_details_t *ip = NULL;
+ u32 sw_if_index = ~0;
- sw_if_index = ntohl(mp->sw_if_index);
+ sw_if_index = ntohl (mp->sw_if_index);
- vec_validate_init_empty(vam->ip_details_by_sw_if_index[vam->is_ipv6],
- sw_if_index, empty_ip_details);
+ vec_validate_init_empty (vam->ip_details_by_sw_if_index[vam->is_ipv6],
+ sw_if_index, empty_ip_details);
- ip = vec_elt_at_index(vam->ip_details_by_sw_if_index[vam->is_ipv6],
- sw_if_index);
+ ip = vec_elt_at_index (vam->ip_details_by_sw_if_index[vam->is_ipv6],
+ sw_if_index);
- ip->present = 1;
+ ip->present = 1;
}
-static void vl_api_ip_details_t_handler_json (vl_api_ip_details_t * mp)
+static void
+vl_api_ip_details_t_handler_json (vl_api_ip_details_t * mp)
{
- vat_main_t * vam = &vat_main;
+ vat_main_t *vam = &vat_main;
- if (VAT_JSON_ARRAY != vam->json_tree.type) {
- ASSERT(VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array(&vam->json_tree);
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
}
- vat_json_array_add_uint(&vam->json_tree, clib_net_to_host_u32(mp->sw_if_index));
+ vat_json_array_add_uint (&vam->json_tree,
+ clib_net_to_host_u32 (mp->sw_if_index));
}
static void vl_api_map_domain_details_t_handler_json
-(vl_api_map_domain_details_t * mp)
-{
- vat_json_node_t * node = NULL;
- vat_main_t * vam = &vat_main;
- struct in6_addr ip6;
- struct in_addr ip4;
-
- if (VAT_JSON_ARRAY != vam->json_tree.type) {
- ASSERT(VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array(&vam->json_tree);
- }
-
- node = vat_json_array_add(&vam->json_tree);
- vat_json_init_object(node);
-
- vat_json_object_add_uint(node, "domain_index", clib_net_to_host_u32(mp->domain_index));
- clib_memcpy(&ip6, mp->ip6_prefix, sizeof(ip6));
- vat_json_object_add_ip6(node, "ip6_prefix", ip6);
- clib_memcpy(&ip4, mp->ip4_prefix, sizeof(ip4));
- vat_json_object_add_ip4(node, "ip4_prefix", ip4);
- clib_memcpy(&ip6, mp->ip6_src, sizeof(ip6));
- vat_json_object_add_ip6(node, "ip6_src", ip6);
- vat_json_object_add_int(node, "ip6_prefix_len", mp->ip6_prefix_len);
- vat_json_object_add_int(node, "ip4_prefix_len", mp->ip4_prefix_len);
- vat_json_object_add_int(node, "ip6_src_len", mp->ip6_src_len);
- vat_json_object_add_int(node, "ea_bits_len", mp->ea_bits_len);
- vat_json_object_add_int(node, "psid_offset", mp->psid_offset);
- vat_json_object_add_int(node, "psid_length", mp->psid_length);
- vat_json_object_add_uint(node, "flags", mp->flags);
- vat_json_object_add_uint(node, "mtu", clib_net_to_host_u16(mp->mtu));
- vat_json_object_add_int(node, "is_translation", mp->is_translation);
+ (vl_api_map_domain_details_t * mp)
+{
+ vat_json_node_t *node = NULL;
+ vat_main_t *vam = &vat_main;
+ struct in6_addr ip6;
+ struct in_addr ip4;
+
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
+ }
+
+ node = vat_json_array_add (&vam->json_tree);
+ vat_json_init_object (node);
+
+ vat_json_object_add_uint (node, "domain_index",
+ clib_net_to_host_u32 (mp->domain_index));
+ clib_memcpy (&ip6, mp->ip6_prefix, sizeof (ip6));
+ vat_json_object_add_ip6 (node, "ip6_prefix", ip6);
+ clib_memcpy (&ip4, mp->ip4_prefix, sizeof (ip4));
+ vat_json_object_add_ip4 (node, "ip4_prefix", ip4);
+ clib_memcpy (&ip6, mp->ip6_src, sizeof (ip6));
+ vat_json_object_add_ip6 (node, "ip6_src", ip6);
+ vat_json_object_add_int (node, "ip6_prefix_len", mp->ip6_prefix_len);
+ vat_json_object_add_int (node, "ip4_prefix_len", mp->ip4_prefix_len);
+ vat_json_object_add_int (node, "ip6_src_len", mp->ip6_src_len);
+ vat_json_object_add_int (node, "ea_bits_len", mp->ea_bits_len);
+ vat_json_object_add_int (node, "psid_offset", mp->psid_offset);
+ vat_json_object_add_int (node, "psid_length", mp->psid_length);
+ vat_json_object_add_uint (node, "flags", mp->flags);
+ vat_json_object_add_uint (node, "mtu", clib_net_to_host_u16 (mp->mtu));
+ vat_json_object_add_int (node, "is_translation", mp->is_translation);
}
static void vl_api_map_domain_details_t_handler
-(vl_api_map_domain_details_t * mp)
+ (vl_api_map_domain_details_t * mp)
{
- vat_main_t * vam = &vat_main;
+ vat_main_t *vam = &vat_main;
- if (mp->is_translation) {
- fformat(vam->ofp, "* %U/%d (ipv4-prefix) %U/%d (ipv6-prefix) %U/%d (ip6-src) index: %u\n",
- format_ip4_address, mp->ip4_prefix, mp->ip4_prefix_len,
- format_ip6_address, mp->ip6_prefix, mp->ip6_prefix_len,
- format_ip6_address, mp->ip6_src, mp->ip6_src_len, clib_net_to_host_u32(mp->domain_index));
- } else {
- fformat(vam->ofp, "* %U/%d (ipv4-prefix) %U/%d (ipv6-prefix) %U (ip6-src) index: %u\n",
- format_ip4_address, mp->ip4_prefix, mp->ip4_prefix_len,
- format_ip6_address, mp->ip6_prefix, mp->ip6_prefix_len,
- format_ip6_address, mp->ip6_src, clib_net_to_host_u32(mp->domain_index));
+ if (mp->is_translation)
+ {
+ fformat (vam->ofp,
+ "* %U/%d (ipv4-prefix) %U/%d (ipv6-prefix) %U/%d (ip6-src) index: %u\n",
+ format_ip4_address, mp->ip4_prefix, mp->ip4_prefix_len,
+ format_ip6_address, mp->ip6_prefix, mp->ip6_prefix_len,
+ format_ip6_address, mp->ip6_src, mp->ip6_src_len,
+ clib_net_to_host_u32 (mp->domain_index));
}
- fformat(vam->ofp, " ea-len %d psid-offset %d psid-len %d mtu %d %s\n",
- mp->ea_bits_len, mp->psid_offset, mp->psid_length, mp->mtu, mp->is_translation? "map-t":"");
+ else
+ {
+ fformat (vam->ofp,
+ "* %U/%d (ipv4-prefix) %U/%d (ipv6-prefix) %U (ip6-src) index: %u\n",
+ format_ip4_address, mp->ip4_prefix, mp->ip4_prefix_len,
+ format_ip6_address, mp->ip6_prefix, mp->ip6_prefix_len,
+ format_ip6_address, mp->ip6_src,
+ clib_net_to_host_u32 (mp->domain_index));
+ }
+ fformat (vam->ofp, " ea-len %d psid-offset %d psid-len %d mtu %d %s\n",
+ mp->ea_bits_len, mp->psid_offset, mp->psid_length, mp->mtu,
+ mp->is_translation ? "map-t" : "");
}
static void vl_api_map_rule_details_t_handler_json
-(vl_api_map_rule_details_t * mp)
+ (vl_api_map_rule_details_t * mp)
{
- struct in6_addr ip6;
- vat_json_node_t * node = NULL;
- vat_main_t * vam = &vat_main;
+ struct in6_addr ip6;
+ vat_json_node_t *node = NULL;
+ vat_main_t *vam = &vat_main;
- if (VAT_JSON_ARRAY != vam->json_tree.type) {
- ASSERT(VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array(&vam->json_tree);
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
}
- node = vat_json_array_add(&vam->json_tree);
- vat_json_init_object(node);
+ node = vat_json_array_add (&vam->json_tree);
+ vat_json_init_object (node);
- vat_json_object_add_uint(node, "psid", clib_net_to_host_u16(mp->psid));
- clib_memcpy(&ip6, mp->ip6_dst, sizeof(ip6));
- vat_json_object_add_ip6(node, "ip6_dst", ip6);
+ vat_json_object_add_uint (node, "psid", clib_net_to_host_u16 (mp->psid));
+ clib_memcpy (&ip6, mp->ip6_dst, sizeof (ip6));
+ vat_json_object_add_ip6 (node, "ip6_dst", ip6);
}
-static void vl_api_map_rule_details_t_handler
-(vl_api_map_rule_details_t * mp)
+static void
+vl_api_map_rule_details_t_handler (vl_api_map_rule_details_t * mp)
{
- vat_main_t * vam = &vat_main;
- fformat(vam->ofp, " %d (psid) %U (ip6-dst)\n", clib_net_to_host_u16(mp->psid),
- format_ip6_address, mp->ip6_dst);
+ vat_main_t *vam = &vat_main;
+ fformat (vam->ofp, " %d (psid) %U (ip6-dst)\n",
+ clib_net_to_host_u16 (mp->psid), format_ip6_address, mp->ip6_dst);
}
-static void vl_api_dhcp_compl_event_t_handler
-(vl_api_dhcp_compl_event_t * mp)
+static void
+vl_api_dhcp_compl_event_t_handler (vl_api_dhcp_compl_event_t * mp)
{
- vat_main_t * vam = &vat_main;
- errmsg ("DHCP compl event: pid %d %s hostname %s host_addr %U "
- "router_addr %U host_mac %U\n",
- mp->pid, mp->is_ipv6 ? "ipv6":"ipv4", mp->hostname,
- format_ip4_address, &mp->host_address,
- format_ip4_address, &mp->router_address,
- format_ethernet_address, mp->host_mac);
+ vat_main_t *vam = &vat_main;
+ errmsg ("DHCP compl event: pid %d %s hostname %s host_addr %U "
+ "router_addr %U host_mac %U\n",
+ mp->pid, mp->is_ipv6 ? "ipv6" : "ipv4", mp->hostname,
+ format_ip4_address, &mp->host_address,
+ format_ip4_address, &mp->router_address,
+ format_ethernet_address, mp->host_mac);
}
static void vl_api_dhcp_compl_event_t_handler_json
-(vl_api_dhcp_compl_event_t * mp)
+ (vl_api_dhcp_compl_event_t * mp)
{
- /* JSON output not supported */
+ /* JSON output not supported */
}
-static void set_simple_interface_counter (u8 vnet_counter_type, u32 sw_if_index,
- u32 counter)
+static void
+set_simple_interface_counter (u8 vnet_counter_type, u32 sw_if_index,
+ u32 counter)
{
- vat_main_t * vam = &vat_main;
- static u64 default_counter = 0;
+ vat_main_t *vam = &vat_main;
+ static u64 default_counter = 0;
- vec_validate_init_empty(vam->simple_interface_counters, vnet_counter_type, NULL);
- vec_validate_init_empty(vam->simple_interface_counters[vnet_counter_type],
- sw_if_index, default_counter);
- vam->simple_interface_counters[vnet_counter_type][sw_if_index] = counter;
+ vec_validate_init_empty (vam->simple_interface_counters, vnet_counter_type,
+ NULL);
+ vec_validate_init_empty (vam->simple_interface_counters[vnet_counter_type],
+ sw_if_index, default_counter);
+ vam->simple_interface_counters[vnet_counter_type][sw_if_index] = counter;
}
-static void set_combined_interface_counter (u8 vnet_counter_type, u32 sw_if_index,
- interface_counter_t counter)
+static void
+set_combined_interface_counter (u8 vnet_counter_type, u32 sw_if_index,
+ interface_counter_t counter)
{
- vat_main_t * vam = &vat_main;
- static interface_counter_t default_counter = {0, };
+ vat_main_t *vam = &vat_main;
+ static interface_counter_t default_counter = { 0, };
- vec_validate_init_empty(vam->combined_interface_counters, vnet_counter_type, NULL);
- vec_validate_init_empty(vam->combined_interface_counters[vnet_counter_type],
- sw_if_index, default_counter);
- vam->combined_interface_counters[vnet_counter_type][sw_if_index] = counter;
+ vec_validate_init_empty (vam->combined_interface_counters,
+ vnet_counter_type, NULL);
+ vec_validate_init_empty (vam->combined_interface_counters
+ [vnet_counter_type], sw_if_index, default_counter);
+ vam->combined_interface_counters[vnet_counter_type][sw_if_index] = counter;
}
static void vl_api_vnet_interface_counters_t_handler
-(vl_api_vnet_interface_counters_t *mp)
+ (vl_api_vnet_interface_counters_t * mp)
{
- /* not supported */
+ /* not supported */
}
static void vl_api_vnet_interface_counters_t_handler_json
-(vl_api_vnet_interface_counters_t *mp)
-{
- interface_counter_t counter;
- vlib_counter_t *v;
- u64 *v_packets;
- u64 packets;
- u32 count;
- u32 first_sw_if_index;
- int i;
+ (vl_api_vnet_interface_counters_t * mp)
+{
+ interface_counter_t counter;
+ vlib_counter_t *v;
+ u64 *v_packets;
+ u64 packets;
+ u32 count;
+ u32 first_sw_if_index;
+ int i;
- count = ntohl(mp->count);
- first_sw_if_index = ntohl(mp->first_sw_if_index);
+ count = ntohl (mp->count);
+ first_sw_if_index = ntohl (mp->first_sw_if_index);
- if (!mp->is_combined) {
- v_packets = (u64*)&mp->data;
- for (i = 0; i < count; i++) {
- packets = clib_net_to_host_u64(clib_mem_unaligned(v_packets, u64));
- set_simple_interface_counter(mp->vnet_counter_type,
- first_sw_if_index + i, packets);
- v_packets++;
- }
- } else {
- v = (vlib_counter_t*)&mp->data;
- for (i = 0; i < count; i++) {
- counter.packets = clib_net_to_host_u64(
- clib_mem_unaligned(&v->packets, u64));
- counter.bytes = clib_net_to_host_u64(
- clib_mem_unaligned(&v->bytes, u64));
- set_combined_interface_counter(mp->vnet_counter_type,
- first_sw_if_index + i, counter);
- v++;
- }
+ if (!mp->is_combined)
+ {
+ v_packets = (u64 *) & mp->data;
+ for (i = 0; i < count; i++)
+ {
+ packets =
+ clib_net_to_host_u64 (clib_mem_unaligned (v_packets, u64));
+ set_simple_interface_counter (mp->vnet_counter_type,
+ first_sw_if_index + i, packets);
+ v_packets++;
+ }
+ }
+ else
+ {
+ v = (vlib_counter_t *) & mp->data;
+ for (i = 0; i < count; i++)
+ {
+ counter.packets =
+ clib_net_to_host_u64 (clib_mem_unaligned (&v->packets, u64));
+ counter.bytes =
+ clib_net_to_host_u64 (clib_mem_unaligned (&v->bytes, u64));
+ set_combined_interface_counter (mp->vnet_counter_type,
+ first_sw_if_index + i, counter);
+ v++;
+ }
}
}
-static u32 ip4_fib_counters_get_vrf_index_by_vrf_id (u32 vrf_id)
+static u32
+ip4_fib_counters_get_vrf_index_by_vrf_id (u32 vrf_id)
{
- vat_main_t * vam = &vat_main;
- u32 i;
+ vat_main_t *vam = &vat_main;
+ u32 i;
- for (i = 0; i < vec_len(vam->ip4_fib_counters_vrf_id_by_index); i++) {
- if (vam->ip4_fib_counters_vrf_id_by_index[i] == vrf_id) {
- return i;
- }
+ for (i = 0; i < vec_len (vam->ip4_fib_counters_vrf_id_by_index); i++)
+ {
+ if (vam->ip4_fib_counters_vrf_id_by_index[i] == vrf_id)
+ {
+ return i;
+ }
}
- return ~0;
+ return ~0;
}
-static u32 ip6_fib_counters_get_vrf_index_by_vrf_id (u32 vrf_id)
+static u32
+ip6_fib_counters_get_vrf_index_by_vrf_id (u32 vrf_id)
{
- vat_main_t * vam = &vat_main;
- u32 i;
+ vat_main_t *vam = &vat_main;
+ u32 i;
- for (i = 0; i < vec_len(vam->ip6_fib_counters_vrf_id_by_index); i++) {
- if (vam->ip6_fib_counters_vrf_id_by_index[i] == vrf_id) {
- return i;
- }
+ for (i = 0; i < vec_len (vam->ip6_fib_counters_vrf_id_by_index); i++)
+ {
+ if (vam->ip6_fib_counters_vrf_id_by_index[i] == vrf_id)
+ {
+ return i;
+ }
}
- return ~0;
+ return ~0;
}
static void vl_api_vnet_ip4_fib_counters_t_handler
-(vl_api_vnet_ip4_fib_counters_t *mp)
+ (vl_api_vnet_ip4_fib_counters_t * mp)
{
- /* not supported */
+ /* not supported */
}
static void vl_api_vnet_ip4_fib_counters_t_handler_json
-(vl_api_vnet_ip4_fib_counters_t *mp)
-{
- vat_main_t * vam = &vat_main;
- vl_api_ip4_fib_counter_t *v;
- ip4_fib_counter_t *counter;
- struct in_addr ip4;
- u32 vrf_id;
- u32 vrf_index;
- u32 count;
- int i;
-
- vrf_id = ntohl(mp->vrf_id);
- vrf_index = ip4_fib_counters_get_vrf_index_by_vrf_id(vrf_id);
- if (~0 == vrf_index) {
- vrf_index = vec_len(vam->ip4_fib_counters_vrf_id_by_index);
- vec_validate(vam->ip4_fib_counters_vrf_id_by_index, vrf_index);
- vam->ip4_fib_counters_vrf_id_by_index[vrf_index] = vrf_id;
- vec_validate(vam->ip4_fib_counters, vrf_index);
- vam->ip4_fib_counters[vrf_index] = NULL;
- }
-
- vec_free(vam->ip4_fib_counters[vrf_index]);
- v = (vl_api_ip4_fib_counter_t*)&mp->c;
- count = ntohl(mp->count);
- for (i = 0; i < count; i++) {
- vec_validate(vam->ip4_fib_counters[vrf_index], i);
- counter = &vam->ip4_fib_counters[vrf_index][i];
- clib_memcpy(&ip4, &v->address, sizeof(ip4));
- counter->address = ip4;
- counter->address_length = v->address_length;
- counter->packets = clib_net_to_host_u64(v->packets);
- counter->bytes = clib_net_to_host_u64(v->bytes);
- v++;
+ (vl_api_vnet_ip4_fib_counters_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vl_api_ip4_fib_counter_t *v;
+ ip4_fib_counter_t *counter;
+ struct in_addr ip4;
+ u32 vrf_id;
+ u32 vrf_index;
+ u32 count;
+ int i;
+
+ vrf_id = ntohl (mp->vrf_id);
+ vrf_index = ip4_fib_counters_get_vrf_index_by_vrf_id (vrf_id);
+ if (~0 == vrf_index)
+ {
+ vrf_index = vec_len (vam->ip4_fib_counters_vrf_id_by_index);
+ vec_validate (vam->ip4_fib_counters_vrf_id_by_index, vrf_index);
+ vam->ip4_fib_counters_vrf_id_by_index[vrf_index] = vrf_id;
+ vec_validate (vam->ip4_fib_counters, vrf_index);
+ vam->ip4_fib_counters[vrf_index] = NULL;
+ }
+
+ vec_free (vam->ip4_fib_counters[vrf_index]);
+ v = (vl_api_ip4_fib_counter_t *) & mp->c;
+ count = ntohl (mp->count);
+ for (i = 0; i < count; i++)
+ {
+ vec_validate (vam->ip4_fib_counters[vrf_index], i);
+ counter = &vam->ip4_fib_counters[vrf_index][i];
+ clib_memcpy (&ip4, &v->address, sizeof (ip4));
+ counter->address = ip4;
+ counter->address_length = v->address_length;
+ counter->packets = clib_net_to_host_u64 (v->packets);
+ counter->bytes = clib_net_to_host_u64 (v->bytes);
+ v++;
}
}
static void vl_api_vnet_ip6_fib_counters_t_handler
-(vl_api_vnet_ip6_fib_counters_t *mp)
+ (vl_api_vnet_ip6_fib_counters_t * mp)
{
- /* not supported */
+ /* not supported */
}
static void vl_api_vnet_ip6_fib_counters_t_handler_json
-(vl_api_vnet_ip6_fib_counters_t *mp)
-{
- vat_main_t * vam = &vat_main;
- vl_api_ip6_fib_counter_t *v;
- ip6_fib_counter_t *counter;
- struct in6_addr ip6;
- u32 vrf_id;
- u32 vrf_index;
- u32 count;
- int i;
-
- vrf_id = ntohl(mp->vrf_id);
- vrf_index = ip6_fib_counters_get_vrf_index_by_vrf_id(vrf_id);
- if (~0 == vrf_index) {
- vrf_index = vec_len(vam->ip6_fib_counters_vrf_id_by_index);
- vec_validate(vam->ip6_fib_counters_vrf_id_by_index, vrf_index);
- vam->ip6_fib_counters_vrf_id_by_index[vrf_index] = vrf_id;
- vec_validate(vam->ip6_fib_counters, vrf_index);
- vam->ip6_fib_counters[vrf_index] = NULL;
- }
-
- vec_free(vam->ip6_fib_counters[vrf_index]);
- v = (vl_api_ip6_fib_counter_t*)&mp->c;
- count = ntohl(mp->count);
- for (i = 0; i < count; i++) {
- vec_validate(vam->ip6_fib_counters[vrf_index], i);
- counter = &vam->ip6_fib_counters[vrf_index][i];
- clib_memcpy(&ip6, &v->address, sizeof(ip6));
- counter->address = ip6;
- counter->address_length = v->address_length;
- counter->packets = clib_net_to_host_u64(v->packets);
- counter->bytes = clib_net_to_host_u64(v->bytes);
- v++;
+ (vl_api_vnet_ip6_fib_counters_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vl_api_ip6_fib_counter_t *v;
+ ip6_fib_counter_t *counter;
+ struct in6_addr ip6;
+ u32 vrf_id;
+ u32 vrf_index;
+ u32 count;
+ int i;
+
+ vrf_id = ntohl (mp->vrf_id);
+ vrf_index = ip6_fib_counters_get_vrf_index_by_vrf_id (vrf_id);
+ if (~0 == vrf_index)
+ {
+ vrf_index = vec_len (vam->ip6_fib_counters_vrf_id_by_index);
+ vec_validate (vam->ip6_fib_counters_vrf_id_by_index, vrf_index);
+ vam->ip6_fib_counters_vrf_id_by_index[vrf_index] = vrf_id;
+ vec_validate (vam->ip6_fib_counters, vrf_index);
+ vam->ip6_fib_counters[vrf_index] = NULL;
+ }
+
+ vec_free (vam->ip6_fib_counters[vrf_index]);
+ v = (vl_api_ip6_fib_counter_t *) & mp->c;
+ count = ntohl (mp->count);
+ for (i = 0; i < count; i++)
+ {
+ vec_validate (vam->ip6_fib_counters[vrf_index], i);
+ counter = &vam->ip6_fib_counters[vrf_index][i];
+ clib_memcpy (&ip6, &v->address, sizeof (ip6));
+ counter->address = ip6;
+ counter->address_length = v->address_length;
+ counter->packets = clib_net_to_host_u64 (v->packets);
+ counter->bytes = clib_net_to_host_u64 (v->bytes);
+ v++;
}
}
static void vl_api_get_first_msg_id_reply_t_handler
-(vl_api_get_first_msg_id_reply_t * mp)
+ (vl_api_get_first_msg_id_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- i32 retval = ntohl(mp->retval);
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
- if (vam->async_mode) {
- vam->async_errors += (retval < 0);
- } else {
- vam->retval = retval;
- vam->result_ready = 1;
+ if (vam->async_mode)
+ {
+ vam->async_errors += (retval < 0);
+ }
+ else
+ {
+ vam->retval = retval;
+ vam->result_ready = 1;
}
- if (retval >= 0) {
- errmsg ("first message id %d\n", ntohs(mp->first_msg_id));
+ if (retval >= 0)
+ {
+ errmsg ("first message id %d\n", ntohs (mp->first_msg_id));
}
}
static void vl_api_get_first_msg_id_reply_t_handler_json
-(vl_api_get_first_msg_id_reply_t * mp)
+ (vl_api_get_first_msg_id_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t node;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
- vat_json_init_object(&node);
- vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
- vat_json_object_add_uint(&node, "first_msg_id",
- (uint) ntohs(mp->first_msg_id));
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+ vat_json_object_add_uint (&node, "first_msg_id",
+ (uint) ntohs (mp->first_msg_id));
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
static void vl_api_get_node_graph_reply_t_handler
-(vl_api_get_node_graph_reply_t * mp)
-{
- vat_main_t * vam = &vat_main;
- api_main_t * am = &api_main;
- i32 retval = ntohl(mp->retval);
- u8 * pvt_copy, * reply;
- void * oldheap;
- vlib_node_t * node;
- int i;
+ (vl_api_get_node_graph_reply_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ api_main_t *am = &api_main;
+ i32 retval = ntohl (mp->retval);
+ u8 *pvt_copy, *reply;
+ void *oldheap;
+ vlib_node_t *node;
+ int i;
- if (vam->async_mode) {
- vam->async_errors += (retval < 0);
- } else {
- vam->retval = retval;
- vam->result_ready = 1;
+ if (vam->async_mode)
+ {
+ vam->async_errors += (retval < 0);
+ }
+ else
+ {
+ vam->retval = retval;
+ vam->result_ready = 1;
}
- /* "Should never happen..." */
- if (retval != 0)
- return;
+ /* "Should never happen..." */
+ if (retval != 0)
+ return;
- reply = (u8 *)(mp->reply_in_shmem);
- pvt_copy = vec_dup (reply);
+ reply = (u8 *) (mp->reply_in_shmem);
+ pvt_copy = vec_dup (reply);
- /* Toss the shared-memory original... */
- pthread_mutex_lock (&am->vlib_rp->mutex);
- oldheap = svm_push_data_heap (am->vlib_rp);
+ /* Toss the shared-memory original... */
+ pthread_mutex_lock (&am->vlib_rp->mutex);
+ oldheap = svm_push_data_heap (am->vlib_rp);
- vec_free (reply);
+ vec_free (reply);
- svm_pop_heap (oldheap);
- pthread_mutex_unlock (&am->vlib_rp->mutex);
+ svm_pop_heap (oldheap);
+ pthread_mutex_unlock (&am->vlib_rp->mutex);
- if (vam->graph_nodes) {
- hash_free (vam->graph_node_index_by_name);
+ if (vam->graph_nodes)
+ {
+ hash_free (vam->graph_node_index_by_name);
- for (i = 0; i < vec_len (vam->graph_nodes); i++) {
- node = vam->graph_nodes[i];
- vec_free (node->name);
- vec_free (node->next_nodes);
- vec_free (node);
- }
- vec_free(vam->graph_nodes);
+ for (i = 0; i < vec_len (vam->graph_nodes); i++)
+ {
+ node = vam->graph_nodes[i];
+ vec_free (node->name);
+ vec_free (node->next_nodes);
+ vec_free (node);
+ }
+ vec_free (vam->graph_nodes);
}
- vam->graph_node_index_by_name = hash_create_string (0, sizeof(uword));
- vam->graph_nodes = vlib_node_unserialize (pvt_copy);
- vec_free (pvt_copy);
+ vam->graph_node_index_by_name = hash_create_string (0, sizeof (uword));
+ vam->graph_nodes = vlib_node_unserialize (pvt_copy);
+ vec_free (pvt_copy);
- for (i = 0; i < vec_len (vam->graph_nodes); i++) {
- node = vam->graph_nodes[i];
- hash_set_mem (vam->graph_node_index_by_name, node->name, i);
+ for (i = 0; i < vec_len (vam->graph_nodes); i++)
+ {
+ node = vam->graph_nodes[i];
+ hash_set_mem (vam->graph_node_index_by_name, node->name, i);
}
}
static void vl_api_get_node_graph_reply_t_handler_json
-(vl_api_get_node_graph_reply_t * mp)
+ (vl_api_get_node_graph_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- api_main_t * am = &api_main;
- void * oldheap;
- vat_json_node_t node;
- u8 * reply;
+ vat_main_t *vam = &vat_main;
+ api_main_t *am = &api_main;
+ void *oldheap;
+ vat_json_node_t node;
+ u8 *reply;
- /* $$$$ make this real? */
- vat_json_init_object(&node);
- vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
- vat_json_object_add_uint(&node, "reply_in_shmem", mp->reply_in_shmem);
+ /* $$$$ make this real? */
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+ vat_json_object_add_uint (&node, "reply_in_shmem", mp->reply_in_shmem);
- reply = (u8 *)(mp->reply_in_shmem);
+ reply = (u8 *) (mp->reply_in_shmem);
- /* Toss the shared-memory original... */
- pthread_mutex_lock (&am->vlib_rp->mutex);
- oldheap = svm_push_data_heap (am->vlib_rp);
+ /* Toss the shared-memory original... */
+ pthread_mutex_lock (&am->vlib_rp->mutex);
+ oldheap = svm_push_data_heap (am->vlib_rp);
- vec_free (reply);
+ vec_free (reply);
- svm_pop_heap (oldheap);
- pthread_mutex_unlock (&am->vlib_rp->mutex);
+ svm_pop_heap (oldheap);
+ pthread_mutex_unlock (&am->vlib_rp->mutex);
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
static void
-vl_api_lisp_locator_details_t_handler (
- vl_api_lisp_locator_details_t *mp)
+vl_api_lisp_locator_details_t_handler (vl_api_lisp_locator_details_t * mp)
{
- vat_main_t *vam = &vat_main;
- locator_msg_t loc;
- u8 * tmp_str = 0;
+ vat_main_t *vam = &vat_main;
+ locator_msg_t loc;
+ u8 *tmp_str = 0;
- memset(&loc, 0, sizeof(loc));
- if (vam->noprint_msg) {
+ memset (&loc, 0, sizeof (loc));
+ if (vam->noprint_msg)
+ {
loc.local = mp->local;
loc.priority = mp->priority;
loc.weight = mp->weight;
- if (loc.local) {
- loc.sw_if_index = ntohl(mp->sw_if_index);
- } else {
- loc.is_ipv6 = mp->is_ipv6;
- clib_memcpy(loc.ip_address, mp->ip_address, sizeof(loc.ip_address));
- }
- vec_add1(vam->locator_msg, loc);
- } else {
- if (mp->local) {
- tmp_str = format(tmp_str, "%=16d%=16d%=16d\n",
- ntohl(mp->sw_if_index),
- mp->priority,
- mp->weight);
- } else {
- tmp_str = format(tmp_str, "%=16U%=16d%=16d\n",
- mp->is_ipv6 ? format_ip6_address :
- format_ip4_address,
- mp->ip_address,
- mp->priority,
- mp->weight);
- }
+ if (loc.local)
+ {
+ loc.sw_if_index = ntohl (mp->sw_if_index);
+ }
+ else
+ {
+ loc.is_ipv6 = mp->is_ipv6;
+ clib_memcpy (loc.ip_address, mp->ip_address,
+ sizeof (loc.ip_address));
+ }
+ vec_add1 (vam->locator_msg, loc);
+ }
+ else
+ {
+ if (mp->local)
+ {
+ tmp_str = format (tmp_str, "%=16d%=16d%=16d\n",
+ ntohl (mp->sw_if_index),
+ mp->priority, mp->weight);
+ }
+ else
+ {
+ tmp_str = format (tmp_str, "%=16U%=16d%=16d\n",
+ mp->is_ipv6 ? format_ip6_address :
+ format_ip4_address,
+ mp->ip_address, mp->priority, mp->weight);
+ }
- fformat(vam->ofp, "%s", tmp_str);
+ fformat (vam->ofp, "%s", tmp_str);
- vec_free(tmp_str);
+ vec_free (tmp_str);
}
}
static void
-vl_api_lisp_locator_details_t_handler_json (
- vl_api_lisp_locator_details_t *mp)
-{
- vat_main_t *vam = &vat_main;
- vat_json_node_t *node = NULL;
- locator_msg_t loc;
- struct in6_addr ip6;
- struct in_addr ip4;
-
- memset(&loc, 0, sizeof(loc));
- if (vam->noprint_msg) {
- loc.local = mp->local;
- loc.priority = mp->priority;
- loc.weight = mp->weight;
- if (loc.local) {
- loc.sw_if_index = ntohl(mp->sw_if_index);
- } else {
- loc.is_ipv6 = mp->is_ipv6;
- clib_memcpy(loc.ip_address, mp->ip_address, sizeof(loc.ip_address));
- }
- vec_add1(vam->locator_msg, loc);
- return;
- }
-
- if (VAT_JSON_ARRAY != vam->json_tree.type) {
- ASSERT(VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array(&vam->json_tree);
- }
- node = vat_json_array_add(&vam->json_tree);
-
- vat_json_init_object(node);
-
- if (mp->local) {
- vat_json_object_add_uint(node, "locator_index", ntohl(mp->sw_if_index));
- } else {
- if (mp->is_ipv6) {
- clib_memcpy(&ip6, mp->ip_address, sizeof(ip6));
- vat_json_object_add_ip6(node, "locator", ip6);
- } else {
- clib_memcpy(&ip4, mp->ip_address, sizeof(ip4));
- vat_json_object_add_ip4(node, "locator", ip4);
- }
+vl_api_lisp_locator_details_t_handler_json (vl_api_lisp_locator_details_t *
+ mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
+ locator_msg_t loc;
+ struct in6_addr ip6;
+ struct in_addr ip4;
+
+ memset (&loc, 0, sizeof (loc));
+ if (vam->noprint_msg)
+ {
+ loc.local = mp->local;
+ loc.priority = mp->priority;
+ loc.weight = mp->weight;
+ if (loc.local)
+ {
+ loc.sw_if_index = ntohl (mp->sw_if_index);
+ }
+ else
+ {
+ loc.is_ipv6 = mp->is_ipv6;
+ clib_memcpy (loc.ip_address, mp->ip_address,
+ sizeof (loc.ip_address));
+ }
+ vec_add1 (vam->locator_msg, loc);
+ return;
}
- vat_json_object_add_uint(node, "priority", mp->priority);
- vat_json_object_add_uint(node, "weight", mp->weight);
+
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
+ }
+ node = vat_json_array_add (&vam->json_tree);
+
+ vat_json_init_object (node);
+
+ if (mp->local)
+ {
+ vat_json_object_add_uint (node, "locator_index",
+ ntohl (mp->sw_if_index));
+ }
+ else
+ {
+ if (mp->is_ipv6)
+ {
+ clib_memcpy (&ip6, mp->ip_address, sizeof (ip6));
+ vat_json_object_add_ip6 (node, "locator", ip6);
+ }
+ else
+ {
+ clib_memcpy (&ip4, mp->ip_address, sizeof (ip4));
+ vat_json_object_add_ip4 (node, "locator", ip4);
+ }
+ }
+ vat_json_object_add_uint (node, "priority", mp->priority);
+ vat_json_object_add_uint (node, "weight", mp->weight);
}
static void
-vl_api_lisp_locator_set_details_t_handler (
- vl_api_lisp_locator_set_details_t *mp)
+vl_api_lisp_locator_set_details_t_handler (vl_api_lisp_locator_set_details_t *
+ mp)
{
- vat_main_t *vam = &vat_main;
- locator_set_msg_t ls;
+ vat_main_t *vam = &vat_main;
+ locator_set_msg_t ls;
- ls.locator_set_index = ntohl(mp->locator_set_index);
- ls.locator_set_name = format(0, "%s", mp->locator_set_name);
- vec_add1(vam->locator_set_msg, ls);
+ ls.locator_set_index = ntohl (mp->locator_set_index);
+ ls.locator_set_name = format (0, "%s", mp->locator_set_name);
+ vec_add1 (vam->locator_set_msg, ls);
}
static void
-vl_api_lisp_locator_set_details_t_handler_json (
- vl_api_lisp_locator_set_details_t *mp)
+ vl_api_lisp_locator_set_details_t_handler_json
+ (vl_api_lisp_locator_set_details_t * mp)
{
- vat_main_t *vam = &vat_main;
- locator_set_msg_t ls;
+ vat_main_t *vam = &vat_main;
+ locator_set_msg_t ls;
- ls.locator_set_index = ntohl(mp->locator_set_index);
- ls.locator_set_name = format(0, "%s", mp->locator_set_name);
- vec_add1(vam->locator_set_msg, ls);
+ ls.locator_set_index = ntohl (mp->locator_set_index);
+ ls.locator_set_name = format (0, "%s", mp->locator_set_name);
+ vec_add1 (vam->locator_set_msg, ls);
}
static void
-vl_api_lisp_eid_table_details_t_handler (
- vl_api_lisp_eid_table_details_t * mp)
+vl_api_lisp_eid_table_details_t_handler (vl_api_lisp_eid_table_details_t * mp)
{
- vat_main_t *vam = &vat_main;
- eid_table_t eid_table;
+ vat_main_t *vam = &vat_main;
+ eid_table_t eid_table;
- memset(&eid_table, 0, sizeof(eid_table));
- eid_table.is_local = mp->is_local;
- eid_table.locator_set_index = mp->locator_set_index;
- eid_table.eid_type = mp->eid_type;
- eid_table.vni = mp->vni;
- eid_table.eid_prefix_len = mp->eid_prefix_len;
- eid_table.ttl = mp->ttl;
- eid_table.authoritative = mp->authoritative;
- clib_memcpy(eid_table.eid, mp->eid, sizeof(eid_table.eid));
- vec_add1(vam->eid_tables, eid_table);
+ memset (&eid_table, 0, sizeof (eid_table));
+ eid_table.is_local = mp->is_local;
+ eid_table.locator_set_index = mp->locator_set_index;
+ eid_table.eid_type = mp->eid_type;
+ eid_table.vni = mp->vni;
+ eid_table.eid_prefix_len = mp->eid_prefix_len;
+ eid_table.ttl = mp->ttl;
+ eid_table.authoritative = mp->authoritative;
+ clib_memcpy (eid_table.eid, mp->eid, sizeof (eid_table.eid));
+ vec_add1 (vam->eid_tables, eid_table);
}
static void
-vl_api_lisp_eid_table_details_t_handler_json (
- vl_api_lisp_eid_table_details_t * mp)
+vl_api_lisp_eid_table_details_t_handler_json (vl_api_lisp_eid_table_details_t
+ * mp)
{
- vat_main_t *vam = &vat_main;
- eid_table_t eid_table;
+ vat_main_t *vam = &vat_main;
+ eid_table_t eid_table;
- memset(&eid_table, 0, sizeof(eid_table));
- eid_table.is_local = mp->is_local;
- eid_table.locator_set_index = mp->locator_set_index;
- eid_table.eid_type = mp->eid_type;
- eid_table.vni = mp->vni;
- eid_table.eid_prefix_len = mp->eid_prefix_len;
- eid_table.ttl = mp->ttl;
- eid_table.authoritative = mp->authoritative;
- clib_memcpy(eid_table.eid, mp->eid, sizeof(eid_table.eid));
- vec_add1(vam->eid_tables, eid_table);
+ memset (&eid_table, 0, sizeof (eid_table));
+ eid_table.is_local = mp->is_local;
+ eid_table.locator_set_index = mp->locator_set_index;
+ eid_table.eid_type = mp->eid_type;
+ eid_table.vni = mp->vni;
+ eid_table.eid_prefix_len = mp->eid_prefix_len;
+ eid_table.ttl = mp->ttl;
+ eid_table.authoritative = mp->authoritative;
+ clib_memcpy (eid_table.eid, mp->eid, sizeof (eid_table.eid));
+ vec_add1 (vam->eid_tables, eid_table);
}
static void
-vl_api_lisp_eid_table_map_details_t_handler (
- vl_api_lisp_eid_table_map_details_t *mp)
+ vl_api_lisp_eid_table_map_details_t_handler
+ (vl_api_lisp_eid_table_map_details_t * mp)
{
- vat_main_t *vam = &vat_main;
+ vat_main_t *vam = &vat_main;
- u8 * line = format(0, "%=10d%=10d",
- clib_net_to_host_u32 (mp->vni),
- clib_net_to_host_u32 (mp->vrf));
- fformat(vam->ofp, "%v\n", line);
- vec_free(line);
+ u8 *line = format (0, "%=10d%=10d",
+ clib_net_to_host_u32 (mp->vni),
+ clib_net_to_host_u32 (mp->vrf));
+ fformat (vam->ofp, "%v\n", line);
+ vec_free (line);
}
static void
-vl_api_lisp_eid_table_map_details_t_handler_json (
- vl_api_lisp_eid_table_map_details_t *mp)
+ vl_api_lisp_eid_table_map_details_t_handler_json
+ (vl_api_lisp_eid_table_map_details_t * mp)
{
- vat_main_t *vam = &vat_main;
- vat_json_node_t *node = NULL;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
- if (VAT_JSON_ARRAY != vam->json_tree.type) {
- ASSERT(VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array(&vam->json_tree);
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
}
- node = vat_json_array_add(&vam->json_tree);
- vat_json_init_object(node);
- vat_json_object_add_uint(node, "vrf", clib_net_to_host_u32 (mp->vrf));
- vat_json_object_add_uint(node, "vni", clib_net_to_host_u32 (mp->vni));
+ node = vat_json_array_add (&vam->json_tree);
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "vrf", clib_net_to_host_u32 (mp->vrf));
+ vat_json_object_add_uint (node, "vni", clib_net_to_host_u32 (mp->vni));
}
@@ -2257,710 +2416,777 @@ format_decap_next (u8 * s, va_list * args)
}
static void
-vl_api_lisp_gpe_tunnel_details_t_handler (vl_api_lisp_gpe_tunnel_details_t *mp)
+vl_api_lisp_gpe_tunnel_details_t_handler (vl_api_lisp_gpe_tunnel_details_t *
+ mp)
{
- vat_main_t *vam = &vat_main;
- u8 *iid_str;
- u8 *flag_str = NULL;
+ vat_main_t *vam = &vat_main;
+ u8 *iid_str;
+ u8 *flag_str = NULL;
- iid_str = format(0, "%d (0x%x)", ntohl(mp->iid), ntohl(mp->iid));
+ iid_str = format (0, "%d (0x%x)", ntohl (mp->iid), ntohl (mp->iid));
#define _(n,v) if (mp->flags & v) flag_str = format (flag_str, "%s-bit ", #n);
foreach_lisp_gpe_flag_bit;
#undef _
- fformat(vam->ofp, "%=20d%=30U%=16U%=16d%=16d%=16U"
- "%=16d%=16d%=16sd=16d%=16s%=16s\n",
- mp->tunnels,
- mp->is_ipv6 ? format_ip6_address : format_ip4_address,
- mp->source_ip,
- mp->is_ipv6 ? format_ip6_address : format_ip4_address,
- mp->destination_ip,
- ntohl(mp->encap_fib_id),
- ntohl(mp->decap_fib_id),
- format_decap_next, ntohl(mp->dcap_next),
- mp->ver_res >> 6,
- flag_str,
- mp->next_protocol,
- mp->ver_res,
- mp->res,
- iid_str);
-
- vec_free(iid_str);
+ fformat (vam->ofp, "%=20d%=30U%=16U%=16d%=16d%=16U"
+ "%=16d%=16d%=16sd=16d%=16s%=16s\n",
+ mp->tunnels,
+ mp->is_ipv6 ? format_ip6_address : format_ip4_address,
+ mp->source_ip,
+ mp->is_ipv6 ? format_ip6_address : format_ip4_address,
+ mp->destination_ip,
+ ntohl (mp->encap_fib_id),
+ ntohl (mp->decap_fib_id),
+ format_decap_next, ntohl (mp->dcap_next),
+ mp->ver_res >> 6,
+ flag_str, mp->next_protocol, mp->ver_res, mp->res, iid_str);
+
+ vec_free (iid_str);
}
static void
-vl_api_lisp_gpe_tunnel_details_t_handler_json (
- vl_api_lisp_gpe_tunnel_details_t *mp)
-{
- vat_main_t *vam = &vat_main;
- vat_json_node_t *node = NULL;
- struct in6_addr ip6;
- struct in_addr ip4;
- u8 *next_decap_str;
-
- next_decap_str = format(0, "%U", format_decap_next, htonl(mp->dcap_next));
-
- if (VAT_JSON_ARRAY != vam->json_tree.type) {
- ASSERT(VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array(&vam->json_tree);
- }
- node = vat_json_array_add(&vam->json_tree);
-
- vat_json_init_object(node);
- vat_json_object_add_uint(node, "tunel", mp->tunnels);
- if (mp->is_ipv6) {
- clib_memcpy(&ip6, mp->source_ip, sizeof(ip6));
- vat_json_object_add_ip6(node, "source address", ip6);
- clib_memcpy(&ip6, mp->destination_ip, sizeof(ip6));
- vat_json_object_add_ip6(node, "destination address", ip6);
- } else {
- clib_memcpy(&ip4, mp->source_ip, sizeof(ip4));
- vat_json_object_add_ip4(node, "source address", ip4);
- clib_memcpy(&ip4, mp->destination_ip, sizeof(ip4));
- vat_json_object_add_ip4(node, "destination address", ip4);
- }
- vat_json_object_add_uint(node, "fib encap", ntohl(mp->encap_fib_id));
- vat_json_object_add_uint(node, "fib decap", ntohl(mp->decap_fib_id));
- vat_json_object_add_string_copy(node, "decap next", next_decap_str);
- vat_json_object_add_uint(node, "lisp version", mp->ver_res >> 6);
- vat_json_object_add_uint(node, "flags", mp->flags);
- vat_json_object_add_uint(node, "next protocol", mp->next_protocol);
- vat_json_object_add_uint(node, "ver_res", mp->ver_res);
- vat_json_object_add_uint(node, "res", mp->res);
- vat_json_object_add_uint(node, "iid", ntohl(mp->iid));
-
- vec_free(next_decap_str);
+ vl_api_lisp_gpe_tunnel_details_t_handler_json
+ (vl_api_lisp_gpe_tunnel_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
+ struct in6_addr ip6;
+ struct in_addr ip4;
+ u8 *next_decap_str;
+
+ next_decap_str = format (0, "%U", format_decap_next, htonl (mp->dcap_next));
+
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
+ }
+ node = vat_json_array_add (&vam->json_tree);
+
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "tunel", mp->tunnels);
+ if (mp->is_ipv6)
+ {
+ clib_memcpy (&ip6, mp->source_ip, sizeof (ip6));
+ vat_json_object_add_ip6 (node, "source address", ip6);
+ clib_memcpy (&ip6, mp->destination_ip, sizeof (ip6));
+ vat_json_object_add_ip6 (node, "destination address", ip6);
+ }
+ else
+ {
+ clib_memcpy (&ip4, mp->source_ip, sizeof (ip4));
+ vat_json_object_add_ip4 (node, "source address", ip4);
+ clib_memcpy (&ip4, mp->destination_ip, sizeof (ip4));
+ vat_json_object_add_ip4 (node, "destination address", ip4);
+ }
+ vat_json_object_add_uint (node, "fib encap", ntohl (mp->encap_fib_id));
+ vat_json_object_add_uint (node, "fib decap", ntohl (mp->decap_fib_id));
+ vat_json_object_add_string_copy (node, "decap next", next_decap_str);
+ vat_json_object_add_uint (node, "lisp version", mp->ver_res >> 6);
+ vat_json_object_add_uint (node, "flags", mp->flags);
+ vat_json_object_add_uint (node, "next protocol", mp->next_protocol);
+ vat_json_object_add_uint (node, "ver_res", mp->ver_res);
+ vat_json_object_add_uint (node, "res", mp->res);
+ vat_json_object_add_uint (node, "iid", ntohl (mp->iid));
+
+ vec_free (next_decap_str);
}
static void
-vl_api_lisp_map_resolver_details_t_handler (
- vl_api_lisp_map_resolver_details_t *mp)
+vl_api_lisp_map_resolver_details_t_handler (vl_api_lisp_map_resolver_details_t
+ * mp)
{
- vat_main_t *vam = &vat_main;
+ vat_main_t *vam = &vat_main;
- fformat(vam->ofp, "%=20U\n",
- mp->is_ipv6 ? format_ip6_address : format_ip4_address,
- mp->ip_address);
+ fformat (vam->ofp, "%=20U\n",
+ mp->is_ipv6 ? format_ip6_address : format_ip4_address,
+ mp->ip_address);
}
static void
-vl_api_lisp_map_resolver_details_t_handler_json (
- vl_api_lisp_map_resolver_details_t *mp)
+ vl_api_lisp_map_resolver_details_t_handler_json
+ (vl_api_lisp_map_resolver_details_t * mp)
{
- vat_main_t *vam = &vat_main;
- vat_json_node_t *node = NULL;
- struct in6_addr ip6;
- struct in_addr ip4;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
+ struct in6_addr ip6;
+ struct in_addr ip4;
- if (VAT_JSON_ARRAY != vam->json_tree.type) {
- ASSERT(VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array(&vam->json_tree);
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
}
- node = vat_json_array_add(&vam->json_tree);
+ node = vat_json_array_add (&vam->json_tree);
- vat_json_init_object(node);
- if (mp->is_ipv6) {
- clib_memcpy(&ip6, mp->ip_address, sizeof(ip6));
- vat_json_object_add_ip6(node, "map resolver", ip6);
- } else {
- clib_memcpy(&ip4, mp->ip_address, sizeof(ip4));
- vat_json_object_add_ip4(node, "map resolver", ip4);
+ vat_json_init_object (node);
+ if (mp->is_ipv6)
+ {
+ clib_memcpy (&ip6, mp->ip_address, sizeof (ip6));
+ vat_json_object_add_ip6 (node, "map resolver", ip6);
+ }
+ else
+ {
+ clib_memcpy (&ip4, mp->ip_address, sizeof (ip4));
+ vat_json_object_add_ip4 (node, "map resolver", ip4);
}
}
static void
-vl_api_show_lisp_status_reply_t_handler
-(vl_api_show_lisp_status_reply_t * mp)
+ vl_api_show_lisp_status_reply_t_handler
+ (vl_api_show_lisp_status_reply_t * mp)
{
- vat_main_t *vam = &vat_main;
- i32 retval = ntohl(mp->retval);
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
- if (0 <= retval) {
- fformat(vam->ofp, "feature: %s\ngpe: %s\n",
- mp->feature_status ? "enabled" : "disabled",
- mp->gpe_status ? "enabled" : "disabled");
+ if (0 <= retval)
+ {
+ fformat (vam->ofp, "feature: %s\ngpe: %s\n",
+ mp->feature_status ? "enabled" : "disabled",
+ mp->gpe_status ? "enabled" : "disabled");
}
- vam->retval = retval;
- vam->result_ready = 1;
+ vam->retval = retval;
+ vam->result_ready = 1;
}
static void
-vl_api_show_lisp_status_reply_t_handler_json
-(vl_api_show_lisp_status_reply_t *mp)
+ vl_api_show_lisp_status_reply_t_handler_json
+ (vl_api_show_lisp_status_reply_t * mp)
{
- vat_main_t *vam = &vat_main;
- vat_json_node_t node;
- u8 * gpe_status = NULL;
- u8 * feature_status = NULL;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
+ u8 *gpe_status = NULL;
+ u8 *feature_status = NULL;
- gpe_status = format (0, "%s", mp->gpe_status ? "enabled" : "disabled");
- feature_status = format (0, "%s",
- mp->feature_status ? "enabled" : "disabled");
- vec_add1 (gpe_status, 0);
- vec_add1 (feature_status, 0);
+ gpe_status = format (0, "%s", mp->gpe_status ? "enabled" : "disabled");
+ feature_status = format (0, "%s",
+ mp->feature_status ? "enabled" : "disabled");
+ vec_add1 (gpe_status, 0);
+ vec_add1 (feature_status, 0);
- vat_json_init_object(&node);
- vat_json_object_add_string_copy(&node, "gpe_status", gpe_status);
- vat_json_object_add_string_copy(&node, "feature_status", feature_status);
+ vat_json_init_object (&node);
+ vat_json_object_add_string_copy (&node, "gpe_status", gpe_status);
+ vat_json_object_add_string_copy (&node, "feature_status", feature_status);
- vec_free (gpe_status);
- vec_free (feature_status);
+ vec_free (gpe_status);
+ vec_free (feature_status);
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
static void
-vl_api_lisp_get_map_request_itr_rlocs_reply_t_handler (
- vl_api_lisp_get_map_request_itr_rlocs_reply_t * mp)
+ vl_api_lisp_get_map_request_itr_rlocs_reply_t_handler
+ (vl_api_lisp_get_map_request_itr_rlocs_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- i32 retval = ntohl(mp->retval);
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
- if (retval >= 0) {
- fformat(vam->ofp, "%=20s\n",
- mp->locator_set_name);
+ if (retval >= 0)
+ {
+ fformat (vam->ofp, "%=20s\n", mp->locator_set_name);
}
- vam->retval = retval;
- vam->result_ready = 1;
+ vam->retval = retval;
+ vam->result_ready = 1;
}
static void
-vl_api_lisp_get_map_request_itr_rlocs_reply_t_handler_json (
- vl_api_lisp_get_map_request_itr_rlocs_reply_t * mp)
+ vl_api_lisp_get_map_request_itr_rlocs_reply_t_handler_json
+ (vl_api_lisp_get_map_request_itr_rlocs_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t * node = NULL;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
- if (VAT_JSON_ARRAY != vam->json_tree.type) {
- ASSERT(VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array(&vam->json_tree);
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
}
- node = vat_json_array_add(&vam->json_tree);
+ node = vat_json_array_add (&vam->json_tree);
- vat_json_init_object(node);
- vat_json_object_add_string_copy(node, "itr-rlocs", mp->locator_set_name);
+ vat_json_init_object (node);
+ vat_json_object_add_string_copy (node, "itr-rlocs", mp->locator_set_name);
- vat_json_print(vam->ofp, node);
- vat_json_free(node);
+ vat_json_print (vam->ofp, node);
+ vat_json_free (node);
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
static void
vl_api_show_lisp_pitr_reply_t_handler (vl_api_show_lisp_pitr_reply_t * mp)
{
- vat_main_t *vam = &vat_main;
- i32 retval = ntohl(mp->retval);
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
- if (0 <= retval) {
- fformat(vam->ofp, "%-20s%-16s\n",
- mp->status ? "enabled" : "disabled",
- mp->status ? (char *) mp->locator_set_name : "");
+ if (0 <= retval)
+ {
+ fformat (vam->ofp, "%-20s%-16s\n",
+ mp->status ? "enabled" : "disabled",
+ mp->status ? (char *) mp->locator_set_name : "");
}
- vam->retval = retval;
- vam->result_ready = 1;
+ vam->retval = retval;
+ vam->result_ready = 1;
}
static void
-vl_api_show_lisp_pitr_reply_t_handler_json (vl_api_show_lisp_pitr_reply_t * mp)
+vl_api_show_lisp_pitr_reply_t_handler_json (vl_api_show_lisp_pitr_reply_t *
+ mp)
{
- vat_main_t *vam = &vat_main;
- vat_json_node_t node;
- u8 * status = 0;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
+ u8 *status = 0;
- status = format (0, "%s", mp->status ? "enabled" : "disabled");
- vec_add1 (status, 0);
+ status = format (0, "%s", mp->status ? "enabled" : "disabled");
+ vec_add1 (status, 0);
- vat_json_init_object(&node);
- vat_json_object_add_string_copy(&node, "status", status);
- if (mp->status) {
- vat_json_object_add_string_copy(&node, "locator_set", mp->locator_set_name);
+ vat_json_init_object (&node);
+ vat_json_object_add_string_copy (&node, "status", status);
+ if (mp->status)
+ {
+ vat_json_object_add_string_copy (&node, "locator_set",
+ mp->locator_set_name);
}
- vec_free (status);
+ vec_free (status);
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
-static u8 * format_policer_type (u8 * s, va_list * va)
+static u8 *
+format_policer_type (u8 * s, va_list * va)
{
- u32 i = va_arg (*va, u32);
+ u32 i = va_arg (*va, u32);
- if (i == SSE2_QOS_POLICER_TYPE_1R2C)
- s = format (s, "1r2c");
- else if (i == SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697)
- s = format (s, "1r3c");
- else if (i == SSE2_QOS_POLICER_TYPE_2R3C_RFC_2698)
- s = format (s, "2r3c-2698");
- else if (i == SSE2_QOS_POLICER_TYPE_2R3C_RFC_4115)
- s = format (s, "2r3c-4115");
- else if (i == SSE2_QOS_POLICER_TYPE_2R3C_RFC_MEF5CF1)
- s = format (s, "2r3c-mef5cf1");
- else
- s = format (s, "ILLEGAL");
- return s;
+ if (i == SSE2_QOS_POLICER_TYPE_1R2C)
+ s = format (s, "1r2c");
+ else if (i == SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697)
+ s = format (s, "1r3c");
+ else if (i == SSE2_QOS_POLICER_TYPE_2R3C_RFC_2698)
+ s = format (s, "2r3c-2698");
+ else if (i == SSE2_QOS_POLICER_TYPE_2R3C_RFC_4115)
+ s = format (s, "2r3c-4115");
+ else if (i == SSE2_QOS_POLICER_TYPE_2R3C_RFC_MEF5CF1)
+ s = format (s, "2r3c-mef5cf1");
+ else
+ s = format (s, "ILLEGAL");
+ return s;
}
-static u8 * format_policer_rate_type (u8 * s, va_list * va)
+static u8 *
+format_policer_rate_type (u8 * s, va_list * va)
{
- u32 i = va_arg (*va, u32);
+ u32 i = va_arg (*va, u32);
- if (i == SSE2_QOS_RATE_KBPS)
- s = format (s, "kbps");
- else if (i == SSE2_QOS_RATE_PPS)
- s = format(s, "pps");
- else
- s = format (s, "ILLEGAL");
- return s;
+ if (i == SSE2_QOS_RATE_KBPS)
+ s = format (s, "kbps");
+ else if (i == SSE2_QOS_RATE_PPS)
+ s = format (s, "pps");
+ else
+ s = format (s, "ILLEGAL");
+ return s;
}
-static u8 * format_policer_round_type (u8 * s, va_list * va)
+static u8 *
+format_policer_round_type (u8 * s, va_list * va)
{
- u32 i = va_arg (*va, u32);
+ u32 i = va_arg (*va, u32);
- if (i == SSE2_QOS_ROUND_TO_CLOSEST)
- s = format(s, "closest");
- else if (i == SSE2_QOS_ROUND_TO_UP)
- s = format (s, "up");
- else if (i == SSE2_QOS_ROUND_TO_DOWN)
- s = format (s, "down");
- else
- s = format (s, "ILLEGAL");
+ if (i == SSE2_QOS_ROUND_TO_CLOSEST)
+ s = format (s, "closest");
+ else if (i == SSE2_QOS_ROUND_TO_UP)
+ s = format (s, "up");
+ else if (i == SSE2_QOS_ROUND_TO_DOWN)
+ s = format (s, "down");
+ else
+ s = format (s, "ILLEGAL");
return s;
}
-static u8 * format_policer_action_type (u8 * s, va_list * va)
+static u8 *
+format_policer_action_type (u8 * s, va_list * va)
{
- u32 i = va_arg (*va, u32);
+ u32 i = va_arg (*va, u32);
- if (i == SSE2_QOS_ACTION_DROP)
- s = format (s, "drop");
- else if (i == SSE2_QOS_ACTION_TRANSMIT)
- s = format (s, "transmit");
- else if (i == SSE2_QOS_ACTION_MARK_AND_TRANSMIT)
- s = format (s, "mark-and-transmit");
- else
- s = format (s, "ILLEGAL");
- return s;
+ if (i == SSE2_QOS_ACTION_DROP)
+ s = format (s, "drop");
+ else if (i == SSE2_QOS_ACTION_TRANSMIT)
+ s = format (s, "transmit");
+ else if (i == SSE2_QOS_ACTION_MARK_AND_TRANSMIT)
+ s = format (s, "mark-and-transmit");
+ else
+ s = format (s, "ILLEGAL");
+ return s;
}
-static u8 * format_dscp (u8 * s, va_list * va)
+static u8 *
+format_dscp (u8 * s, va_list * va)
{
u32 i = va_arg (*va, u32);
- char * t = 0;
+ char *t = 0;
- switch (i) {
- #define _(v,f,str) case VNET_DSCP_##f: t = str; break;
- foreach_vnet_dscp
- #undef _
+ switch (i)
+ {
+#define _(v,f,str) case VNET_DSCP_##f: t = str; break;
+ foreach_vnet_dscp
+#undef _
default:
return format (s, "ILLEGAL");
- }
+ }
s = format (s, "%s", t);
return s;
}
-static void vl_api_policer_details_t_handler
-(vl_api_policer_details_t * mp)
+static void
+vl_api_policer_details_t_handler (vl_api_policer_details_t * mp)
{
- vat_main_t * vam = &vat_main;
- u8 *conform_dscp_str, *exceed_dscp_str, *violate_dscp_str;
+ vat_main_t *vam = &vat_main;
+ u8 *conform_dscp_str, *exceed_dscp_str, *violate_dscp_str;
- if (mp->conform_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT)
- conform_dscp_str = format(0, "%U", format_dscp, mp->conform_dscp);
- else
- conform_dscp_str = format(0, "");
+ if (mp->conform_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT)
+ conform_dscp_str = format (0, "%U", format_dscp, mp->conform_dscp);
+ else
+ conform_dscp_str = format (0, "");
- if (mp->exceed_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT)
- exceed_dscp_str = format(0, "%U", format_dscp, mp->exceed_dscp);
- else
- exceed_dscp_str = format(0, "");
+ if (mp->exceed_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT)
+ exceed_dscp_str = format (0, "%U", format_dscp, mp->exceed_dscp);
+ else
+ exceed_dscp_str = format (0, "");
- if (mp->violate_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT)
- violate_dscp_str = format(0, "%U", format_dscp, mp->violate_dscp);
- else
- violate_dscp_str = format(0, "");
-
- fformat (vam->ofp, "Name \"%s\", type %U, cir %u, eir %u, cb %u, eb %u, "
- "rate type %U, round type %U, %s rate, %s color-aware, "
- "cir %u tok/period, pir %u tok/period, scale %u, cur lim %u, "
- "cur bkt %u, ext lim %u, ext bkt %u, last update %llu"
- "conform action %U%s, exceed action %U%s, violate action %U%s\n",
- mp->name,
- format_policer_type, mp->type,
- ntohl(mp->cir),
- ntohl(mp->eir),
- clib_net_to_host_u64(mp->cb),
- clib_net_to_host_u64(mp->eb),
- format_policer_rate_type, mp->rate_type,
- format_policer_round_type, mp->round_type,
- mp->single_rate ? "single" : "dual",
- mp->color_aware ? "is" : "not",
- ntohl(mp->cir_tokens_per_period),
- ntohl(mp->pir_tokens_per_period),
- ntohl(mp->scale),
- ntohl(mp->current_limit),
- ntohl(mp->current_bucket),
- ntohl(mp->extended_limit),
- ntohl(mp->extended_bucket),
- clib_net_to_host_u64(mp->last_update_time),
- format_policer_action_type, mp->conform_action_type,
- conform_dscp_str,
- format_policer_action_type, mp->exceed_action_type,
- exceed_dscp_str,
- format_policer_action_type, mp->violate_action_type,
- violate_dscp_str);
-
- vec_free(conform_dscp_str);
- vec_free(exceed_dscp_str);
- vec_free(violate_dscp_str);
+ if (mp->violate_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT)
+ violate_dscp_str = format (0, "%U", format_dscp, mp->violate_dscp);
+ else
+ violate_dscp_str = format (0, "");
+
+ fformat (vam->ofp, "Name \"%s\", type %U, cir %u, eir %u, cb %u, eb %u, "
+ "rate type %U, round type %U, %s rate, %s color-aware, "
+ "cir %u tok/period, pir %u tok/period, scale %u, cur lim %u, "
+ "cur bkt %u, ext lim %u, ext bkt %u, last update %llu"
+ "conform action %U%s, exceed action %U%s, violate action %U%s\n",
+ mp->name,
+ format_policer_type, mp->type,
+ ntohl (mp->cir),
+ ntohl (mp->eir),
+ clib_net_to_host_u64 (mp->cb),
+ clib_net_to_host_u64 (mp->eb),
+ format_policer_rate_type, mp->rate_type,
+ format_policer_round_type, mp->round_type,
+ mp->single_rate ? "single" : "dual",
+ mp->color_aware ? "is" : "not",
+ ntohl (mp->cir_tokens_per_period),
+ ntohl (mp->pir_tokens_per_period),
+ ntohl (mp->scale),
+ ntohl (mp->current_limit),
+ ntohl (mp->current_bucket),
+ ntohl (mp->extended_limit),
+ ntohl (mp->extended_bucket),
+ clib_net_to_host_u64 (mp->last_update_time),
+ format_policer_action_type, mp->conform_action_type,
+ conform_dscp_str,
+ format_policer_action_type, mp->exceed_action_type,
+ exceed_dscp_str,
+ format_policer_action_type, mp->violate_action_type,
+ violate_dscp_str);
+
+ vec_free (conform_dscp_str);
+ vec_free (exceed_dscp_str);
+ vec_free (violate_dscp_str);
}
static void vl_api_policer_details_t_handler_json
-(vl_api_policer_details_t * mp)
-{
- vat_main_t * vam = &vat_main;
- vat_json_node_t *node;
- u8 *rate_type_str, *round_type_str, *type_str;
- u8 *conform_action_str, *exceed_action_str, *violate_action_str;
-
- rate_type_str = format(0, "%U", format_policer_rate_type, mp->rate_type);
- round_type_str = format(0, "%U", format_policer_round_type, mp->round_type);
- type_str = format(0, "%U", format_policer_type, mp->type);
- conform_action_str = format(0, "%U", format_policer_action_type,
- mp->conform_action_type);
- exceed_action_str = format(0, "%U", format_policer_action_type,
- mp->exceed_action_type);
- violate_action_str = format(0, "%U", format_policer_action_type,
- mp->violate_action_type);
-
- if (VAT_JSON_ARRAY != vam->json_tree.type) {
- ASSERT(VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array(&vam->json_tree);
- }
- node = vat_json_array_add(&vam->json_tree);
-
- vat_json_init_object(node);
- vat_json_object_add_string_copy(node, "name", mp->name);
- vat_json_object_add_uint(node, "cir", ntohl(mp->cir));
- vat_json_object_add_uint(node, "eir", ntohl(mp->eir));
- vat_json_object_add_uint(node, "cb", ntohl(mp->cb));
- vat_json_object_add_uint(node, "eb", ntohl(mp->eb));
- vat_json_object_add_string_copy(node, "rate_type", rate_type_str);
- vat_json_object_add_string_copy(node, "round_type", round_type_str);
- vat_json_object_add_string_copy(node, "type", type_str);
- vat_json_object_add_uint(node, "single_rate", mp->single_rate);
- vat_json_object_add_uint(node, "color_aware", mp->color_aware);
- vat_json_object_add_uint(node, "scale", ntohl(mp->scale));
- vat_json_object_add_uint(node, "cir_tokens_per_period",
- ntohl(mp->cir_tokens_per_period));
- vat_json_object_add_uint(node, "eir_tokens_per_period",
- ntohl(mp->pir_tokens_per_period));
- vat_json_object_add_uint(node, "current_limit", ntohl(mp->current_limit));
- vat_json_object_add_uint(node, "current_bucket", ntohl(mp->current_bucket));
- vat_json_object_add_uint(node, "extended_limit", ntohl(mp->extended_limit));
- vat_json_object_add_uint(node, "extended_bucket",
- ntohl(mp->extended_bucket));
- vat_json_object_add_uint(node, "last_update_time",
- ntohl(mp->last_update_time));
- vat_json_object_add_string_copy(node, "conform_action", conform_action_str);
- if (mp->conform_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT) {
- u8 *dscp_str = format(0, "%U", format_dscp, mp->conform_dscp);
- vat_json_object_add_string_copy(node, "conform_dscp", dscp_str);
- vec_free(dscp_str);
- }
- vat_json_object_add_string_copy(node, "exceed_action", exceed_action_str);
- if (mp->exceed_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT) {
- u8 *dscp_str = format(0, "%U", format_dscp, mp->exceed_dscp);
- vat_json_object_add_string_copy(node, "exceed_dscp", dscp_str);
- vec_free(dscp_str);
- }
- vat_json_object_add_string_copy(node, "violate_action", violate_action_str);
- if (mp->violate_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT) {
- u8 *dscp_str = format(0, "%U", format_dscp, mp->violate_dscp);
- vat_json_object_add_string_copy(node, "violate_dscp", dscp_str);
- vec_free(dscp_str);
- }
-
- vec_free(rate_type_str);
- vec_free(round_type_str);
- vec_free(type_str);
- vec_free(conform_action_str);
- vec_free(exceed_action_str);
- vec_free(violate_action_str);
-}
-
-static void vl_api_classify_table_ids_reply_t_handler (vl_api_classify_table_ids_reply_t * mp)
-{
- vat_main_t * vam = &vat_main;
- int i, count = ntohl(mp->count);
-
- if (count>0)
- fformat (vam->ofp, "classify table ids (%d) : ", count);
- for (i = 0; i < count; i++)
- {
- fformat (vam->ofp, "%d", ntohl(mp->ids[i]));
- fformat (vam->ofp, (i<count-1)?",":"\n");
- }
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
-}
-
-static void vl_api_classify_table_ids_reply_t_handler_json (vl_api_classify_table_ids_reply_t * mp)
-{
- vat_main_t * vam = &vat_main;
- int i, count = ntohl(mp->count);
-
- if (count>0) {
- vat_json_node_t node;
-
- vat_json_init_object(&node);
- for (i = 0; i < count; i++)
- {
- vat_json_object_add_uint(&node, "table_id", ntohl(mp->ids[i]));
- }
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
+ (vl_api_policer_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node;
+ u8 *rate_type_str, *round_type_str, *type_str;
+ u8 *conform_action_str, *exceed_action_str, *violate_action_str;
+
+ rate_type_str = format (0, "%U", format_policer_rate_type, mp->rate_type);
+ round_type_str =
+ format (0, "%U", format_policer_round_type, mp->round_type);
+ type_str = format (0, "%U", format_policer_type, mp->type);
+ conform_action_str = format (0, "%U", format_policer_action_type,
+ mp->conform_action_type);
+ exceed_action_str = format (0, "%U", format_policer_action_type,
+ mp->exceed_action_type);
+ violate_action_str = format (0, "%U", format_policer_action_type,
+ mp->violate_action_type);
+
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
+ }
+ node = vat_json_array_add (&vam->json_tree);
+
+ vat_json_init_object (node);
+ vat_json_object_add_string_copy (node, "name", mp->name);
+ vat_json_object_add_uint (node, "cir", ntohl (mp->cir));
+ vat_json_object_add_uint (node, "eir", ntohl (mp->eir));
+ vat_json_object_add_uint (node, "cb", ntohl (mp->cb));
+ vat_json_object_add_uint (node, "eb", ntohl (mp->eb));
+ vat_json_object_add_string_copy (node, "rate_type", rate_type_str);
+ vat_json_object_add_string_copy (node, "round_type", round_type_str);
+ vat_json_object_add_string_copy (node, "type", type_str);
+ vat_json_object_add_uint (node, "single_rate", mp->single_rate);
+ vat_json_object_add_uint (node, "color_aware", mp->color_aware);
+ vat_json_object_add_uint (node, "scale", ntohl (mp->scale));
+ vat_json_object_add_uint (node, "cir_tokens_per_period",
+ ntohl (mp->cir_tokens_per_period));
+ vat_json_object_add_uint (node, "eir_tokens_per_period",
+ ntohl (mp->pir_tokens_per_period));
+ vat_json_object_add_uint (node, "current_limit", ntohl (mp->current_limit));
+ vat_json_object_add_uint (node, "current_bucket",
+ ntohl (mp->current_bucket));
+ vat_json_object_add_uint (node, "extended_limit",
+ ntohl (mp->extended_limit));
+ vat_json_object_add_uint (node, "extended_bucket",
+ ntohl (mp->extended_bucket));
+ vat_json_object_add_uint (node, "last_update_time",
+ ntohl (mp->last_update_time));
+ vat_json_object_add_string_copy (node, "conform_action",
+ conform_action_str);
+ if (mp->conform_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT)
+ {
+ u8 *dscp_str = format (0, "%U", format_dscp, mp->conform_dscp);
+ vat_json_object_add_string_copy (node, "conform_dscp", dscp_str);
+ vec_free (dscp_str);
}
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ vat_json_object_add_string_copy (node, "exceed_action", exceed_action_str);
+ if (mp->exceed_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT)
+ {
+ u8 *dscp_str = format (0, "%U", format_dscp, mp->exceed_dscp);
+ vat_json_object_add_string_copy (node, "exceed_dscp", dscp_str);
+ vec_free (dscp_str);
+ }
+ vat_json_object_add_string_copy (node, "violate_action",
+ violate_action_str);
+ if (mp->violate_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT)
+ {
+ u8 *dscp_str = format (0, "%U", format_dscp, mp->violate_dscp);
+ vat_json_object_add_string_copy (node, "violate_dscp", dscp_str);
+ vec_free (dscp_str);
+ }
+
+ vec_free (rate_type_str);
+ vec_free (round_type_str);
+ vec_free (type_str);
+ vec_free (conform_action_str);
+ vec_free (exceed_action_str);
+ vec_free (violate_action_str);
}
-static void vl_api_classify_table_by_interface_reply_t_handler (vl_api_classify_table_by_interface_reply_t * mp)
+static void
+vl_api_classify_table_ids_reply_t_handler (vl_api_classify_table_ids_reply_t *
+ mp)
{
- vat_main_t * vam = &vat_main;
- u32 table_id;
+ vat_main_t *vam = &vat_main;
+ int i, count = ntohl (mp->count);
- table_id = ntohl(mp->l2_table_id);
- if (table_id != ~0)
- fformat (vam->ofp, "l2 table id : %d\n", table_id);
- else
- fformat (vam->ofp, "l2 table id : No input ACL tables configured\n");
- table_id = ntohl(mp->ip4_table_id);
- if (table_id != ~0)
- fformat (vam->ofp, "ip4 table id : %d\n", table_id);
- else
- fformat (vam->ofp, "ip4 table id : No input ACL tables configured\n");
- table_id = ntohl(mp->ip6_table_id);
- if (table_id != ~0)
- fformat (vam->ofp, "ip6 table id : %d\n", table_id);
- else
- fformat (vam->ofp, "ip6 table id : No input ACL tables configured\n");
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ if (count > 0)
+ fformat (vam->ofp, "classify table ids (%d) : ", count);
+ for (i = 0; i < count; i++)
+ {
+ fformat (vam->ofp, "%d", ntohl (mp->ids[i]));
+ fformat (vam->ofp, (i < count - 1) ? "," : "\n");
+ }
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
-static void vl_api_classify_table_by_interface_reply_t_handler_json (vl_api_classify_table_by_interface_reply_t * mp)
+static void
+ vl_api_classify_table_ids_reply_t_handler_json
+ (vl_api_classify_table_ids_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t node;
+ vat_main_t *vam = &vat_main;
+ int i, count = ntohl (mp->count);
- vat_json_init_object(&node);
+ if (count > 0)
+ {
+ vat_json_node_t node;
- vat_json_object_add_int(&node, "l2_table_id", ntohl(mp->l2_table_id));
- vat_json_object_add_int(&node, "ip4_table_id", ntohl(mp->ip4_table_id));
- vat_json_object_add_int(&node, "ip6_table_id", ntohl(mp->ip6_table_id));
+ vat_json_init_object (&node);
+ for (i = 0; i < count; i++)
+ {
+ vat_json_object_add_uint (&node, "table_id", ntohl (mp->ids[i]));
+ }
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
+ }
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
+}
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
+static void
+ vl_api_classify_table_by_interface_reply_t_handler
+ (vl_api_classify_table_by_interface_reply_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ u32 table_id;
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ table_id = ntohl (mp->l2_table_id);
+ if (table_id != ~0)
+ fformat (vam->ofp, "l2 table id : %d\n", table_id);
+ else
+ fformat (vam->ofp, "l2 table id : No input ACL tables configured\n");
+ table_id = ntohl (mp->ip4_table_id);
+ if (table_id != ~0)
+ fformat (vam->ofp, "ip4 table id : %d\n", table_id);
+ else
+ fformat (vam->ofp, "ip4 table id : No input ACL tables configured\n");
+ table_id = ntohl (mp->ip6_table_id);
+ if (table_id != ~0)
+ fformat (vam->ofp, "ip6 table id : %d\n", table_id);
+ else
+ fformat (vam->ofp, "ip6 table id : No input ACL tables configured\n");
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
+}
+
+static void
+ vl_api_classify_table_by_interface_reply_t_handler_json
+ (vl_api_classify_table_by_interface_reply_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
+
+ vat_json_init_object (&node);
+
+ vat_json_object_add_int (&node, "l2_table_id", ntohl (mp->l2_table_id));
+ vat_json_object_add_int (&node, "ip4_table_id", ntohl (mp->ip4_table_id));
+ vat_json_object_add_int (&node, "ip6_table_id", ntohl (mp->ip6_table_id));
+
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
+
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
static void vl_api_policer_add_del_reply_t_handler
-(vl_api_policer_add_del_reply_t * mp)
+ (vl_api_policer_add_del_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- i32 retval = ntohl(mp->retval);
- if (vam->async_mode) {
- vam->async_errors += (retval < 0);
- } else {
- vam->retval = retval;
- vam->result_ready = 1;
- if (retval == 0 && mp->policer_index != 0xFFFFFFFF)
- /*
- * Note: this is just barely thread-safe, depends on
- * the main thread spinning waiting for an answer...
- */
- errmsg ("policer index %d\n", ntohl(mp->policer_index));
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
+ if (vam->async_mode)
+ {
+ vam->async_errors += (retval < 0);
+ }
+ else
+ {
+ vam->retval = retval;
+ vam->result_ready = 1;
+ if (retval == 0 && mp->policer_index != 0xFFFFFFFF)
+ /*
+ * Note: this is just barely thread-safe, depends on
+ * the main thread spinning waiting for an answer...
+ */
+ errmsg ("policer index %d\n", ntohl (mp->policer_index));
}
}
static void vl_api_policer_add_del_reply_t_handler_json
-(vl_api_policer_add_del_reply_t * mp)
+ (vl_api_policer_add_del_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t node;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
- vat_json_init_object(&node);
- vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
- vat_json_object_add_uint(&node, "policer_index", ntohl(mp->policer_index));
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+ vat_json_object_add_uint (&node, "policer_index",
+ ntohl (mp->policer_index));
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
/* Format hex dump. */
-u8 * format_hex_bytes (u8 * s, va_list * va)
+u8 *
+format_hex_bytes (u8 * s, va_list * va)
{
- u8 * bytes = va_arg (*va, u8 *);
- int n_bytes = va_arg (*va, int);
- uword i;
+ u8 *bytes = va_arg (*va, u8 *);
+ int n_bytes = va_arg (*va, int);
+ uword i;
- /* Print short or long form depending on byte count. */
- uword short_form = n_bytes <= 32;
- uword indent = format_get_indent (s);
+ /* Print short or long form depending on byte count. */
+ uword short_form = n_bytes <= 32;
+ uword indent = format_get_indent (s);
- if (n_bytes == 0)
- return s;
+ if (n_bytes == 0)
+ return s;
- for (i = 0; i < n_bytes; i++)
+ for (i = 0; i < n_bytes; i++)
{
- if (! short_form && (i % 32) == 0)
- s = format (s, "%08x: ", i);
- s = format (s, "%02x", bytes[i]);
- if (! short_form && ((i + 1) % 32) == 0 && (i + 1) < n_bytes)
- s = format (s, "\n%U", format_white_space, indent);
+ if (!short_form && (i % 32) == 0)
+ s = format (s, "%08x: ", i);
+ s = format (s, "%02x", bytes[i]);
+ if (!short_form && ((i + 1) % 32) == 0 && (i + 1) < n_bytes)
+ s = format (s, "\n%U", format_white_space, indent);
}
- return s;
+ return s;
}
-static void vl_api_classify_table_info_reply_t_handler (vl_api_classify_table_info_reply_t * mp)
+static void
+vl_api_classify_table_info_reply_t_handler (vl_api_classify_table_info_reply_t
+ * mp)
{
- vat_main_t * vam = &vat_main;
- i32 retval = ntohl(mp->retval);
- if (retval == 0) {
- fformat (vam->ofp, "classify table info :\n");
- fformat (vam->ofp, "sessions: %d nexttbl: %d nextnode: %d\n", ntohl(mp->active_sessions), ntohl(mp->next_table_index), ntohl(mp->miss_next_index));
- fformat (vam->ofp, "nbuckets: %d skip: %d match: %d\n", ntohl(mp->nbuckets), ntohl(mp->skip_n_vectors), ntohl(mp->match_n_vectors));
- fformat (vam->ofp, "mask: %U\n", format_hex_bytes, mp->mask, ntohl(mp->mask_length));
- }
- vam->retval = retval;
- vam->result_ready = 1;
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
+ if (retval == 0)
+ {
+ fformat (vam->ofp, "classify table info :\n");
+ fformat (vam->ofp, "sessions: %d nexttbl: %d nextnode: %d\n",
+ ntohl (mp->active_sessions), ntohl (mp->next_table_index),
+ ntohl (mp->miss_next_index));
+ fformat (vam->ofp, "nbuckets: %d skip: %d match: %d\n",
+ ntohl (mp->nbuckets), ntohl (mp->skip_n_vectors),
+ ntohl (mp->match_n_vectors));
+ fformat (vam->ofp, "mask: %U\n", format_hex_bytes, mp->mask,
+ ntohl (mp->mask_length));
+ }
+ vam->retval = retval;
+ vam->result_ready = 1;
}
-static void vl_api_classify_table_info_reply_t_handler_json (vl_api_classify_table_info_reply_t * mp)
+static void
+ vl_api_classify_table_info_reply_t_handler_json
+ (vl_api_classify_table_info_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t node;
-
- i32 retval = ntohl(mp->retval);
- if (retval == 0) {
- vat_json_init_object(&node);
-
- vat_json_object_add_int(&node, "sessions", ntohl(mp->active_sessions));
- vat_json_object_add_int(&node, "nexttbl", ntohl(mp->next_table_index));
- vat_json_object_add_int(&node, "nextnode", ntohl(mp->miss_next_index));
- vat_json_object_add_int(&node, "nbuckets", ntohl(mp->nbuckets));
- vat_json_object_add_int(&node, "skip", ntohl(mp->skip_n_vectors));
- vat_json_object_add_int(&node, "match", ntohl(mp->match_n_vectors));
- u8 * s = format (0, "%U%c",format_hex_bytes, mp->mask, ntohl(mp->mask_length), 0);
- vat_json_object_add_string_copy(&node, "mask", s);
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
- }
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ i32 retval = ntohl (mp->retval);
+ if (retval == 0)
+ {
+ vat_json_init_object (&node);
+
+ vat_json_object_add_int (&node, "sessions",
+ ntohl (mp->active_sessions));
+ vat_json_object_add_int (&node, "nexttbl",
+ ntohl (mp->next_table_index));
+ vat_json_object_add_int (&node, "nextnode",
+ ntohl (mp->miss_next_index));
+ vat_json_object_add_int (&node, "nbuckets", ntohl (mp->nbuckets));
+ vat_json_object_add_int (&node, "skip", ntohl (mp->skip_n_vectors));
+ vat_json_object_add_int (&node, "match", ntohl (mp->match_n_vectors));
+ u8 *s = format (0, "%U%c", format_hex_bytes, mp->mask,
+ ntohl (mp->mask_length), 0);
+ vat_json_object_add_string_copy (&node, "mask", s);
+
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
+ }
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
-static void vl_api_classify_session_details_t_handler (vl_api_classify_session_details_t * mp)
+static void
+vl_api_classify_session_details_t_handler (vl_api_classify_session_details_t *
+ mp)
{
- vat_main_t * vam = &vat_main;
+ vat_main_t *vam = &vat_main;
- fformat (vam->ofp, "next_index: %d advance: %d opaque: %d ", ntohl(mp->hit_next_index), ntohl(mp->advance), ntohl(mp->opaque_index));
- fformat (vam->ofp, "mask: %U\n", format_hex_bytes, mp->match, ntohl(mp->match_length));
+ fformat (vam->ofp, "next_index: %d advance: %d opaque: %d ",
+ ntohl (mp->hit_next_index), ntohl (mp->advance),
+ ntohl (mp->opaque_index));
+ fformat (vam->ofp, "mask: %U\n", format_hex_bytes, mp->match,
+ ntohl (mp->match_length));
}
-static void vl_api_classify_session_details_t_handler_json (vl_api_classify_session_details_t * mp)
+static void
+ vl_api_classify_session_details_t_handler_json
+ (vl_api_classify_session_details_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t *node = NULL;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
- if (VAT_JSON_ARRAY != vam->json_tree.type) {
- ASSERT(VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array(&vam->json_tree);
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
}
- node = vat_json_array_add(&vam->json_tree);
+ node = vat_json_array_add (&vam->json_tree);
- vat_json_init_object(node);
- vat_json_object_add_int(node, "next_index", ntohl(mp->hit_next_index));
- vat_json_object_add_int(node, "advance", ntohl(mp->advance));
- vat_json_object_add_int(node, "opaque", ntohl(mp->opaque_index));
- u8 * s = format (0, "%U%c",format_hex_bytes, mp->match, ntohl(mp->match_length), 0);
- vat_json_object_add_string_copy(node, "match", s);
+ vat_json_init_object (node);
+ vat_json_object_add_int (node, "next_index", ntohl (mp->hit_next_index));
+ vat_json_object_add_int (node, "advance", ntohl (mp->advance));
+ vat_json_object_add_int (node, "opaque", ntohl (mp->opaque_index));
+ u8 *s =
+ format (0, "%U%c", format_hex_bytes, mp->match, ntohl (mp->match_length),
+ 0);
+ vat_json_object_add_string_copy (node, "match", s);
}
static void vl_api_pg_create_interface_reply_t_handler
-(vl_api_pg_create_interface_reply_t * mp)
+ (vl_api_pg_create_interface_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
+ vat_main_t *vam = &vat_main;
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
static void vl_api_pg_create_interface_reply_t_handler_json
-(vl_api_pg_create_interface_reply_t * mp)
+ (vl_api_pg_create_interface_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t node;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
- i32 retval = ntohl(mp->retval);
- if (retval == 0) {
- vat_json_init_object(&node);
+ i32 retval = ntohl (mp->retval);
+ if (retval == 0)
+ {
+ vat_json_init_object (&node);
- vat_json_object_add_int(&node, "sw_if_index", ntohl(mp->sw_if_index));
+ vat_json_object_add_int (&node, "sw_if_index", ntohl (mp->sw_if_index));
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
}
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
static void vl_api_policer_classify_details_t_handler
-(vl_api_policer_classify_details_t * mp)
+ (vl_api_policer_classify_details_t * mp)
{
- vat_main_t * vam = &vat_main;
+ vat_main_t *vam = &vat_main;
- fformat (vam->ofp, "%10d%20d\n", ntohl(mp->sw_if_index),
- ntohl(mp->table_index));
+ fformat (vam->ofp, "%10d%20d\n", ntohl (mp->sw_if_index),
+ ntohl (mp->table_index));
}
static void vl_api_policer_classify_details_t_handler_json
-(vl_api_policer_classify_details_t * mp)
+ (vl_api_policer_classify_details_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t * node;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node;
- if (VAT_JSON_ARRAY != vam->json_tree.type) {
- ASSERT(VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array(&vam->json_tree);
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
}
- node = vat_json_array_add(&vam->json_tree);
+ node = vat_json_array_add (&vam->json_tree);
- vat_json_init_object(node);
- vat_json_object_add_uint(node, "sw_if_index", ntohl(mp->sw_if_index));
- vat_json_object_add_uint(node, "table_index", ntohl(mp->table_index));
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+ vat_json_object_add_uint (node, "table_index", ntohl (mp->table_index));
}
@@ -3353,9 +3579,10 @@ do { \
return -99; \
} while(0);
-typedef struct {
- u8 * name;
- u32 value;
+typedef struct
+{
+ u8 *name;
+ u32 value;
} name_sort_t;
@@ -3363,2191 +3590,2443 @@ typedef struct {
case L2_VTR_ ## op: \
return "" # op;
-static const char *str_vtr_op(u32 vtr_op)
+static const char *
+str_vtr_op (u32 vtr_op)
{
- switch(vtr_op) {
- STR_VTR_OP_CASE(DISABLED);
- STR_VTR_OP_CASE(PUSH_1);
- STR_VTR_OP_CASE(PUSH_2);
- STR_VTR_OP_CASE(POP_1);
- STR_VTR_OP_CASE(POP_2);
- STR_VTR_OP_CASE(TRANSLATE_1_1);
- STR_VTR_OP_CASE(TRANSLATE_1_2);
- STR_VTR_OP_CASE(TRANSLATE_2_1);
- STR_VTR_OP_CASE(TRANSLATE_2_2);
+ switch (vtr_op)
+ {
+ STR_VTR_OP_CASE (DISABLED);
+ STR_VTR_OP_CASE (PUSH_1);
+ STR_VTR_OP_CASE (PUSH_2);
+ STR_VTR_OP_CASE (POP_1);
+ STR_VTR_OP_CASE (POP_2);
+ STR_VTR_OP_CASE (TRANSLATE_1_1);
+ STR_VTR_OP_CASE (TRANSLATE_1_2);
+ STR_VTR_OP_CASE (TRANSLATE_2_1);
+ STR_VTR_OP_CASE (TRANSLATE_2_2);
}
- return "UNKNOWN";
+ return "UNKNOWN";
}
-static int dump_sub_interface_table (vat_main_t * vam)
+static int
+dump_sub_interface_table (vat_main_t * vam)
{
- const sw_interface_subif_t * sub = NULL;
+ const sw_interface_subif_t *sub = NULL;
- if (vam->json_output) {
- clib_warning ("JSON output supported only for VPE API calls and dump_stats_table");
- return -99;
+ if (vam->json_output)
+ {
+ clib_warning
+ ("JSON output supported only for VPE API calls and dump_stats_table");
+ return -99;
}
+ fformat (vam->ofp,
+ "%-30s%-12s%-11s%-7s%-5s%-9s%-9s%-6s%-8s%-10s%-10s\n",
+ "Interface", "sw_if_index",
+ "sub id", "dot1ad", "tags", "outer id",
+ "inner id", "exact", "default", "outer any", "inner any");
+
+ vec_foreach (sub, vam->sw_if_subif_table)
+ {
fformat (vam->ofp,
- "%-30s%-12s%-11s%-7s%-5s%-9s%-9s%-6s%-8s%-10s%-10s\n",
- "Interface", "sw_if_index",
- "sub id", "dot1ad", "tags", "outer id",
- "inner id", "exact", "default",
- "outer any", "inner any");
-
- vec_foreach (sub, vam->sw_if_subif_table) {
- fformat (vam->ofp,
- "%-30s%-12d%-11d%-7s%-5d%-9d%-9d%-6d%-8d%-10d%-10d\n",
- sub->interface_name,
- sub->sw_if_index,
- sub->sub_id, sub->sub_dot1ad ? "dot1ad" : "dot1q",
- sub->sub_number_of_tags, sub->sub_outer_vlan_id,
- sub->sub_inner_vlan_id, sub->sub_exact_match, sub->sub_default,
- sub->sub_outer_vlan_id_any, sub->sub_inner_vlan_id_any);
- if (sub->vtr_op != L2_VTR_DISABLED) {
- fformat (vam->ofp,
- " vlan-tag-rewrite - op: %-14s [ dot1q: %d "
- "tag1: %d tag2: %d ]\n",
- str_vtr_op(sub->vtr_op), sub->vtr_push_dot1q,
- sub->vtr_tag1, sub->vtr_tag2);
- }
- }
+ "%-30s%-12d%-11d%-7s%-5d%-9d%-9d%-6d%-8d%-10d%-10d\n",
+ sub->interface_name,
+ sub->sw_if_index,
+ sub->sub_id, sub->sub_dot1ad ? "dot1ad" : "dot1q",
+ sub->sub_number_of_tags, sub->sub_outer_vlan_id,
+ sub->sub_inner_vlan_id, sub->sub_exact_match, sub->sub_default,
+ sub->sub_outer_vlan_id_any, sub->sub_inner_vlan_id_any);
+ if (sub->vtr_op != L2_VTR_DISABLED)
+ {
+ fformat (vam->ofp,
+ " vlan-tag-rewrite - op: %-14s [ dot1q: %d "
+ "tag1: %d tag2: %d ]\n",
+ str_vtr_op (sub->vtr_op), sub->vtr_push_dot1q,
+ sub->vtr_tag1, sub->vtr_tag2);
+ }
+ }
- return 0;
+ return 0;
}
-static int name_sort_cmp (void * a1, void * a2)
+static int
+name_sort_cmp (void *a1, void *a2)
{
- name_sort_t * n1 = a1;
- name_sort_t * n2 = a2;
+ name_sort_t *n1 = a1;
+ name_sort_t *n2 = a2;
- return strcmp ((char *)n1->name, (char *)n2->name);
+ return strcmp ((char *) n1->name, (char *) n2->name);
}
-static int dump_interface_table (vat_main_t * vam)
+static int
+dump_interface_table (vat_main_t * vam)
{
- hash_pair_t * p;
- name_sort_t * nses = 0, * ns;
+ hash_pair_t *p;
+ name_sort_t *nses = 0, *ns;
- if (vam->json_output) {
- clib_warning ("JSON output supported only for VPE API calls and dump_stats_table");
- return -99;
+ if (vam->json_output)
+ {
+ clib_warning
+ ("JSON output supported only for VPE API calls and dump_stats_table");
+ return -99;
}
- hash_foreach_pair (p, vam->sw_if_index_by_interface_name,
- ({
- vec_add2 (nses, ns, 1);
- ns->name = (u8 *)(p->key);
- ns->value = (u32) p->value[0];
- }));
+ /* *INDENT-OFF* */
+ hash_foreach_pair (p, vam->sw_if_index_by_interface_name,
+ ({
+ vec_add2 (nses, ns, 1);
+ ns->name = (u8 *)(p->key);
+ ns->value = (u32) p->value[0];
+ }));
+ /* *INDENT-ON* */
- vec_sort_with_function (nses, name_sort_cmp);
+ vec_sort_with_function (nses, name_sort_cmp);
- fformat (vam->ofp, "%-25s%-15s\n", "Interface", "sw_if_index");
- vec_foreach (ns, nses) {
- fformat (vam->ofp, "%-25s%-15d\n", ns->name, ns->value);
- }
- vec_free (nses);
- return 0;
+ fformat (vam->ofp, "%-25s%-15s\n", "Interface", "sw_if_index");
+ vec_foreach (ns, nses)
+ {
+ fformat (vam->ofp, "%-25s%-15d\n", ns->name, ns->value);
+ }
+ vec_free (nses);
+ return 0;
}
-static int dump_ip_table (vat_main_t * vam, int is_ipv6)
+static int
+dump_ip_table (vat_main_t * vam, int is_ipv6)
{
- const ip_details_t * det = NULL;
- const ip_address_details_t * address = NULL;
- u32 i = ~0;
+ const ip_details_t *det = NULL;
+ const ip_address_details_t *address = NULL;
+ u32 i = ~0;
+
+ fformat (vam->ofp, "%-12s\n", "sw_if_index");
+
+ if (0 == vam)
+ {
+ return 0;
+ }
+ vec_foreach (det, vam->ip_details_by_sw_if_index[is_ipv6])
+ {
+ i++;
+ if (!det->present)
+ {
+ continue;
+ }
+ fformat (vam->ofp, "%-12d\n", i);
fformat (vam->ofp,
- "%-12s\n",
- "sw_if_index");
-
- if (0 == vam) {
- return 0;
- }
-
- vec_foreach (det, vam->ip_details_by_sw_if_index[is_ipv6]) {
- i++;
- if (!det->present) {
- continue;
- }
- fformat (vam->ofp,
- "%-12d\n",
- i);
- fformat (vam->ofp,
- " %-30s%-13s\n",
- "Address", "Prefix length");
- if (!det->addr) {
- continue;
- }
- vec_foreach (address, det->addr) {
- fformat (vam->ofp,
- " %-30U%-13d\n",
- is_ipv6 ? format_ip6_address : format_ip4_address,
- address->ip,
- address->prefix_length);
- }
+ " %-30s%-13s\n", "Address", "Prefix length");
+ if (!det->addr)
+ {
+ continue;
+ }
+ vec_foreach (address, det->addr)
+ {
+ fformat (vam->ofp,
+ " %-30U%-13d\n",
+ is_ipv6 ? format_ip6_address : format_ip4_address,
+ address->ip, address->prefix_length);
}
+ }
- return 0;
+ return 0;
}
-static int dump_ipv4_table (vat_main_t * vam)
-{
- if (vam->json_output) {
- clib_warning ("JSON output supported only for VPE API calls and dump_stats_table");
- return -99;
- }
-
- return dump_ip_table (vam, 0);
-}
-
-static int dump_ipv6_table (vat_main_t * vam)
-{
- if (vam->json_output) {
- clib_warning ("JSON output supported only for VPE API calls and dump_stats_table");
- return -99;
- }
-
- return dump_ip_table (vam, 1);
-}
-
-static char* counter_type_to_str (u8 counter_type, u8 is_combined)
-{
- if (!is_combined) {
- switch(counter_type) {
- case VNET_INTERFACE_COUNTER_DROP:
- return "drop";
- case VNET_INTERFACE_COUNTER_PUNT:
- return "punt";
- case VNET_INTERFACE_COUNTER_IP4:
- return "ip4";
- case VNET_INTERFACE_COUNTER_IP6:
- return "ip6";
- case VNET_INTERFACE_COUNTER_RX_NO_BUF:
- return "rx-no-buf";
- case VNET_INTERFACE_COUNTER_RX_MISS:
- return "rx-miss";
- case VNET_INTERFACE_COUNTER_RX_ERROR:
- return "rx-error";
- case VNET_INTERFACE_COUNTER_TX_ERROR:
- return "tx-error";
- default:
- return "INVALID-COUNTER-TYPE";
- }
- } else {
- switch(counter_type) {
- case VNET_INTERFACE_COUNTER_RX:
- return "rx";
- case VNET_INTERFACE_COUNTER_TX:
- return "tx";
- default:
- return "INVALID-COUNTER-TYPE";
- }
- }
-}
-
-static int dump_stats_table (vat_main_t * vam)
-{
- vat_json_node_t node;
- vat_json_node_t *msg_array;
- vat_json_node_t *msg;
- vat_json_node_t *counter_array;
- vat_json_node_t *counter;
- interface_counter_t c;
- u64 packets;
- ip4_fib_counter_t *c4;
- ip6_fib_counter_t *c6;
- int i, j;
-
- if (!vam->json_output) {
- clib_warning ("dump_stats_table supported only in JSON format");
- return -99;
- }
-
- vat_json_init_object(&node);
-
- /* interface counters */
- msg_array = vat_json_object_add(&node, "interface_counters");
- vat_json_init_array(msg_array);
- for (i = 0; i < vec_len(vam->simple_interface_counters); i++) {
- msg = vat_json_array_add(msg_array);
- vat_json_init_object(msg);
- vat_json_object_add_string_copy(msg, "vnet_counter_type",
- (u8*)counter_type_to_str(i, 0));
- vat_json_object_add_int(msg, "is_combined", 0);
- counter_array = vat_json_object_add(msg, "data");
- vat_json_init_array(counter_array);
- for (j = 0; j < vec_len(vam->simple_interface_counters[i]); j++) {
- packets = vam->simple_interface_counters[i][j];
- vat_json_array_add_uint(counter_array, packets);
- }
- }
- for (i = 0; i < vec_len(vam->combined_interface_counters); i++) {
- msg = vat_json_array_add(msg_array);
- vat_json_init_object(msg);
- vat_json_object_add_string_copy(msg, "vnet_counter_type",
- (u8*)counter_type_to_str(i, 1));
- vat_json_object_add_int(msg, "is_combined", 1);
- counter_array = vat_json_object_add(msg, "data");
- vat_json_init_array(counter_array);
- for (j = 0; j < vec_len(vam->combined_interface_counters[i]); j++) {
- c = vam->combined_interface_counters[i][j];
- counter = vat_json_array_add(counter_array);
- vat_json_init_object(counter);
- vat_json_object_add_uint(counter, "packets", c.packets);
- vat_json_object_add_uint(counter, "bytes", c.bytes);
- }
- }
-
- /* ip4 fib counters */
- msg_array = vat_json_object_add(&node, "ip4_fib_counters");
- vat_json_init_array(msg_array);
- for (i = 0; i < vec_len(vam->ip4_fib_counters); i++) {
- msg = vat_json_array_add(msg_array);
- vat_json_init_object(msg);
- vat_json_object_add_uint(msg, "vrf_id", vam->ip4_fib_counters_vrf_id_by_index[i]);
- counter_array = vat_json_object_add(msg, "c");
- vat_json_init_array(counter_array);
- for (j = 0; j < vec_len(vam->ip4_fib_counters[i]); j++) {
- counter = vat_json_array_add(counter_array);
- vat_json_init_object(counter);
- c4 = &vam->ip4_fib_counters[i][j];
- vat_json_object_add_ip4(counter, "address", c4->address);
- vat_json_object_add_uint(counter, "address_length", c4->address_length);
- vat_json_object_add_uint(counter, "packets", c4->packets);
- vat_json_object_add_uint(counter, "bytes", c4->bytes);
- }
- }
-
- /* ip6 fib counters */
- msg_array = vat_json_object_add(&node, "ip6_fib_counters");
- vat_json_init_array(msg_array);
- for (i = 0; i < vec_len(vam->ip6_fib_counters); i++) {
- msg = vat_json_array_add(msg_array);
- vat_json_init_object(msg);
- vat_json_object_add_uint(msg, "vrf_id", vam->ip6_fib_counters_vrf_id_by_index[i]);
- counter_array = vat_json_object_add(msg, "c");
- vat_json_init_array(counter_array);
- for (j = 0; j < vec_len(vam->ip6_fib_counters[i]); j++) {
- counter = vat_json_array_add(counter_array);
- vat_json_init_object(counter);
- c6 = &vam->ip6_fib_counters[i][j];
- vat_json_object_add_ip6(counter, "address", c6->address);
- vat_json_object_add_uint(counter, "address_length", c6->address_length);
- vat_json_object_add_uint(counter, "packets", c6->packets);
- vat_json_object_add_uint(counter, "bytes", c6->bytes);
- }
- }
-
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
+static int
+dump_ipv4_table (vat_main_t * vam)
+{
+ if (vam->json_output)
+ {
+ clib_warning
+ ("JSON output supported only for VPE API calls and dump_stats_table");
+ return -99;
+ }
- return 0;
+ return dump_ip_table (vam, 0);
}
-int exec (vat_main_t * vam)
+static int
+dump_ipv6_table (vat_main_t * vam)
{
- api_main_t * am = &api_main;
- vl_api_cli_request_t *mp;
- f64 timeout;
- void * oldheap;
- u8 * cmd = 0;
- unformat_input_t * i = vam->input;
+ if (vam->json_output)
+ {
+ clib_warning
+ ("JSON output supported only for VPE API calls and dump_stats_table");
+ return -99;
+ }
- if (vec_len(i->buffer) == 0)
- return -1;
+ return dump_ip_table (vam, 1);
+}
+
+static char *
+counter_type_to_str (u8 counter_type, u8 is_combined)
+{
+ if (!is_combined)
+ {
+ switch (counter_type)
+ {
+ case VNET_INTERFACE_COUNTER_DROP:
+ return "drop";
+ case VNET_INTERFACE_COUNTER_PUNT:
+ return "punt";
+ case VNET_INTERFACE_COUNTER_IP4:
+ return "ip4";
+ case VNET_INTERFACE_COUNTER_IP6:
+ return "ip6";
+ case VNET_INTERFACE_COUNTER_RX_NO_BUF:
+ return "rx-no-buf";
+ case VNET_INTERFACE_COUNTER_RX_MISS:
+ return "rx-miss";
+ case VNET_INTERFACE_COUNTER_RX_ERROR:
+ return "rx-error";
+ case VNET_INTERFACE_COUNTER_TX_ERROR:
+ return "tx-error";
+ default:
+ return "INVALID-COUNTER-TYPE";
+ }
+ }
+ else
+ {
+ switch (counter_type)
+ {
+ case VNET_INTERFACE_COUNTER_RX:
+ return "rx";
+ case VNET_INTERFACE_COUNTER_TX:
+ return "tx";
+ default:
+ return "INVALID-COUNTER-TYPE";
+ }
+ }
+}
- if (vam->exec_mode == 0 && unformat (i, "mode")) {
- vam->exec_mode = 1;
- return 0;
+static int
+dump_stats_table (vat_main_t * vam)
+{
+ vat_json_node_t node;
+ vat_json_node_t *msg_array;
+ vat_json_node_t *msg;
+ vat_json_node_t *counter_array;
+ vat_json_node_t *counter;
+ interface_counter_t c;
+ u64 packets;
+ ip4_fib_counter_t *c4;
+ ip6_fib_counter_t *c6;
+ int i, j;
+
+ if (!vam->json_output)
+ {
+ clib_warning ("dump_stats_table supported only in JSON format");
+ return -99;
+ }
+
+ vat_json_init_object (&node);
+
+ /* interface counters */
+ msg_array = vat_json_object_add (&node, "interface_counters");
+ vat_json_init_array (msg_array);
+ for (i = 0; i < vec_len (vam->simple_interface_counters); i++)
+ {
+ msg = vat_json_array_add (msg_array);
+ vat_json_init_object (msg);
+ vat_json_object_add_string_copy (msg, "vnet_counter_type",
+ (u8 *) counter_type_to_str (i, 0));
+ vat_json_object_add_int (msg, "is_combined", 0);
+ counter_array = vat_json_object_add (msg, "data");
+ vat_json_init_array (counter_array);
+ for (j = 0; j < vec_len (vam->simple_interface_counters[i]); j++)
+ {
+ packets = vam->simple_interface_counters[i][j];
+ vat_json_array_add_uint (counter_array, packets);
+ }
+ }
+ for (i = 0; i < vec_len (vam->combined_interface_counters); i++)
+ {
+ msg = vat_json_array_add (msg_array);
+ vat_json_init_object (msg);
+ vat_json_object_add_string_copy (msg, "vnet_counter_type",
+ (u8 *) counter_type_to_str (i, 1));
+ vat_json_object_add_int (msg, "is_combined", 1);
+ counter_array = vat_json_object_add (msg, "data");
+ vat_json_init_array (counter_array);
+ for (j = 0; j < vec_len (vam->combined_interface_counters[i]); j++)
+ {
+ c = vam->combined_interface_counters[i][j];
+ counter = vat_json_array_add (counter_array);
+ vat_json_init_object (counter);
+ vat_json_object_add_uint (counter, "packets", c.packets);
+ vat_json_object_add_uint (counter, "bytes", c.bytes);
+ }
+ }
+
+ /* ip4 fib counters */
+ msg_array = vat_json_object_add (&node, "ip4_fib_counters");
+ vat_json_init_array (msg_array);
+ for (i = 0; i < vec_len (vam->ip4_fib_counters); i++)
+ {
+ msg = vat_json_array_add (msg_array);
+ vat_json_init_object (msg);
+ vat_json_object_add_uint (msg, "vrf_id",
+ vam->ip4_fib_counters_vrf_id_by_index[i]);
+ counter_array = vat_json_object_add (msg, "c");
+ vat_json_init_array (counter_array);
+ for (j = 0; j < vec_len (vam->ip4_fib_counters[i]); j++)
+ {
+ counter = vat_json_array_add (counter_array);
+ vat_json_init_object (counter);
+ c4 = &vam->ip4_fib_counters[i][j];
+ vat_json_object_add_ip4 (counter, "address", c4->address);
+ vat_json_object_add_uint (counter, "address_length",
+ c4->address_length);
+ vat_json_object_add_uint (counter, "packets", c4->packets);
+ vat_json_object_add_uint (counter, "bytes", c4->bytes);
+ }
}
- if (vam->exec_mode == 1 &&
- (unformat (i, "exit") || unformat (i, "quit"))) {
- vam->exec_mode = 0;
- return 0;
+
+ /* ip6 fib counters */
+ msg_array = vat_json_object_add (&node, "ip6_fib_counters");
+ vat_json_init_array (msg_array);
+ for (i = 0; i < vec_len (vam->ip6_fib_counters); i++)
+ {
+ msg = vat_json_array_add (msg_array);
+ vat_json_init_object (msg);
+ vat_json_object_add_uint (msg, "vrf_id",
+ vam->ip6_fib_counters_vrf_id_by_index[i]);
+ counter_array = vat_json_object_add (msg, "c");
+ vat_json_init_array (counter_array);
+ for (j = 0; j < vec_len (vam->ip6_fib_counters[i]); j++)
+ {
+ counter = vat_json_array_add (counter_array);
+ vat_json_init_object (counter);
+ c6 = &vam->ip6_fib_counters[i][j];
+ vat_json_object_add_ip6 (counter, "address", c6->address);
+ vat_json_object_add_uint (counter, "address_length",
+ c6->address_length);
+ vat_json_object_add_uint (counter, "packets", c6->packets);
+ vat_json_object_add_uint (counter, "bytes", c6->bytes);
+ }
}
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
- M(CLI_REQUEST, cli_request);
+ return 0;
+}
- /*
- * Copy cmd into shared memory.
- * In order for the CLI command to work, it
- * must be a vector ending in \n, not a C-string ending
- * in \n\0.
- */
- pthread_mutex_lock (&am->vlib_rp->mutex);
- oldheap = svm_push_data_heap (am->vlib_rp);
+int
+exec (vat_main_t * vam)
+{
+ api_main_t *am = &api_main;
+ vl_api_cli_request_t *mp;
+ f64 timeout;
+ void *oldheap;
+ u8 *cmd = 0;
+ unformat_input_t *i = vam->input;
- vec_validate (cmd, vec_len(vam->input->buffer)-1);
- clib_memcpy (cmd, vam->input->buffer, vec_len(vam->input->buffer));
+ if (vec_len (i->buffer) == 0)
+ return -1;
- svm_pop_heap (oldheap);
- pthread_mutex_unlock (&am->vlib_rp->mutex);
+ if (vam->exec_mode == 0 && unformat (i, "mode"))
+ {
+ vam->exec_mode = 1;
+ return 0;
+ }
+ if (vam->exec_mode == 1 && (unformat (i, "exit") || unformat (i, "quit")))
+ {
+ vam->exec_mode = 0;
+ return 0;
+ }
- mp->cmd_in_shmem = (u64) cmd;
- S;
- timeout = vat_time_now (vam) + 10.0;
- while (vat_time_now (vam) < timeout) {
- if (vam->result_ready == 1) {
- u8 * free_me;
- if (vam->shmem_result != NULL)
- fformat (vam->ofp, "%s", vam->shmem_result);
- pthread_mutex_lock (&am->vlib_rp->mutex);
- oldheap = svm_push_data_heap (am->vlib_rp);
+ M (CLI_REQUEST, cli_request);
- free_me = (u8 *)vam->shmem_result;
- vec_free (free_me);
+ /*
+ * Copy cmd into shared memory.
+ * In order for the CLI command to work, it
+ * must be a vector ending in \n, not a C-string ending
+ * in \n\0.
+ */
+ pthread_mutex_lock (&am->vlib_rp->mutex);
+ oldheap = svm_push_data_heap (am->vlib_rp);
+
+ vec_validate (cmd, vec_len (vam->input->buffer) - 1);
+ clib_memcpy (cmd, vam->input->buffer, vec_len (vam->input->buffer));
- svm_pop_heap (oldheap);
- pthread_mutex_unlock (&am->vlib_rp->mutex);
- return 0;
- }
+ svm_pop_heap (oldheap);
+ pthread_mutex_unlock (&am->vlib_rp->mutex);
+
+ mp->cmd_in_shmem = (u64) cmd;
+ S;
+ timeout = vat_time_now (vam) + 10.0;
+
+ while (vat_time_now (vam) < timeout)
+ {
+ if (vam->result_ready == 1)
+ {
+ u8 *free_me;
+ if (vam->shmem_result != NULL)
+ fformat (vam->ofp, "%s", vam->shmem_result);
+ pthread_mutex_lock (&am->vlib_rp->mutex);
+ oldheap = svm_push_data_heap (am->vlib_rp);
+
+ free_me = (u8 *) vam->shmem_result;
+ vec_free (free_me);
+
+ svm_pop_heap (oldheap);
+ pthread_mutex_unlock (&am->vlib_rp->mutex);
+ return 0;
+ }
}
- return -99;
+ return -99;
}
-static int api_create_loopback (vat_main_t * vam)
+static int
+api_create_loopback (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_create_loopback_t *mp;
- f64 timeout;
- u8 mac_address[6];
- u8 mac_set = 0;
+ unformat_input_t *i = vam->input;
+ vl_api_create_loopback_t *mp;
+ f64 timeout;
+ u8 mac_address[6];
+ u8 mac_set = 0;
- memset (mac_address, 0, sizeof (mac_address));
+ memset (mac_address, 0, sizeof (mac_address));
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "mac %U", unformat_ethernet_address, mac_address))
- mac_set = 1;
- else
- break;
- }
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "mac %U", unformat_ethernet_address, mac_address))
+ mac_set = 1;
+ else
+ break;
+ }
- /* Construct the API message */
- M(CREATE_LOOPBACK, create_loopback);
- if (mac_set)
- clib_memcpy (mp->mac_address, mac_address, sizeof (mac_address));
+ /* Construct the API message */
+ M (CREATE_LOOPBACK, create_loopback);
+ if (mac_set)
+ clib_memcpy (mp->mac_address, mac_address, sizeof (mac_address));
- S; W;
+ S;
+ W;
}
-static int api_delete_loopback (vat_main_t * vam)
+static int
+api_delete_loopback (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_delete_loopback_t *mp;
- f64 timeout;
- u32 sw_if_index = ~0;
+ unformat_input_t *i = vam->input;
+ vl_api_delete_loopback_t *mp;
+ f64 timeout;
+ u32 sw_if_index = ~0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "sw_if_index %d", &sw_if_index))
- ;
- else
- break;
- }
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "sw_if_index %d", &sw_if_index))
+ ;
+ else
+ break;
+ }
- if (sw_if_index == ~0)
- {
- errmsg ("missing sw_if_index\n");
- return -99;
- }
+ if (sw_if_index == ~0)
+ {
+ errmsg ("missing sw_if_index\n");
+ return -99;
+ }
- /* Construct the API message */
- M(DELETE_LOOPBACK, delete_loopback);
- mp->sw_if_index = ntohl (sw_if_index);
+ /* Construct the API message */
+ M (DELETE_LOOPBACK, delete_loopback);
+ mp->sw_if_index = ntohl (sw_if_index);
- S; W;
+ S;
+ W;
}
-static int api_want_stats (vat_main_t * vam)
+static int
+api_want_stats (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_want_stats_t * mp;
- f64 timeout;
- int enable = -1;
+ unformat_input_t *i = vam->input;
+ vl_api_want_stats_t *mp;
+ f64 timeout;
+ int enable = -1;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "enable"))
- enable = 1;
- else if (unformat (i, "disable"))
- enable = 0;
- else
- break;
- }
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "enable"))
+ enable = 1;
+ else if (unformat (i, "disable"))
+ enable = 0;
+ else
+ break;
+ }
- if (enable == -1)
- {
- errmsg ("missing enable|disable\n");
- return -99;
- }
+ if (enable == -1)
+ {
+ errmsg ("missing enable|disable\n");
+ return -99;
+ }
- M(WANT_STATS, want_stats);
- mp->enable_disable = enable;
+ M (WANT_STATS, want_stats);
+ mp->enable_disable = enable;
- S; W;
+ S;
+ W;
}
-static int api_want_interface_events (vat_main_t * vam)
+static int
+api_want_interface_events (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_want_interface_events_t * mp;
- f64 timeout;
- int enable = -1;
+ unformat_input_t *i = vam->input;
+ vl_api_want_interface_events_t *mp;
+ f64 timeout;
+ int enable = -1;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "enable"))
- enable = 1;
- else if (unformat (i, "disable"))
- enable = 0;
- else
- break;
- }
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "enable"))
+ enable = 1;
+ else if (unformat (i, "disable"))
+ enable = 0;
+ else
+ break;
+ }
- if (enable == -1)
- {
- errmsg ("missing enable|disable\n");
- return -99;
- }
+ if (enable == -1)
+ {
+ errmsg ("missing enable|disable\n");
+ return -99;
+ }
- M(WANT_INTERFACE_EVENTS, want_interface_events);
- mp->enable_disable = enable;
+ M (WANT_INTERFACE_EVENTS, want_interface_events);
+ mp->enable_disable = enable;
- vam->interface_event_display = enable;
+ vam->interface_event_display = enable;
- S; W;
+ S;
+ W;
}
/* Note: non-static, called once to set up the initial intfc table */
-int api_sw_interface_dump (vat_main_t * vam)
+int
+api_sw_interface_dump (vat_main_t * vam)
{
- vl_api_sw_interface_dump_t *mp;
- f64 timeout;
- hash_pair_t * p;
- name_sort_t * nses = 0, * ns;
- sw_interface_subif_t * sub = NULL;
+ vl_api_sw_interface_dump_t *mp;
+ f64 timeout;
+ hash_pair_t *p;
+ name_sort_t *nses = 0, *ns;
+ sw_interface_subif_t *sub = NULL;
- /* Toss the old name table */
- hash_foreach_pair (p, vam->sw_if_index_by_interface_name,
- ({
- vec_add2 (nses, ns, 1);
- ns->name = (u8 *)(p->key);
- ns->value = (u32) p->value[0];
- }));
+ /* Toss the old name table */
+ /* *INDENT-OFF* */
+ hash_foreach_pair (p, vam->sw_if_index_by_interface_name,
+ ({
+ vec_add2 (nses, ns, 1);
+ ns->name = (u8 *)(p->key);
+ ns->value = (u32) p->value[0];
+ }));
+ /* *INDENT-ON* */
- hash_free (vam->sw_if_index_by_interface_name);
+ hash_free (vam->sw_if_index_by_interface_name);
- vec_foreach (ns, nses)
- vec_free (ns->name);
+ vec_foreach (ns, nses) vec_free (ns->name);
- vec_free (nses);
+ vec_free (nses);
- vec_foreach (sub, vam->sw_if_subif_table) {
- vec_free (sub->interface_name);
- }
- vec_free (vam->sw_if_subif_table);
+ vec_foreach (sub, vam->sw_if_subif_table)
+ {
+ vec_free (sub->interface_name);
+ }
+ vec_free (vam->sw_if_subif_table);
- /* recreate the interface name hash table */
- vam->sw_if_index_by_interface_name
- = hash_create_string (0, sizeof(uword));
+ /* recreate the interface name hash table */
+ vam->sw_if_index_by_interface_name = hash_create_string (0, sizeof (uword));
- /* Get list of ethernets */
- M(SW_INTERFACE_DUMP, sw_interface_dump);
- mp->name_filter_valid = 1;
- strncpy ((char *) mp->name_filter, "Ether", sizeof(mp->name_filter)-1);
- S;
+ /* Get list of ethernets */
+ M (SW_INTERFACE_DUMP, sw_interface_dump);
+ mp->name_filter_valid = 1;
+ strncpy ((char *) mp->name_filter, "Ether", sizeof (mp->name_filter) - 1);
+ S;
- /* and local / loopback interfaces */
- M(SW_INTERFACE_DUMP, sw_interface_dump);
- mp->name_filter_valid = 1;
- strncpy ((char *) mp->name_filter, "lo", sizeof(mp->name_filter)-1);
- S;
+ /* and local / loopback interfaces */
+ M (SW_INTERFACE_DUMP, sw_interface_dump);
+ mp->name_filter_valid = 1;
+ strncpy ((char *) mp->name_filter, "lo", sizeof (mp->name_filter) - 1);
+ S;
- /* and vxlan-gpe tunnel interfaces */
- M(SW_INTERFACE_DUMP, sw_interface_dump);
- mp->name_filter_valid = 1;
- strncpy ((char *) mp->name_filter, "vxlan_gpe", sizeof(mp->name_filter)-1);
- S;
+ /* and vxlan-gpe tunnel interfaces */
+ M (SW_INTERFACE_DUMP, sw_interface_dump);
+ mp->name_filter_valid = 1;
+ strncpy ((char *) mp->name_filter, "vxlan_gpe",
+ sizeof (mp->name_filter) - 1);
+ S;
- /* and vxlan tunnel interfaces */
- M(SW_INTERFACE_DUMP, sw_interface_dump);
- mp->name_filter_valid = 1;
- strncpy ((char *) mp->name_filter, "vxlan", sizeof(mp->name_filter)-1);
- S;
+ /* and vxlan tunnel interfaces */
+ M (SW_INTERFACE_DUMP, sw_interface_dump);
+ mp->name_filter_valid = 1;
+ strncpy ((char *) mp->name_filter, "vxlan", sizeof (mp->name_filter) - 1);
+ S;
- /* and host (af_packet) interfaces */
- M(SW_INTERFACE_DUMP, sw_interface_dump);
- mp->name_filter_valid = 1;
- strncpy ((char *) mp->name_filter, "host", sizeof(mp->name_filter)-1);
- S;
+ /* and host (af_packet) interfaces */
+ M (SW_INTERFACE_DUMP, sw_interface_dump);
+ mp->name_filter_valid = 1;
+ strncpy ((char *) mp->name_filter, "host", sizeof (mp->name_filter) - 1);
+ S;
- /* and l2tpv3 tunnel interfaces */
- M(SW_INTERFACE_DUMP, sw_interface_dump);
- mp->name_filter_valid = 1;
- strncpy ((char *) mp->name_filter, "l2tpv3_tunnel", sizeof(mp->name_filter)-1);
- S;
+ /* and l2tpv3 tunnel interfaces */
+ M (SW_INTERFACE_DUMP, sw_interface_dump);
+ mp->name_filter_valid = 1;
+ strncpy ((char *) mp->name_filter, "l2tpv3_tunnel",
+ sizeof (mp->name_filter) - 1);
+ S;
+
+ /* and GRE tunnel interfaces */
+ M (SW_INTERFACE_DUMP, sw_interface_dump);
+ mp->name_filter_valid = 1;
+ strncpy ((char *) mp->name_filter, "gre", sizeof (mp->name_filter) - 1);
+ S;
- /* and GRE tunnel interfaces */
- M(SW_INTERFACE_DUMP, sw_interface_dump);
- mp->name_filter_valid = 1;
- strncpy ((char *) mp->name_filter, "gre", sizeof(mp->name_filter)-1);
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
S;
+ }
+ W;
+}
- /* Use a control ping for synchronization */
- {
- vl_api_control_ping_t * mp;
- M(CONTROL_PING, control_ping);
- S;
- }
- W;
-}
-
-static int api_sw_interface_set_flags (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_sw_interface_set_flags_t *mp;
- f64 timeout;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
- u8 admin_up = 0, link_up = 0;
-
- /* Parse args required to build the message */
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "admin-up"))
- admin_up = 1;
- else if (unformat (i, "admin-down"))
- admin_up = 0;
- else if (unformat (i, "link-up"))
- link_up = 1;
- else if (unformat (i, "link-down"))
- link_up = 0;
- else if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else
- break;
+static int
+api_sw_interface_set_flags (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_sw_interface_set_flags_t *mp;
+ f64 timeout;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
+ u8 admin_up = 0, link_up = 0;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "admin-up"))
+ admin_up = 1;
+ else if (unformat (i, "admin-down"))
+ admin_up = 0;
+ else if (unformat (i, "link-up"))
+ link_up = 1;
+ else if (unformat (i, "link-down"))
+ link_up = 0;
+ else if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else
+ break;
}
- if (sw_if_index_set == 0) {
- errmsg ("missing interface name or sw_if_index\n");
- return -99;
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
}
- /* Construct the API message */
- M(SW_INTERFACE_SET_FLAGS, sw_interface_set_flags);
- mp->sw_if_index = ntohl (sw_if_index);
- mp->admin_up_down = admin_up;
- mp->link_up_down = link_up;
+ /* Construct the API message */
+ M (SW_INTERFACE_SET_FLAGS, sw_interface_set_flags);
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->admin_up_down = admin_up;
+ mp->link_up_down = link_up;
- /* send it... */
- S;
+ /* send it... */
+ S;
- /* Wait for a reply, return the good/bad news... */
- W;
+ /* Wait for a reply, return the good/bad news... */
+ W;
}
-static int api_sw_interface_clear_stats (vat_main_t * vam)
+static int
+api_sw_interface_clear_stats (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_sw_interface_clear_stats_t *mp;
- f64 timeout;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
+ unformat_input_t *i = vam->input;
+ vl_api_sw_interface_clear_stats_t *mp;
+ f64 timeout;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
- /* Parse args required to build the message */
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else
- break;
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else
+ break;
}
- /* Construct the API message */
- M(SW_INTERFACE_CLEAR_STATS, sw_interface_clear_stats);
+ /* Construct the API message */
+ M (SW_INTERFACE_CLEAR_STATS, sw_interface_clear_stats);
- if (sw_if_index_set == 1)
- mp->sw_if_index = ntohl (sw_if_index);
- else
- mp->sw_if_index = ~0;
+ if (sw_if_index_set == 1)
+ mp->sw_if_index = ntohl (sw_if_index);
+ else
+ mp->sw_if_index = ~0;
- /* send it... */
- S;
+ /* send it... */
+ S;
- /* Wait for a reply, return the good/bad news... */
- W;
-}
-
-static int api_sw_interface_add_del_address (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_sw_interface_add_del_address_t *mp;
- f64 timeout;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
- u8 is_add = 1, del_all = 0;
- u32 address_length = 0;
- u8 v4_address_set = 0;
- u8 v6_address_set = 0;
- ip4_address_t v4address;
- ip6_address_t v6address;
-
- /* Parse args required to build the message */
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "del-all"))
- del_all = 1;
- else if (unformat (i, "del"))
- is_add = 0;
- else if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "%U/%d",
- unformat_ip4_address, &v4address,
- &address_length))
- v4_address_set = 1;
- else if (unformat (i, "%U/%d",
- unformat_ip6_address, &v6address,
- &address_length))
- v6_address_set = 1;
- else
- break;
+ /* Wait for a reply, return the good/bad news... */
+ W;
+}
+
+static int
+api_sw_interface_add_del_address (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_sw_interface_add_del_address_t *mp;
+ f64 timeout;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
+ u8 is_add = 1, del_all = 0;
+ u32 address_length = 0;
+ u8 v4_address_set = 0;
+ u8 v6_address_set = 0;
+ ip4_address_t v4address;
+ ip6_address_t v6address;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "del-all"))
+ del_all = 1;
+ else if (unformat (i, "del"))
+ is_add = 0;
+ else if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "%U/%d",
+ unformat_ip4_address, &v4address, &address_length))
+ v4_address_set = 1;
+ else if (unformat (i, "%U/%d",
+ unformat_ip6_address, &v6address, &address_length))
+ v6_address_set = 1;
+ else
+ break;
}
- if (sw_if_index_set == 0) {
- errmsg ("missing interface name or sw_if_index\n");
- return -99;
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
}
- if (v4_address_set && v6_address_set) {
- errmsg ("both v4 and v6 addresses set\n");
- return -99;
+ if (v4_address_set && v6_address_set)
+ {
+ errmsg ("both v4 and v6 addresses set\n");
+ return -99;
}
- if (!v4_address_set && !v6_address_set && !del_all) {
- errmsg ("no addresses set\n");
- return -99;
+ if (!v4_address_set && !v6_address_set && !del_all)
+ {
+ errmsg ("no addresses set\n");
+ return -99;
}
- /* Construct the API message */
- M(SW_INTERFACE_ADD_DEL_ADDRESS, sw_interface_add_del_address);
+ /* Construct the API message */
+ M (SW_INTERFACE_ADD_DEL_ADDRESS, sw_interface_add_del_address);
- mp->sw_if_index = ntohl (sw_if_index);
- mp->is_add = is_add;
- mp->del_all = del_all;
- if (v6_address_set) {
- mp->is_ipv6 = 1;
- clib_memcpy (mp->address, &v6address, sizeof (v6address));
- } else {
- clib_memcpy (mp->address, &v4address, sizeof (v4address));
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->is_add = is_add;
+ mp->del_all = del_all;
+ if (v6_address_set)
+ {
+ mp->is_ipv6 = 1;
+ clib_memcpy (mp->address, &v6address, sizeof (v6address));
}
- mp->address_length = address_length;
+ else
+ {
+ clib_memcpy (mp->address, &v4address, sizeof (v4address));
+ }
+ mp->address_length = address_length;
- /* send it... */
- S;
+ /* send it... */
+ S;
- /* Wait for a reply, return good/bad news */
- W;
-}
-
-static int api_sw_interface_set_table (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_sw_interface_set_table_t *mp;
- f64 timeout;
- u32 sw_if_index, vrf_id = 0;
- u8 sw_if_index_set = 0;
- u8 is_ipv6 = 0;
-
- /* Parse args required to build the message */
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "vrf %d", &vrf_id))
- ;
- else if (unformat (i, "ipv6"))
- is_ipv6 = 1;
- else
- break;
+ /* Wait for a reply, return good/bad news */
+ W;
+}
+
+static int
+api_sw_interface_set_table (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_sw_interface_set_table_t *mp;
+ f64 timeout;
+ u32 sw_if_index, vrf_id = 0;
+ u8 sw_if_index_set = 0;
+ u8 is_ipv6 = 0;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "vrf %d", &vrf_id))
+ ;
+ else if (unformat (i, "ipv6"))
+ is_ipv6 = 1;
+ else
+ break;
}
- if (sw_if_index_set == 0) {
- errmsg ("missing interface name or sw_if_index\n");
- return -99;
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
}
- /* Construct the API message */
- M(SW_INTERFACE_SET_TABLE, sw_interface_set_table);
+ /* Construct the API message */
+ M (SW_INTERFACE_SET_TABLE, sw_interface_set_table);
- mp->sw_if_index = ntohl (sw_if_index);
- mp->is_ipv6 = is_ipv6;
- mp->vrf_id = ntohl (vrf_id);
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->is_ipv6 = is_ipv6;
+ mp->vrf_id = ntohl (vrf_id);
- /* send it... */
- S;
+ /* send it... */
+ S;
- /* Wait for a reply... */
- W;
-}
-
-static int api_sw_interface_set_vpath (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_sw_interface_set_vpath_t *mp;
- f64 timeout;
- u32 sw_if_index = 0;
- u8 sw_if_index_set = 0;
- u8 is_enable = 0;
-
- /* Parse args required to build the message */
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "enable"))
- is_enable = 1;
- else if (unformat (i, "disable"))
- is_enable = 0;
- else
- break;
+ /* Wait for a reply... */
+ W;
+}
+
+static int
+api_sw_interface_set_vpath (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_sw_interface_set_vpath_t *mp;
+ f64 timeout;
+ u32 sw_if_index = 0;
+ u8 sw_if_index_set = 0;
+ u8 is_enable = 0;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "enable"))
+ is_enable = 1;
+ else if (unformat (i, "disable"))
+ is_enable = 0;
+ else
+ break;
}
- if (sw_if_index_set == 0) {
- errmsg ("missing interface name or sw_if_index\n");
- return -99;
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
}
- /* Construct the API message */
- M(SW_INTERFACE_SET_VPATH, sw_interface_set_vpath);
+ /* Construct the API message */
+ M (SW_INTERFACE_SET_VPATH, sw_interface_set_vpath);
+
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->enable = is_enable;
- mp->sw_if_index = ntohl (sw_if_index);
- mp->enable = is_enable;
+ /* send it... */
+ S;
- /* send it... */
- S;
+ /* Wait for a reply... */
+ W;
+}
- /* Wait for a reply... */
- W;
-}
-
-static int api_sw_interface_set_l2_xconnect (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_sw_interface_set_l2_xconnect_t *mp;
- f64 timeout;
- u32 rx_sw_if_index;
- u8 rx_sw_if_index_set = 0;
- u32 tx_sw_if_index;
- u8 tx_sw_if_index_set = 0;
- u8 enable = 1;
-
- /* Parse args required to build the message */
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "rx_sw_if_index %d", &rx_sw_if_index))
- rx_sw_if_index_set = 1;
- else if (unformat (i, "tx_sw_if_index %d", &tx_sw_if_index))
- tx_sw_if_index_set = 1;
- else if (unformat (i, "rx")) {
- if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", unformat_sw_if_index, vam,
- &rx_sw_if_index))
- rx_sw_if_index_set = 1;
- } else
- break;
- } else if (unformat (i, "tx")) {
- if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", unformat_sw_if_index, vam,
- &tx_sw_if_index))
- tx_sw_if_index_set = 1;
- } else
- break;
- } else if (unformat (i, "enable"))
- enable = 1;
- else if (unformat (i, "disable"))
- enable = 0;
- else
- break;
+static int
+api_sw_interface_set_l2_xconnect (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_sw_interface_set_l2_xconnect_t *mp;
+ f64 timeout;
+ u32 rx_sw_if_index;
+ u8 rx_sw_if_index_set = 0;
+ u32 tx_sw_if_index;
+ u8 tx_sw_if_index_set = 0;
+ u8 enable = 1;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "rx_sw_if_index %d", &rx_sw_if_index))
+ rx_sw_if_index_set = 1;
+ else if (unformat (i, "tx_sw_if_index %d", &tx_sw_if_index))
+ tx_sw_if_index_set = 1;
+ else if (unformat (i, "rx"))
+ {
+ if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", unformat_sw_if_index, vam,
+ &rx_sw_if_index))
+ rx_sw_if_index_set = 1;
+ }
+ else
+ break;
+ }
+ else if (unformat (i, "tx"))
+ {
+ if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", unformat_sw_if_index, vam,
+ &tx_sw_if_index))
+ tx_sw_if_index_set = 1;
+ }
+ else
+ break;
+ }
+ else if (unformat (i, "enable"))
+ enable = 1;
+ else if (unformat (i, "disable"))
+ enable = 0;
+ else
+ break;
}
- if (rx_sw_if_index_set == 0) {
- errmsg ("missing rx interface name or rx_sw_if_index\n");
- return -99;
+ if (rx_sw_if_index_set == 0)
+ {
+ errmsg ("missing rx interface name or rx_sw_if_index\n");
+ return -99;
}
- if (enable && (tx_sw_if_index_set == 0)) {
- errmsg ("missing tx interface name or tx_sw_if_index\n");
- return -99;
+ if (enable && (tx_sw_if_index_set == 0))
+ {
+ errmsg ("missing tx interface name or tx_sw_if_index\n");
+ return -99;
}
- M(SW_INTERFACE_SET_L2_XCONNECT, sw_interface_set_l2_xconnect);
+ M (SW_INTERFACE_SET_L2_XCONNECT, sw_interface_set_l2_xconnect);
- mp->rx_sw_if_index = ntohl(rx_sw_if_index);
- mp->tx_sw_if_index = ntohl(tx_sw_if_index);
- mp->enable = enable;
+ mp->rx_sw_if_index = ntohl (rx_sw_if_index);
+ mp->tx_sw_if_index = ntohl (tx_sw_if_index);
+ mp->enable = enable;
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_sw_interface_set_l2_bridge (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_sw_interface_set_l2_bridge_t *mp;
- f64 timeout;
- u32 rx_sw_if_index;
- u8 rx_sw_if_index_set = 0;
- u32 bd_id;
- u8 bd_id_set = 0;
- u8 bvi = 0;
- u32 shg = 0;
- u8 enable = 1;
-
- /* Parse args required to build the message */
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "sw_if_index %d", &rx_sw_if_index))
- rx_sw_if_index_set = 1;
- else if (unformat (i, "bd_id %d", &bd_id))
- bd_id_set = 1;
- else if (unformat (i, "%U", unformat_sw_if_index, vam,
- &rx_sw_if_index))
- rx_sw_if_index_set = 1;
- else if (unformat (i, "shg %d", &shg))
- ;
- else if (unformat (i, "bvi"))
- bvi = 1;
- else if (unformat (i, "enable"))
- enable = 1;
- else if (unformat (i, "disable"))
- enable = 0;
- else
- break;
+static int
+api_sw_interface_set_l2_bridge (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_sw_interface_set_l2_bridge_t *mp;
+ f64 timeout;
+ u32 rx_sw_if_index;
+ u8 rx_sw_if_index_set = 0;
+ u32 bd_id;
+ u8 bd_id_set = 0;
+ u8 bvi = 0;
+ u32 shg = 0;
+ u8 enable = 1;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "sw_if_index %d", &rx_sw_if_index))
+ rx_sw_if_index_set = 1;
+ else if (unformat (i, "bd_id %d", &bd_id))
+ bd_id_set = 1;
+ else if (unformat (i, "%U", unformat_sw_if_index, vam, &rx_sw_if_index))
+ rx_sw_if_index_set = 1;
+ else if (unformat (i, "shg %d", &shg))
+ ;
+ else if (unformat (i, "bvi"))
+ bvi = 1;
+ else if (unformat (i, "enable"))
+ enable = 1;
+ else if (unformat (i, "disable"))
+ enable = 0;
+ else
+ break;
}
- if (rx_sw_if_index_set == 0) {
- errmsg ("missing rx interface name or sw_if_index\n");
- return -99;
+ if (rx_sw_if_index_set == 0)
+ {
+ errmsg ("missing rx interface name or sw_if_index\n");
+ return -99;
}
- if (enable && (bd_id_set == 0)) {
- errmsg ("missing bridge domain\n");
- return -99;
+ if (enable && (bd_id_set == 0))
+ {
+ errmsg ("missing bridge domain\n");
+ return -99;
}
- M(SW_INTERFACE_SET_L2_BRIDGE, sw_interface_set_l2_bridge);
+ M (SW_INTERFACE_SET_L2_BRIDGE, sw_interface_set_l2_bridge);
- mp->rx_sw_if_index = ntohl(rx_sw_if_index);
- mp->bd_id = ntohl(bd_id);
- mp->shg = (u8)shg;
- mp->bvi = bvi;
- mp->enable = enable;
+ mp->rx_sw_if_index = ntohl (rx_sw_if_index);
+ mp->bd_id = ntohl (bd_id);
+ mp->shg = (u8) shg;
+ mp->bvi = bvi;
+ mp->enable = enable;
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_bridge_domain_dump (vat_main_t * vam)
+static int
+api_bridge_domain_dump (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_bridge_domain_dump_t *mp;
- f64 timeout;
- u32 bd_id = ~0;
+ unformat_input_t *i = vam->input;
+ vl_api_bridge_domain_dump_t *mp;
+ f64 timeout;
+ u32 bd_id = ~0;
- /* Parse args required to build the message */
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "bd_id %d", &bd_id))
- ;
- else
- break;
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "bd_id %d", &bd_id))
+ ;
+ else
+ break;
}
- M(BRIDGE_DOMAIN_DUMP, bridge_domain_dump);
- mp->bd_id = ntohl(bd_id);
- S;
+ M (BRIDGE_DOMAIN_DUMP, bridge_domain_dump);
+ mp->bd_id = ntohl (bd_id);
+ S;
- /* Use a control ping for synchronization */
- {
- vl_api_control_ping_t * mp;
- M(CONTROL_PING, control_ping);
- S;
- }
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
+ S;
+ }
- W;
- /* NOTREACHED */
- return 0;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_bridge_domain_add_del (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_bridge_domain_add_del_t *mp;
- f64 timeout;
- u32 bd_id = ~0;
- u8 is_add = 1;
- u32 flood = 1, forward = 1, learn = 1, uu_flood = 1, arp_term = 0;
-
- /* Parse args required to build the message */
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "bd_id %d", &bd_id))
- ;
- else if (unformat (i, "flood %d", &flood))
- ;
- else if (unformat (i, "uu-flood %d", &uu_flood))
- ;
- else if (unformat (i, "forward %d", &forward))
- ;
- else if (unformat (i, "learn %d", &learn))
- ;
- else if (unformat (i, "arp-term %d", &arp_term))
- ;
- else if (unformat (i, "del")) {
- is_add = 0;
- flood = uu_flood = forward = learn = 0;
- }
- else
- break;
+static int
+api_bridge_domain_add_del (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_bridge_domain_add_del_t *mp;
+ f64 timeout;
+ u32 bd_id = ~0;
+ u8 is_add = 1;
+ u32 flood = 1, forward = 1, learn = 1, uu_flood = 1, arp_term = 0;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "bd_id %d", &bd_id))
+ ;
+ else if (unformat (i, "flood %d", &flood))
+ ;
+ else if (unformat (i, "uu-flood %d", &uu_flood))
+ ;
+ else if (unformat (i, "forward %d", &forward))
+ ;
+ else if (unformat (i, "learn %d", &learn))
+ ;
+ else if (unformat (i, "arp-term %d", &arp_term))
+ ;
+ else if (unformat (i, "del"))
+ {
+ is_add = 0;
+ flood = uu_flood = forward = learn = 0;
+ }
+ else
+ break;
}
- if (bd_id == ~0) {
- errmsg ("missing bridge domain\n");
- return -99;
+ if (bd_id == ~0)
+ {
+ errmsg ("missing bridge domain\n");
+ return -99;
}
- M(BRIDGE_DOMAIN_ADD_DEL, bridge_domain_add_del);
+ M (BRIDGE_DOMAIN_ADD_DEL, bridge_domain_add_del);
- mp->bd_id = ntohl(bd_id);
- mp->flood = flood;
- mp->uu_flood = uu_flood;
- mp->forward = forward;
- mp->learn = learn;
- mp->arp_term = arp_term;
- mp->is_add = is_add;
+ mp->bd_id = ntohl (bd_id);
+ mp->flood = flood;
+ mp->uu_flood = uu_flood;
+ mp->forward = forward;
+ mp->learn = learn;
+ mp->arp_term = arp_term;
+ mp->is_add = is_add;
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_l2fib_add_del (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_l2fib_add_del_t *mp;
- f64 timeout;
- u64 mac = 0;
- u8 mac_set = 0;
- u32 bd_id;
- u8 bd_id_set = 0;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
- u8 is_add = 1;
- u8 static_mac = 0;
- u8 filter_mac = 0;
- u8 bvi_mac = 0;
- int count = 1;
- f64 before = 0;
- int j;
-
- /* Parse args required to build the message */
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "mac %U", unformat_ethernet_address, &mac))
- mac_set = 1;
- else if (unformat (i, "bd_id %d", &bd_id))
- bd_id_set = 1;
- else if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "sw_if")) {
- if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- } else
- break;
- } else if (unformat (i, "static"))
- static_mac = 1;
- else if (unformat (i, "filter")) {
- filter_mac = 1;
- static_mac = 1;
- } else if (unformat (i, "bvi")) {
- bvi_mac = 1;
- static_mac = 1;
- } else if (unformat (i, "del"))
- is_add = 0;
- else if (unformat (i, "count %d", &count))
- ;
- else
+static int
+api_l2fib_add_del (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_l2fib_add_del_t *mp;
+ f64 timeout;
+ u64 mac = 0;
+ u8 mac_set = 0;
+ u32 bd_id;
+ u8 bd_id_set = 0;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
+ u8 is_add = 1;
+ u8 static_mac = 0;
+ u8 filter_mac = 0;
+ u8 bvi_mac = 0;
+ int count = 1;
+ f64 before = 0;
+ int j;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "mac %U", unformat_ethernet_address, &mac))
+ mac_set = 1;
+ else if (unformat (i, "bd_id %d", &bd_id))
+ bd_id_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if"))
+ {
+ if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ }
+ else
break;
+ }
+ else if (unformat (i, "static"))
+ static_mac = 1;
+ else if (unformat (i, "filter"))
+ {
+ filter_mac = 1;
+ static_mac = 1;
+ }
+ else if (unformat (i, "bvi"))
+ {
+ bvi_mac = 1;
+ static_mac = 1;
+ }
+ else if (unformat (i, "del"))
+ is_add = 0;
+ else if (unformat (i, "count %d", &count))
+ ;
+ else
+ break;
}
- if (mac_set == 0) {
- errmsg ("missing mac address\n");
- return -99;
+ if (mac_set == 0)
+ {
+ errmsg ("missing mac address\n");
+ return -99;
}
- if (bd_id_set == 0) {
- errmsg ("missing bridge domain\n");
- return -99;
+ if (bd_id_set == 0)
+ {
+ errmsg ("missing bridge domain\n");
+ return -99;
}
- if (is_add && (sw_if_index_set == 0)) {
- errmsg ("missing interface name or sw_if_index\n");
- return -99;
+ if (is_add && (sw_if_index_set == 0))
+ {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
}
- if (count > 1) {
- /* Turn on async mode */
- vam->async_mode = 1;
- vam->async_errors = 0;
- before = vat_time_now(vam);
+ if (count > 1)
+ {
+ /* Turn on async mode */
+ vam->async_mode = 1;
+ vam->async_errors = 0;
+ before = vat_time_now (vam);
}
- for (j = 0; j < count; j++) {
- M(L2FIB_ADD_DEL, l2fib_add_del);
+ for (j = 0; j < count; j++)
+ {
+ M (L2FIB_ADD_DEL, l2fib_add_del);
- mp->mac = mac;
- mp->bd_id = ntohl(bd_id);
- mp->is_add = is_add;
+ mp->mac = mac;
+ mp->bd_id = ntohl (bd_id);
+ mp->is_add = is_add;
- if (is_add) {
- mp->sw_if_index = ntohl(sw_if_index);
- mp->static_mac = static_mac;
- mp->filter_mac = filter_mac;
- mp->bvi_mac = bvi_mac;
+ if (is_add)
+ {
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->static_mac = static_mac;
+ mp->filter_mac = filter_mac;
+ mp->bvi_mac = bvi_mac;
}
- increment_mac_address (&mac);
- /* send it... */
- S;
+ increment_mac_address (&mac);
+ /* send it... */
+ S;
}
- if (count > 1) {
- vl_api_control_ping_t * mp;
- f64 after;
+ if (count > 1)
+ {
+ vl_api_control_ping_t *mp;
+ f64 after;
- /* Shut off async mode */
- vam->async_mode = 0;
+ /* Shut off async mode */
+ vam->async_mode = 0;
- M(CONTROL_PING, control_ping);
- S;
+ M (CONTROL_PING, control_ping);
+ S;
- timeout = vat_time_now(vam) + 1.0;
- while (vat_time_now (vam) < timeout)
- if (vam->result_ready == 1)
- goto out;
- vam->retval = -99;
+ timeout = vat_time_now (vam) + 1.0;
+ while (vat_time_now (vam) < timeout)
+ if (vam->result_ready == 1)
+ goto out;
+ vam->retval = -99;
out:
- if (vam->retval == -99)
- errmsg ("timeout\n");
-
- if (vam->async_errors > 0) {
- errmsg ("%d asynchronous errors\n", vam->async_errors);
- vam->retval = -98;
- }
- vam->async_errors = 0;
- after = vat_time_now(vam);
-
- fformat(vam->ofp, "%d routes in %.6f secs, %.2f routes/sec\n",
- count, after - before, count / (after - before));
- } else {
- /* Wait for a reply... */
- W;
- }
- /* Return the good/bad news */
- return (vam->retval);
-}
-
-static int api_l2_flags (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_l2_flags_t *mp;
- f64 timeout;
- u32 sw_if_index;
- u32 feature_bitmap = 0;
- u8 sw_if_index_set = 0;
-
- /* Parse args required to build the message */
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "sw_if")) {
- if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- } else
- break;
- } else if (unformat (i, "learn"))
- feature_bitmap |= L2INPUT_FEAT_LEARN;
- else if (unformat (i, "forward"))
- feature_bitmap |= L2INPUT_FEAT_FWD;
- else if (unformat (i, "flood"))
- feature_bitmap |= L2INPUT_FEAT_FLOOD;
- else if (unformat (i, "uu-flood"))
- feature_bitmap |= L2INPUT_FEAT_UU_FLOOD;
- else
- break;
+ if (vam->retval == -99)
+ errmsg ("timeout\n");
+
+ if (vam->async_errors > 0)
+ {
+ errmsg ("%d asynchronous errors\n", vam->async_errors);
+ vam->retval = -98;
+ }
+ vam->async_errors = 0;
+ after = vat_time_now (vam);
+
+ fformat (vam->ofp, "%d routes in %.6f secs, %.2f routes/sec\n",
+ count, after - before, count / (after - before));
+ }
+ else
+ {
+ /* Wait for a reply... */
+ W;
}
+ /* Return the good/bad news */
+ return (vam->retval);
+}
- if (sw_if_index_set == 0) {
- errmsg ("missing interface name or sw_if_index\n");
- return -99;
+static int
+api_l2_flags (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_l2_flags_t *mp;
+ f64 timeout;
+ u32 sw_if_index;
+ u32 feature_bitmap = 0;
+ u8 sw_if_index_set = 0;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if"))
+ {
+ if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ }
+ else
+ break;
+ }
+ else if (unformat (i, "learn"))
+ feature_bitmap |= L2INPUT_FEAT_LEARN;
+ else if (unformat (i, "forward"))
+ feature_bitmap |= L2INPUT_FEAT_FWD;
+ else if (unformat (i, "flood"))
+ feature_bitmap |= L2INPUT_FEAT_FLOOD;
+ else if (unformat (i, "uu-flood"))
+ feature_bitmap |= L2INPUT_FEAT_UU_FLOOD;
+ else
+ break;
}
- M(L2_FLAGS, l2_flags);
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
+ }
- mp->sw_if_index = ntohl(sw_if_index);
- mp->feature_bitmap = ntohl(feature_bitmap);
+ M (L2_FLAGS, l2_flags);
- S; W;
- /* NOTREACHED */
- return 0;
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->feature_bitmap = ntohl (feature_bitmap);
+
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_bridge_flags (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_bridge_flags_t *mp;
- f64 timeout;
- u32 bd_id;
- u8 bd_id_set = 0;
- u8 is_set = 1;
- u32 flags = 0;
-
- /* Parse args required to build the message */
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "bd_id %d", &bd_id))
- bd_id_set = 1;
- else if (unformat (i, "learn"))
- flags |= L2_LEARN;
- else if (unformat (i, "forward"))
- flags |= L2_FWD;
- else if (unformat (i, "flood"))
- flags |= L2_FLOOD;
- else if (unformat (i, "uu-flood"))
- flags |= L2_UU_FLOOD;
- else if (unformat (i, "arp-term"))
- flags |= L2_ARP_TERM;
- else if (unformat (i, "off"))
- is_set = 0;
- else if (unformat (i, "disable"))
- is_set = 0;
- else
- break;
+static int
+api_bridge_flags (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_bridge_flags_t *mp;
+ f64 timeout;
+ u32 bd_id;
+ u8 bd_id_set = 0;
+ u8 is_set = 1;
+ u32 flags = 0;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "bd_id %d", &bd_id))
+ bd_id_set = 1;
+ else if (unformat (i, "learn"))
+ flags |= L2_LEARN;
+ else if (unformat (i, "forward"))
+ flags |= L2_FWD;
+ else if (unformat (i, "flood"))
+ flags |= L2_FLOOD;
+ else if (unformat (i, "uu-flood"))
+ flags |= L2_UU_FLOOD;
+ else if (unformat (i, "arp-term"))
+ flags |= L2_ARP_TERM;
+ else if (unformat (i, "off"))
+ is_set = 0;
+ else if (unformat (i, "disable"))
+ is_set = 0;
+ else
+ break;
}
- if (bd_id_set == 0) {
- errmsg ("missing bridge domain\n");
- return -99;
+ if (bd_id_set == 0)
+ {
+ errmsg ("missing bridge domain\n");
+ return -99;
}
- M(BRIDGE_FLAGS, bridge_flags);
+ M (BRIDGE_FLAGS, bridge_flags);
- mp->bd_id = ntohl(bd_id);
- mp->feature_bitmap = ntohl(flags);
- mp->is_set = is_set;
+ mp->bd_id = ntohl (bd_id);
+ mp->feature_bitmap = ntohl (flags);
+ mp->is_set = is_set;
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_bd_ip_mac_add_del (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_bd_ip_mac_add_del_t *mp;
- f64 timeout;
- u32 bd_id;
- u8 is_ipv6 = 0;
- u8 is_add = 1;
- u8 bd_id_set = 0;
- u8 ip_set = 0;
- u8 mac_set = 0;
- ip4_address_t v4addr;
- ip6_address_t v6addr;
- u8 macaddr[6];
-
-
- /* Parse args required to build the message */
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "bd_id %d", &bd_id)) {
- bd_id_set++;
- } else if (unformat (i, "%U", unformat_ip4_address, &v4addr)) {
- ip_set++;
- } else if (unformat (i, "%U", unformat_ip6_address, &v6addr)) {
- ip_set++;
- is_ipv6++;
- } else if (unformat (i, "%U", unformat_ethernet_address, macaddr)) {
- mac_set++;
- } else if (unformat (i, "del"))
- is_add = 0;
- else
- break;
- }
-
- if (bd_id_set == 0) {
- errmsg ("missing bridge domain\n");
- return -99;
- } else if (ip_set == 0) {
- errmsg ("missing IP address\n");
- return -99;
- } else if (mac_set == 0) {
- errmsg ("missing MAC address\n");
- return -99;
- }
-
- M(BD_IP_MAC_ADD_DEL, bd_ip_mac_add_del);
-
- mp->bd_id = ntohl(bd_id);
- mp->is_ipv6 = is_ipv6;
- mp->is_add = is_add;
- if (is_ipv6)
- clib_memcpy (mp->ip_address, &v6addr, sizeof (v6addr));
- else clib_memcpy (mp->ip_address, &v4addr, sizeof (v4addr));
- clib_memcpy (mp->mac_address, macaddr, 6);
- S; W;
- /* NOTREACHED */
- return 0;
+static int
+api_bd_ip_mac_add_del (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_bd_ip_mac_add_del_t *mp;
+ f64 timeout;
+ u32 bd_id;
+ u8 is_ipv6 = 0;
+ u8 is_add = 1;
+ u8 bd_id_set = 0;
+ u8 ip_set = 0;
+ u8 mac_set = 0;
+ ip4_address_t v4addr;
+ ip6_address_t v6addr;
+ u8 macaddr[6];
+
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "bd_id %d", &bd_id))
+ {
+ bd_id_set++;
+ }
+ else if (unformat (i, "%U", unformat_ip4_address, &v4addr))
+ {
+ ip_set++;
+ }
+ else if (unformat (i, "%U", unformat_ip6_address, &v6addr))
+ {
+ ip_set++;
+ is_ipv6++;
+ }
+ else if (unformat (i, "%U", unformat_ethernet_address, macaddr))
+ {
+ mac_set++;
+ }
+ else if (unformat (i, "del"))
+ is_add = 0;
+ else
+ break;
+ }
+
+ if (bd_id_set == 0)
+ {
+ errmsg ("missing bridge domain\n");
+ return -99;
+ }
+ else if (ip_set == 0)
+ {
+ errmsg ("missing IP address\n");
+ return -99;
+ }
+ else if (mac_set == 0)
+ {
+ errmsg ("missing MAC address\n");
+ return -99;
+ }
+
+ M (BD_IP_MAC_ADD_DEL, bd_ip_mac_add_del);
+
+ mp->bd_id = ntohl (bd_id);
+ mp->is_ipv6 = is_ipv6;
+ mp->is_add = is_add;
+ if (is_ipv6)
+ clib_memcpy (mp->ip_address, &v6addr, sizeof (v6addr));
+ else
+ clib_memcpy (mp->ip_address, &v4addr, sizeof (v4addr));
+ clib_memcpy (mp->mac_address, macaddr, 6);
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_tap_connect (vat_main_t * vam)
+static int
+api_tap_connect (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_tap_connect_t *mp;
- f64 timeout;
- u8 mac_address[6];
- u8 random_mac = 1;
- u8 name_set = 0;
- u8 * tap_name;
+ unformat_input_t *i = vam->input;
+ vl_api_tap_connect_t *mp;
+ f64 timeout;
+ u8 mac_address[6];
+ u8 random_mac = 1;
+ u8 name_set = 0;
+ u8 *tap_name;
- memset (mac_address, 0, sizeof (mac_address));
+ memset (mac_address, 0, sizeof (mac_address));
- /* Parse args required to build the message */
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "mac %U", unformat_ethernet_address, mac_address)) {
- random_mac = 0;
- }
- else if (unformat (i, "random-mac"))
- random_mac = 1;
- else if (unformat (i, "tapname %s", &tap_name))
- name_set = 1;
- else
- break;
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "mac %U", unformat_ethernet_address, mac_address))
+ {
+ random_mac = 0;
+ }
+ else if (unformat (i, "random-mac"))
+ random_mac = 1;
+ else if (unformat (i, "tapname %s", &tap_name))
+ name_set = 1;
+ else
+ break;
}
- if (name_set == 0) {
- errmsg ("missing tap name\n");
- return -99;
+ if (name_set == 0)
+ {
+ errmsg ("missing tap name\n");
+ return -99;
}
- if (vec_len (tap_name) > 63) {
- errmsg ("tap name too long\n");
+ if (vec_len (tap_name) > 63)
+ {
+ errmsg ("tap name too long\n");
}
- vec_add1 (tap_name, 0);
+ vec_add1 (tap_name, 0);
- /* Construct the API message */
- M(TAP_CONNECT, tap_connect);
+ /* Construct the API message */
+ M (TAP_CONNECT, tap_connect);
- mp->use_random_mac = random_mac;
- clib_memcpy (mp->mac_address, mac_address, 6);
- clib_memcpy (mp->tap_name, tap_name, vec_len (tap_name));
- vec_free (tap_name);
+ mp->use_random_mac = random_mac;
+ clib_memcpy (mp->mac_address, mac_address, 6);
+ clib_memcpy (mp->tap_name, tap_name, vec_len (tap_name));
+ vec_free (tap_name);
- /* send it... */
- S;
+ /* send it... */
+ S;
- /* Wait for a reply... */
- W;
-}
-
-static int api_tap_modify (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_tap_modify_t *mp;
- f64 timeout;
- u8 mac_address[6];
- u8 random_mac = 1;
- u8 name_set = 0;
- u8 * tap_name;
- u32 sw_if_index = ~0;
- u8 sw_if_index_set = 0;
-
- memset (mac_address, 0, sizeof (mac_address));
-
- /* Parse args required to build the message */
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "mac %U", unformat_ethernet_address, mac_address)) {
- random_mac = 0;
- }
- else if (unformat (i, "random-mac"))
- random_mac = 1;
- else if (unformat (i, "tapname %s", &tap_name))
- name_set = 1;
- else
- break;
+ /* Wait for a reply... */
+ W;
+}
+
+static int
+api_tap_modify (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_tap_modify_t *mp;
+ f64 timeout;
+ u8 mac_address[6];
+ u8 random_mac = 1;
+ u8 name_set = 0;
+ u8 *tap_name;
+ u32 sw_if_index = ~0;
+ u8 sw_if_index_set = 0;
+
+ memset (mac_address, 0, sizeof (mac_address));
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "mac %U", unformat_ethernet_address, mac_address))
+ {
+ random_mac = 0;
+ }
+ else if (unformat (i, "random-mac"))
+ random_mac = 1;
+ else if (unformat (i, "tapname %s", &tap_name))
+ name_set = 1;
+ else
+ break;
}
- if (sw_if_index_set == 0) {
- errmsg ("missing vpp interface name");
- return -99;
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing vpp interface name");
+ return -99;
}
- if (name_set == 0) {
- errmsg ("missing tap name\n");
- return -99;
+ if (name_set == 0)
+ {
+ errmsg ("missing tap name\n");
+ return -99;
}
- if (vec_len (tap_name) > 63) {
- errmsg ("tap name too long\n");
+ if (vec_len (tap_name) > 63)
+ {
+ errmsg ("tap name too long\n");
}
- vec_add1 (tap_name, 0);
+ vec_add1 (tap_name, 0);
- /* Construct the API message */
- M(TAP_MODIFY, tap_modify);
+ /* Construct the API message */
+ M (TAP_MODIFY, tap_modify);
- mp->use_random_mac = random_mac;
- mp->sw_if_index = ntohl(sw_if_index);
- clib_memcpy (mp->mac_address, mac_address, 6);
- clib_memcpy (mp->tap_name, tap_name, vec_len (tap_name));
- vec_free (tap_name);
+ mp->use_random_mac = random_mac;
+ mp->sw_if_index = ntohl (sw_if_index);
+ clib_memcpy (mp->mac_address, mac_address, 6);
+ clib_memcpy (mp->tap_name, tap_name, vec_len (tap_name));
+ vec_free (tap_name);
- /* send it... */
- S;
+ /* send it... */
+ S;
- /* Wait for a reply... */
- W;
+ /* Wait for a reply... */
+ W;
}
-static int api_tap_delete (vat_main_t * vam)
+static int
+api_tap_delete (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_tap_delete_t *mp;
- f64 timeout;
- u32 sw_if_index = ~0;
- u8 sw_if_index_set = 0;
+ unformat_input_t *i = vam->input;
+ vl_api_tap_delete_t *mp;
+ f64 timeout;
+ u32 sw_if_index = ~0;
+ u8 sw_if_index_set = 0;
- /* Parse args required to build the message */
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else
- break;
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else
+ break;
}
- if (sw_if_index_set == 0) {
- errmsg ("missing vpp interface name");
- return -99;
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing vpp interface name");
+ return -99;
}
- /* Construct the API message */
- M(TAP_DELETE, tap_delete);
+ /* Construct the API message */
+ M (TAP_DELETE, tap_delete);
- mp->sw_if_index = ntohl(sw_if_index);
+ mp->sw_if_index = ntohl (sw_if_index);
- /* send it... */
- S;
+ /* send it... */
+ S;
- /* Wait for a reply... */
- W;
-}
-
-static int api_ip_add_del_route (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_ip_add_del_route_t *mp;
- f64 timeout;
- u32 sw_if_index = ~0, vrf_id = 0;
- u8 sw_if_index_set = 0;
- u8 is_ipv6 = 0;
- u8 is_local = 0, is_drop = 0;
- u8 create_vrf_if_needed = 0;
- u8 is_add = 1;
- u8 next_hop_weight = 1;
- u8 not_last = 0;
- u8 is_multipath = 0;
- u8 address_set = 0;
- u8 address_length_set = 0;
- u32 lookup_in_vrf = 0;
- u32 resolve_attempts = 0;
- u32 dst_address_length = 0;
- u8 next_hop_set = 0;
- ip4_address_t v4_dst_address, v4_next_hop_address;
- ip6_address_t v6_dst_address, v6_next_hop_address;
- int count = 1;
- int j;
- f64 before = 0;
- u32 random_add_del = 0;
- u32 * random_vector = 0;
- uword * random_hash;
- u32 random_seed = 0xdeaddabe;
- u32 classify_table_index = ~0;
- u8 is_classify = 0;
-
- /* Parse args required to build the message */
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "%U", unformat_ip4_address,
- &v4_dst_address)) {
- address_set = 1;
- is_ipv6 = 0;
- }
- else if (unformat (i, "%U", unformat_ip6_address, &v6_dst_address)) {
- address_set = 1;
- is_ipv6 = 1;
- }
- else if (unformat (i, "/%d", &dst_address_length)) {
- address_length_set = 1;
- }
-
- else if (is_ipv6 == 0 && unformat (i, "via %U", unformat_ip4_address,
- &v4_next_hop_address)) {
- next_hop_set = 1;
- }
- else if (is_ipv6 == 1 && unformat (i, "via %U", unformat_ip6_address,
- &v6_next_hop_address)) {
- next_hop_set = 1;
- }
- else if (unformat (i, "resolve-attempts %d", &resolve_attempts))
- ;
- else if (unformat (i, "weight %d", &next_hop_weight))
- ;
- else if (unformat (i, "drop")) {
- is_drop = 1;
- } else if (unformat (i, "local")) {
- is_local = 1;
- } else if (unformat (i, "classify %d", &classify_table_index)) {
- is_classify = 1;
- } else if (unformat (i, "del"))
- is_add = 0;
- else if (unformat (i, "add"))
- is_add = 1;
- else if (unformat (i, "not-last"))
- not_last = 1;
- else if (unformat (i, "multipath"))
- is_multipath = 1;
- else if (unformat (i, "vrf %d", &vrf_id))
- ;
- else if (unformat (i, "create-vrf"))
- create_vrf_if_needed = 1;
- else if (unformat (i, "count %d", &count))
- ;
- else if (unformat (i, "lookup-in-vrf %d", &lookup_in_vrf))
- ;
- else if (unformat (i, "random"))
- random_add_del = 1;
- else if (unformat (i, "seed %d", &random_seed))
- ;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
- }
-
- if (resolve_attempts > 0 && sw_if_index_set == 0) {
- errmsg ("ARP resolution needs explicit interface or sw_if_index\n");
- return -99;
- }
-
- if (!next_hop_set && !is_drop && !is_local && !is_classify) {
- errmsg ("next hop / local / drop / classify not set\n");
- return -99;
- }
-
- if (address_set == 0) {
- errmsg ("missing addresses\n");
- return -99;
- }
-
- if (address_length_set == 0) {
- errmsg ("missing address length\n");
- return -99;
- }
-
- /* Generate a pile of unique, random routes */
- if (random_add_del) {
- u32 this_random_address;
- random_hash = hash_create (count, sizeof(uword));
-
- hash_set (random_hash, v4_next_hop_address.as_u32, 1);
- for (j = 0; j <= count; j++) {
- do {
- this_random_address = random_u32 (&random_seed);
- this_random_address =
- clib_host_to_net_u32 (this_random_address);
- } while (hash_get (random_hash, this_random_address));
- vec_add1 (random_vector, this_random_address);
- hash_set (random_hash, this_random_address, 1);
- }
- hash_free (random_hash);
- v4_dst_address.as_u32 = random_vector[0];
- }
-
- if (count > 1) {
- /* Turn on async mode */
- vam->async_mode = 1;
- vam->async_errors = 0;
- before = vat_time_now(vam);
- }
-
- for (j = 0; j < count; j++) {
- /* Construct the API message */
- M(IP_ADD_DEL_ROUTE, ip_add_del_route);
-
- mp->next_hop_sw_if_index = ntohl (sw_if_index);
- mp->vrf_id = ntohl (vrf_id);
- if (resolve_attempts > 0) {
- mp->resolve_attempts = ntohl (resolve_attempts);
- mp->resolve_if_needed = 1;
- }
- mp->create_vrf_if_needed = create_vrf_if_needed;
-
- mp->is_add = is_add;
- mp->is_drop = is_drop;
- mp->is_ipv6 = is_ipv6;
- mp->is_local = is_local;
- mp->is_classify = is_classify;
- mp->is_multipath = is_multipath;
- mp->not_last = not_last;
- mp->next_hop_weight = next_hop_weight;
- mp->dst_address_length = dst_address_length;
- mp->lookup_in_vrf = ntohl(lookup_in_vrf);
- mp->classify_table_index = ntohl(classify_table_index);
-
- if (is_ipv6){
- clib_memcpy (mp->dst_address, &v6_dst_address, sizeof (v6_dst_address));
- if (next_hop_set)
- clib_memcpy (mp->next_hop_address, &v6_next_hop_address,
- sizeof (v6_next_hop_address));
- increment_v6_address (&v6_dst_address);
- } else {
- clib_memcpy (mp->dst_address, &v4_dst_address, sizeof (v4_dst_address));
- if (next_hop_set)
- clib_memcpy (mp->next_hop_address, &v4_next_hop_address,
- sizeof (v4_next_hop_address));
- if (random_add_del)
- v4_dst_address.as_u32 = random_vector[j+1];
- else
- increment_v4_address (&v4_dst_address);
- }
- /* send it... */
- S;
- }
-
- /* When testing multiple add/del ops, use a control-ping to sync */
- if (count > 1) {
- vl_api_control_ping_t * mp;
- f64 after;
-
- /* Shut off async mode */
- vam->async_mode = 0;
-
- M(CONTROL_PING, control_ping);
- S;
-
- timeout = vat_time_now(vam) + 1.0;
- while (vat_time_now (vam) < timeout)
- if (vam->result_ready == 1)
- goto out;
- vam->retval = -99;
+ /* Wait for a reply... */
+ W;
+}
+
+static int
+api_ip_add_del_route (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_ip_add_del_route_t *mp;
+ f64 timeout;
+ u32 sw_if_index = ~0, vrf_id = 0;
+ u8 sw_if_index_set = 0;
+ u8 is_ipv6 = 0;
+ u8 is_local = 0, is_drop = 0;
+ u8 create_vrf_if_needed = 0;
+ u8 is_add = 1;
+ u8 next_hop_weight = 1;
+ u8 not_last = 0;
+ u8 is_multipath = 0;
+ u8 address_set = 0;
+ u8 address_length_set = 0;
+ u32 lookup_in_vrf = 0;
+ u32 resolve_attempts = 0;
+ u32 dst_address_length = 0;
+ u8 next_hop_set = 0;
+ ip4_address_t v4_dst_address, v4_next_hop_address;
+ ip6_address_t v6_dst_address, v6_next_hop_address;
+ int count = 1;
+ int j;
+ f64 before = 0;
+ u32 random_add_del = 0;
+ u32 *random_vector = 0;
+ uword *random_hash;
+ u32 random_seed = 0xdeaddabe;
+ u32 classify_table_index = ~0;
+ u8 is_classify = 0;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "%U", unformat_ip4_address, &v4_dst_address))
+ {
+ address_set = 1;
+ is_ipv6 = 0;
+ }
+ else if (unformat (i, "%U", unformat_ip6_address, &v6_dst_address))
+ {
+ address_set = 1;
+ is_ipv6 = 1;
+ }
+ else if (unformat (i, "/%d", &dst_address_length))
+ {
+ address_length_set = 1;
+ }
+
+ else if (is_ipv6 == 0 && unformat (i, "via %U", unformat_ip4_address,
+ &v4_next_hop_address))
+ {
+ next_hop_set = 1;
+ }
+ else if (is_ipv6 == 1 && unformat (i, "via %U", unformat_ip6_address,
+ &v6_next_hop_address))
+ {
+ next_hop_set = 1;
+ }
+ else if (unformat (i, "resolve-attempts %d", &resolve_attempts))
+ ;
+ else if (unformat (i, "weight %d", &next_hop_weight))
+ ;
+ else if (unformat (i, "drop"))
+ {
+ is_drop = 1;
+ }
+ else if (unformat (i, "local"))
+ {
+ is_local = 1;
+ }
+ else if (unformat (i, "classify %d", &classify_table_index))
+ {
+ is_classify = 1;
+ }
+ else if (unformat (i, "del"))
+ is_add = 0;
+ else if (unformat (i, "add"))
+ is_add = 1;
+ else if (unformat (i, "not-last"))
+ not_last = 1;
+ else if (unformat (i, "multipath"))
+ is_multipath = 1;
+ else if (unformat (i, "vrf %d", &vrf_id))
+ ;
+ else if (unformat (i, "create-vrf"))
+ create_vrf_if_needed = 1;
+ else if (unformat (i, "count %d", &count))
+ ;
+ else if (unformat (i, "lookup-in-vrf %d", &lookup_in_vrf))
+ ;
+ else if (unformat (i, "random"))
+ random_add_del = 1;
+ else if (unformat (i, "seed %d", &random_seed))
+ ;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
+ }
+
+ if (resolve_attempts > 0 && sw_if_index_set == 0)
+ {
+ errmsg ("ARP resolution needs explicit interface or sw_if_index\n");
+ return -99;
+ }
+
+ if (!next_hop_set && !is_drop && !is_local && !is_classify)
+ {
+ errmsg ("next hop / local / drop / classify not set\n");
+ return -99;
+ }
+
+ if (address_set == 0)
+ {
+ errmsg ("missing addresses\n");
+ return -99;
+ }
+
+ if (address_length_set == 0)
+ {
+ errmsg ("missing address length\n");
+ return -99;
+ }
+
+ /* Generate a pile of unique, random routes */
+ if (random_add_del)
+ {
+ u32 this_random_address;
+ random_hash = hash_create (count, sizeof (uword));
+
+ hash_set (random_hash, v4_next_hop_address.as_u32, 1);
+ for (j = 0; j <= count; j++)
+ {
+ do
+ {
+ this_random_address = random_u32 (&random_seed);
+ this_random_address =
+ clib_host_to_net_u32 (this_random_address);
+ }
+ while (hash_get (random_hash, this_random_address));
+ vec_add1 (random_vector, this_random_address);
+ hash_set (random_hash, this_random_address, 1);
+ }
+ hash_free (random_hash);
+ v4_dst_address.as_u32 = random_vector[0];
+ }
+
+ if (count > 1)
+ {
+ /* Turn on async mode */
+ vam->async_mode = 1;
+ vam->async_errors = 0;
+ before = vat_time_now (vam);
+ }
+
+ for (j = 0; j < count; j++)
+ {
+ /* Construct the API message */
+ M (IP_ADD_DEL_ROUTE, ip_add_del_route);
+
+ mp->next_hop_sw_if_index = ntohl (sw_if_index);
+ mp->vrf_id = ntohl (vrf_id);
+ if (resolve_attempts > 0)
+ {
+ mp->resolve_attempts = ntohl (resolve_attempts);
+ mp->resolve_if_needed = 1;
+ }
+ mp->create_vrf_if_needed = create_vrf_if_needed;
+
+ mp->is_add = is_add;
+ mp->is_drop = is_drop;
+ mp->is_ipv6 = is_ipv6;
+ mp->is_local = is_local;
+ mp->is_classify = is_classify;
+ mp->is_multipath = is_multipath;
+ mp->not_last = not_last;
+ mp->next_hop_weight = next_hop_weight;
+ mp->dst_address_length = dst_address_length;
+ mp->lookup_in_vrf = ntohl (lookup_in_vrf);
+ mp->classify_table_index = ntohl (classify_table_index);
+
+ if (is_ipv6)
+ {
+ clib_memcpy (mp->dst_address, &v6_dst_address,
+ sizeof (v6_dst_address));
+ if (next_hop_set)
+ clib_memcpy (mp->next_hop_address, &v6_next_hop_address,
+ sizeof (v6_next_hop_address));
+ increment_v6_address (&v6_dst_address);
+ }
+ else
+ {
+ clib_memcpy (mp->dst_address, &v4_dst_address,
+ sizeof (v4_dst_address));
+ if (next_hop_set)
+ clib_memcpy (mp->next_hop_address, &v4_next_hop_address,
+ sizeof (v4_next_hop_address));
+ if (random_add_del)
+ v4_dst_address.as_u32 = random_vector[j + 1];
+ else
+ increment_v4_address (&v4_dst_address);
+ }
+ /* send it... */
+ S;
+ }
+
+ /* When testing multiple add/del ops, use a control-ping to sync */
+ if (count > 1)
+ {
+ vl_api_control_ping_t *mp;
+ f64 after;
+
+ /* Shut off async mode */
+ vam->async_mode = 0;
+
+ M (CONTROL_PING, control_ping);
+ S;
+
+ timeout = vat_time_now (vam) + 1.0;
+ while (vat_time_now (vam) < timeout)
+ if (vam->result_ready == 1)
+ goto out;
+ vam->retval = -99;
out:
- if (vam->retval == -99)
- errmsg ("timeout\n");
+ if (vam->retval == -99)
+ errmsg ("timeout\n");
- if (vam->async_errors > 0) {
- errmsg ("%d asynchronous errors\n", vam->async_errors);
- vam->retval = -98;
- }
- vam->async_errors = 0;
- after = vat_time_now(vam);
+ if (vam->async_errors > 0)
+ {
+ errmsg ("%d asynchronous errors\n", vam->async_errors);
+ vam->retval = -98;
+ }
+ vam->async_errors = 0;
+ after = vat_time_now (vam);
- fformat(vam->ofp, "%d routes in %.6f secs, %.2f routes/sec\n",
- count, after - before, count / (after - before));
- } else {
- /* Wait for a reply... */
- W;
+ fformat (vam->ofp, "%d routes in %.6f secs, %.2f routes/sec\n",
+ count, after - before, count / (after - before));
+ }
+ else
+ {
+ /* Wait for a reply... */
+ W;
}
- /* Return the good/bad news */
- return (vam->retval);
+ /* Return the good/bad news */
+ return (vam->retval);
}
-static int api_proxy_arp_add_del (vat_main_t * vam)
+static int
+api_proxy_arp_add_del (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_proxy_arp_add_del_t *mp;
- f64 timeout;
- u32 vrf_id = 0;
- u8 is_add = 1;
- ip4_address_t lo, hi;
- u8 range_set = 0;
+ unformat_input_t *i = vam->input;
+ vl_api_proxy_arp_add_del_t *mp;
+ f64 timeout;
+ u32 vrf_id = 0;
+ u8 is_add = 1;
+ ip4_address_t lo, hi;
+ u8 range_set = 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "vrf %d", &vrf_id))
- ;
- else if (unformat (i, "%U - %U", unformat_ip4_address, &lo,
- unformat_ip4_address, &hi))
- range_set = 1;
- else if (unformat (i, "del"))
- is_add = 0;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "vrf %d", &vrf_id))
+ ;
+ else if (unformat (i, "%U - %U", unformat_ip4_address, &lo,
+ unformat_ip4_address, &hi))
+ range_set = 1;
+ else if (unformat (i, "del"))
+ is_add = 0;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (range_set == 0) {
- errmsg ("address range not set\n");
- return -99;
+ if (range_set == 0)
+ {
+ errmsg ("address range not set\n");
+ return -99;
}
- M(PROXY_ARP_ADD_DEL, proxy_arp_add_del);
+ M (PROXY_ARP_ADD_DEL, proxy_arp_add_del);
- mp->vrf_id = ntohl(vrf_id);
- mp->is_add = is_add;
- clib_memcpy(mp->low_address, &lo, sizeof (mp->low_address));
- clib_memcpy(mp->hi_address, &hi, sizeof (mp->hi_address));
+ mp->vrf_id = ntohl (vrf_id);
+ mp->is_add = is_add;
+ clib_memcpy (mp->low_address, &lo, sizeof (mp->low_address));
+ clib_memcpy (mp->hi_address, &hi, sizeof (mp->hi_address));
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_proxy_arp_intfc_enable_disable (vat_main_t * vam)
+static int
+api_proxy_arp_intfc_enable_disable (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_proxy_arp_intfc_enable_disable_t *mp;
- f64 timeout;
- u32 sw_if_index;
- u8 enable = 1;
- u8 sw_if_index_set = 0;
+ unformat_input_t *i = vam->input;
+ vl_api_proxy_arp_intfc_enable_disable_t *mp;
+ f64 timeout;
+ u32 sw_if_index;
+ u8 enable = 1;
+ u8 sw_if_index_set = 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "enable"))
- enable = 1;
- else if (unformat (i, "disable"))
- enable = 0;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "enable"))
+ enable = 1;
+ else if (unformat (i, "disable"))
+ enable = 0;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (sw_if_index_set == 0) {
- errmsg ("missing interface name or sw_if_index\n");
- return -99;
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
}
- M(PROXY_ARP_INTFC_ENABLE_DISABLE, proxy_arp_intfc_enable_disable);
+ M (PROXY_ARP_INTFC_ENABLE_DISABLE, proxy_arp_intfc_enable_disable);
- mp->sw_if_index = ntohl(sw_if_index);
- mp->enable_disable = enable;
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->enable_disable = enable;
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_mpls_add_del_decap (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_mpls_add_del_decap_t *mp;
- f64 timeout;
- u32 rx_vrf_id = 0;
- u32 tx_vrf_id = 0;
- u32 label = 0;
- u8 is_add = 1;
- u8 s_bit = 1;
- u32 next_index = 1;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "rx_vrf_id %d", &rx_vrf_id))
- ;
- else if (unformat (i, "tx_vrf_id %d", &tx_vrf_id))
- ;
- else if (unformat (i, "label %d", &label))
- ;
- else if (unformat (i, "next-index %d", &next_index))
- ;
- else if (unformat (i, "del"))
- is_add = 0;
- else if (unformat (i, "s-bit-clear"))
- s_bit = 0;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
- }
-
- M(MPLS_ADD_DEL_DECAP, mpls_add_del_decap);
-
- mp->rx_vrf_id = ntohl(rx_vrf_id);
- mp->tx_vrf_id = ntohl(tx_vrf_id);
- mp->label = ntohl(label);
- mp->next_index = ntohl(next_index);
- mp->s_bit = s_bit;
- mp->is_add = is_add;
-
- S; W;
- /* NOTREACHED */
- return 0;
+static int
+api_mpls_add_del_decap (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_mpls_add_del_decap_t *mp;
+ f64 timeout;
+ u32 rx_vrf_id = 0;
+ u32 tx_vrf_id = 0;
+ u32 label = 0;
+ u8 is_add = 1;
+ u8 s_bit = 1;
+ u32 next_index = 1;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "rx_vrf_id %d", &rx_vrf_id))
+ ;
+ else if (unformat (i, "tx_vrf_id %d", &tx_vrf_id))
+ ;
+ else if (unformat (i, "label %d", &label))
+ ;
+ else if (unformat (i, "next-index %d", &next_index))
+ ;
+ else if (unformat (i, "del"))
+ is_add = 0;
+ else if (unformat (i, "s-bit-clear"))
+ s_bit = 0;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
+ }
+
+ M (MPLS_ADD_DEL_DECAP, mpls_add_del_decap);
+
+ mp->rx_vrf_id = ntohl (rx_vrf_id);
+ mp->tx_vrf_id = ntohl (tx_vrf_id);
+ mp->label = ntohl (label);
+ mp->next_index = ntohl (next_index);
+ mp->s_bit = s_bit;
+ mp->is_add = is_add;
+
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_mpls_add_del_encap (vat_main_t * vam)
+static int
+api_mpls_add_del_encap (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_mpls_add_del_encap_t *mp;
- f64 timeout;
- u32 vrf_id = 0;
- u32 *labels = 0;
- u32 label;
- ip4_address_t dst_address;
- u8 is_add = 1;
+ unformat_input_t *i = vam->input;
+ vl_api_mpls_add_del_encap_t *mp;
+ f64 timeout;
+ u32 vrf_id = 0;
+ u32 *labels = 0;
+ u32 label;
+ ip4_address_t dst_address;
+ u8 is_add = 1;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "vrf %d", &vrf_id))
- ;
- else if (unformat (i, "label %d", &label))
- vec_add1 (labels, ntohl(label));
- else if (unformat (i, "dst %U", unformat_ip4_address, &dst_address))
- ;
- else if (unformat (i, "del"))
- is_add = 0;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "vrf %d", &vrf_id))
+ ;
+ else if (unformat (i, "label %d", &label))
+ vec_add1 (labels, ntohl (label));
+ else if (unformat (i, "dst %U", unformat_ip4_address, &dst_address))
+ ;
+ else if (unformat (i, "del"))
+ is_add = 0;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (vec_len (labels) == 0) {
- errmsg ("missing encap label stack\n");
- return -99;
+ if (vec_len (labels) == 0)
+ {
+ errmsg ("missing encap label stack\n");
+ return -99;
}
- M2(MPLS_ADD_DEL_ENCAP, mpls_add_del_encap,
- sizeof (u32) * vec_len (labels));
+ M2 (MPLS_ADD_DEL_ENCAP, mpls_add_del_encap,
+ sizeof (u32) * vec_len (labels));
- mp->vrf_id = ntohl(vrf_id);
- clib_memcpy(mp->dst_address, &dst_address, sizeof (dst_address));
- mp->is_add = is_add;
- mp->nlabels = vec_len (labels);
- clib_memcpy(mp->labels, labels, sizeof(u32)*mp->nlabels);
+ mp->vrf_id = ntohl (vrf_id);
+ clib_memcpy (mp->dst_address, &dst_address, sizeof (dst_address));
+ mp->is_add = is_add;
+ mp->nlabels = vec_len (labels);
+ clib_memcpy (mp->labels, labels, sizeof (u32) * mp->nlabels);
- vec_free(labels);
+ vec_free (labels);
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_mpls_gre_add_del_tunnel (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_mpls_gre_add_del_tunnel_t *mp;
- f64 timeout;
- u32 inner_vrf_id = 0;
- u32 outer_vrf_id = 0;
- ip4_address_t src_address;
- ip4_address_t dst_address;
- ip4_address_t intfc_address;
- u32 tmp;
- u8 intfc_address_length = 0;
- u8 is_add = 1;
- u8 l2_only = 0;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "inner_vrf_id %d", &inner_vrf_id))
- ;
- else if (unformat (i, "outer_vrf_id %d", &outer_vrf_id))
- ;
- else if (unformat (i, "src %U", unformat_ip4_address, &src_address))
- ;
- else if (unformat (i, "dst %U", unformat_ip4_address, &dst_address))
- ;
- else if (unformat (i, "adj %U/%d", unformat_ip4_address,
- &intfc_address, &tmp))
- intfc_address_length = tmp;
- else if (unformat (i, "l2-only"))
- l2_only = 1;
- else if (unformat (i, "del"))
- is_add = 0;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
- }
-
- M(MPLS_GRE_ADD_DEL_TUNNEL, mpls_gre_add_del_tunnel);
-
- mp->inner_vrf_id = ntohl(inner_vrf_id);
- mp->outer_vrf_id = ntohl(outer_vrf_id);
- clib_memcpy(mp->src_address, &src_address, sizeof (src_address));
- clib_memcpy(mp->dst_address, &dst_address, sizeof (dst_address));
- clib_memcpy(mp->intfc_address, &intfc_address, sizeof (intfc_address));
- mp->intfc_address_length = intfc_address_length;
- mp->l2_only = l2_only;
- mp->is_add = is_add;
-
- S; W;
- /* NOTREACHED */
- return 0;
+static int
+api_mpls_gre_add_del_tunnel (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_mpls_gre_add_del_tunnel_t *mp;
+ f64 timeout;
+ u32 inner_vrf_id = 0;
+ u32 outer_vrf_id = 0;
+ ip4_address_t src_address;
+ ip4_address_t dst_address;
+ ip4_address_t intfc_address;
+ u32 tmp;
+ u8 intfc_address_length = 0;
+ u8 is_add = 1;
+ u8 l2_only = 0;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "inner_vrf_id %d", &inner_vrf_id))
+ ;
+ else if (unformat (i, "outer_vrf_id %d", &outer_vrf_id))
+ ;
+ else if (unformat (i, "src %U", unformat_ip4_address, &src_address))
+ ;
+ else if (unformat (i, "dst %U", unformat_ip4_address, &dst_address))
+ ;
+ else if (unformat (i, "adj %U/%d", unformat_ip4_address,
+ &intfc_address, &tmp))
+ intfc_address_length = tmp;
+ else if (unformat (i, "l2-only"))
+ l2_only = 1;
+ else if (unformat (i, "del"))
+ is_add = 0;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
+ }
+
+ M (MPLS_GRE_ADD_DEL_TUNNEL, mpls_gre_add_del_tunnel);
+
+ mp->inner_vrf_id = ntohl (inner_vrf_id);
+ mp->outer_vrf_id = ntohl (outer_vrf_id);
+ clib_memcpy (mp->src_address, &src_address, sizeof (src_address));
+ clib_memcpy (mp->dst_address, &dst_address, sizeof (dst_address));
+ clib_memcpy (mp->intfc_address, &intfc_address, sizeof (intfc_address));
+ mp->intfc_address_length = intfc_address_length;
+ mp->l2_only = l2_only;
+ mp->is_add = is_add;
+
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_mpls_ethernet_add_del_tunnel (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_mpls_ethernet_add_del_tunnel_t *mp;
- f64 timeout;
- u32 inner_vrf_id = 0;
- ip4_address_t intfc_address;
- u8 dst_mac_address[6];
- int dst_set = 1;
- u32 tmp;
- u8 intfc_address_length = 0;
- u8 is_add = 1;
- u8 l2_only = 0;
- u32 tx_sw_if_index;
- int tx_sw_if_index_set = 0;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "vrf %d", &inner_vrf_id))
- ;
- else if (unformat (i, "adj %U/%d", unformat_ip4_address,
- &intfc_address, &tmp))
- intfc_address_length = tmp;
- else if (unformat (i, "%U",
- unformat_sw_if_index, vam, &tx_sw_if_index))
- tx_sw_if_index_set = 1;
- else if (unformat (i, "tx_sw_if_index %d", &tx_sw_if_index))
- tx_sw_if_index_set = 1;
- else if (unformat (i, "dst %U", unformat_ethernet_address,
- dst_mac_address))
- dst_set = 1;
- else if (unformat (i, "l2-only"))
- l2_only = 1;
- else if (unformat (i, "del"))
- is_add = 0;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
- }
-
- if (!dst_set) {
- errmsg ("dst (mac address) not set\n");
- return -99;
- }
- if (!tx_sw_if_index_set) {
- errmsg ("tx-intfc not set\n");
- return -99;
- }
-
- M(MPLS_ETHERNET_ADD_DEL_TUNNEL, mpls_ethernet_add_del_tunnel);
-
- mp->vrf_id = ntohl(inner_vrf_id);
- clib_memcpy (mp->adj_address, &intfc_address, sizeof (intfc_address));
- mp->adj_address_length = intfc_address_length;
- clib_memcpy (mp->dst_mac_address, dst_mac_address, sizeof (dst_mac_address));
- mp->tx_sw_if_index = ntohl(tx_sw_if_index);
- mp->l2_only = l2_only;
- mp->is_add = is_add;
-
- S; W;
- /* NOTREACHED */
- return 0;
+static int
+api_mpls_ethernet_add_del_tunnel (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_mpls_ethernet_add_del_tunnel_t *mp;
+ f64 timeout;
+ u32 inner_vrf_id = 0;
+ ip4_address_t intfc_address;
+ u8 dst_mac_address[6];
+ int dst_set = 1;
+ u32 tmp;
+ u8 intfc_address_length = 0;
+ u8 is_add = 1;
+ u8 l2_only = 0;
+ u32 tx_sw_if_index;
+ int tx_sw_if_index_set = 0;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "vrf %d", &inner_vrf_id))
+ ;
+ else if (unformat (i, "adj %U/%d", unformat_ip4_address,
+ &intfc_address, &tmp))
+ intfc_address_length = tmp;
+ else if (unformat (i, "%U", unformat_sw_if_index, vam, &tx_sw_if_index))
+ tx_sw_if_index_set = 1;
+ else if (unformat (i, "tx_sw_if_index %d", &tx_sw_if_index))
+ tx_sw_if_index_set = 1;
+ else if (unformat (i, "dst %U", unformat_ethernet_address,
+ dst_mac_address))
+ dst_set = 1;
+ else if (unformat (i, "l2-only"))
+ l2_only = 1;
+ else if (unformat (i, "del"))
+ is_add = 0;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
+ }
+
+ if (!dst_set)
+ {
+ errmsg ("dst (mac address) not set\n");
+ return -99;
+ }
+ if (!tx_sw_if_index_set)
+ {
+ errmsg ("tx-intfc not set\n");
+ return -99;
+ }
+
+ M (MPLS_ETHERNET_ADD_DEL_TUNNEL, mpls_ethernet_add_del_tunnel);
+
+ mp->vrf_id = ntohl (inner_vrf_id);
+ clib_memcpy (mp->adj_address, &intfc_address, sizeof (intfc_address));
+ mp->adj_address_length = intfc_address_length;
+ clib_memcpy (mp->dst_mac_address, dst_mac_address,
+ sizeof (dst_mac_address));
+ mp->tx_sw_if_index = ntohl (tx_sw_if_index);
+ mp->l2_only = l2_only;
+ mp->is_add = is_add;
+
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_mpls_ethernet_add_del_tunnel_2 (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_mpls_ethernet_add_del_tunnel_2_t *mp;
- f64 timeout;
- u32 inner_vrf_id = 0;
- u32 outer_vrf_id = 0;
- ip4_address_t adj_address;
- int adj_address_set = 0;
- ip4_address_t next_hop_address;
- int next_hop_address_set = 0;
- u32 tmp;
- u8 adj_address_length = 0;
- u8 l2_only = 0;
- u8 is_add = 1;
- u32 resolve_attempts = 5;
- u8 resolve_if_needed = 1;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "inner_vrf_id %d", &inner_vrf_id))
- ;
- else if (unformat (i, "outer_vrf_id %d", &outer_vrf_id))
- ;
- else if (unformat (i, "adj %U/%d", unformat_ip4_address,
- &adj_address, &tmp)) {
- adj_address_length = tmp;
- adj_address_set = 1;
- }
- else if (unformat (i, "next-hop %U", unformat_ip4_address,
- &next_hop_address))
- next_hop_address_set = 1;
- else if (unformat (i, "resolve-attempts %d", &resolve_attempts))
- ;
- else if (unformat (i, "resolve-if-needed %d", &tmp))
- resolve_if_needed = tmp;
- else if (unformat (i, "l2-only"))
- l2_only = 1;
- else if (unformat (i, "del"))
- is_add = 0;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
- }
-
- if (!adj_address_set) {
- errmsg ("adjacency address/mask not set\n");
- return -99;
- }
- if (!next_hop_address_set) {
- errmsg ("ip4 next hop address (in outer fib) not set\n");
- return -99;
- }
-
- M(MPLS_ETHERNET_ADD_DEL_TUNNEL_2, mpls_ethernet_add_del_tunnel_2);
-
- mp->inner_vrf_id = ntohl(inner_vrf_id);
- mp->outer_vrf_id = ntohl(outer_vrf_id);
- mp->resolve_attempts = ntohl(resolve_attempts);
- mp->resolve_if_needed = resolve_if_needed;
- mp->is_add = is_add;
- mp->l2_only = l2_only;
- clib_memcpy (mp->adj_address, &adj_address, sizeof (adj_address));
- mp->adj_address_length = adj_address_length;
- clib_memcpy (mp->next_hop_ip4_address_in_outer_vrf, &next_hop_address,
- sizeof (next_hop_address));
-
- S; W;
- /* NOTREACHED */
- return 0;
+static int
+api_mpls_ethernet_add_del_tunnel_2 (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_mpls_ethernet_add_del_tunnel_2_t *mp;
+ f64 timeout;
+ u32 inner_vrf_id = 0;
+ u32 outer_vrf_id = 0;
+ ip4_address_t adj_address;
+ int adj_address_set = 0;
+ ip4_address_t next_hop_address;
+ int next_hop_address_set = 0;
+ u32 tmp;
+ u8 adj_address_length = 0;
+ u8 l2_only = 0;
+ u8 is_add = 1;
+ u32 resolve_attempts = 5;
+ u8 resolve_if_needed = 1;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "inner_vrf_id %d", &inner_vrf_id))
+ ;
+ else if (unformat (i, "outer_vrf_id %d", &outer_vrf_id))
+ ;
+ else if (unformat (i, "adj %U/%d", unformat_ip4_address,
+ &adj_address, &tmp))
+ {
+ adj_address_length = tmp;
+ adj_address_set = 1;
+ }
+ else if (unformat (i, "next-hop %U", unformat_ip4_address,
+ &next_hop_address))
+ next_hop_address_set = 1;
+ else if (unformat (i, "resolve-attempts %d", &resolve_attempts))
+ ;
+ else if (unformat (i, "resolve-if-needed %d", &tmp))
+ resolve_if_needed = tmp;
+ else if (unformat (i, "l2-only"))
+ l2_only = 1;
+ else if (unformat (i, "del"))
+ is_add = 0;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
+ }
+
+ if (!adj_address_set)
+ {
+ errmsg ("adjacency address/mask not set\n");
+ return -99;
+ }
+ if (!next_hop_address_set)
+ {
+ errmsg ("ip4 next hop address (in outer fib) not set\n");
+ return -99;
+ }
+
+ M (MPLS_ETHERNET_ADD_DEL_TUNNEL_2, mpls_ethernet_add_del_tunnel_2);
+
+ mp->inner_vrf_id = ntohl (inner_vrf_id);
+ mp->outer_vrf_id = ntohl (outer_vrf_id);
+ mp->resolve_attempts = ntohl (resolve_attempts);
+ mp->resolve_if_needed = resolve_if_needed;
+ mp->is_add = is_add;
+ mp->l2_only = l2_only;
+ clib_memcpy (mp->adj_address, &adj_address, sizeof (adj_address));
+ mp->adj_address_length = adj_address_length;
+ clib_memcpy (mp->next_hop_ip4_address_in_outer_vrf, &next_hop_address,
+ sizeof (next_hop_address));
+
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_sw_interface_set_unnumbered (vat_main_t * vam)
+static int
+api_sw_interface_set_unnumbered (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_sw_interface_set_unnumbered_t *mp;
- f64 timeout;
- u32 sw_if_index;
- u32 unnum_sw_index;
- u8 is_add = 1;
- u8 sw_if_index_set = 0;
+ unformat_input_t *i = vam->input;
+ vl_api_sw_interface_set_unnumbered_t *mp;
+ f64 timeout;
+ u32 sw_if_index;
+ u32 unnum_sw_index;
+ u8 is_add = 1;
+ u8 sw_if_index_set = 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "unnum_if_index %d", &unnum_sw_index))
- ;
- else if (unformat (i, "del"))
- is_add = 0;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "unnum_if_index %d", &unnum_sw_index))
+ ;
+ else if (unformat (i, "del"))
+ is_add = 0;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (sw_if_index_set == 0) {
- errmsg ("missing interface name or sw_if_index\n");
- return -99;
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
}
- M(SW_INTERFACE_SET_UNNUMBERED, sw_interface_set_unnumbered);
+ M (SW_INTERFACE_SET_UNNUMBERED, sw_interface_set_unnumbered);
- mp->sw_if_index = ntohl(sw_if_index);
- mp->unnumbered_sw_if_index = ntohl(unnum_sw_index);
- mp->is_add = is_add;
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->unnumbered_sw_if_index = ntohl (unnum_sw_index);
+ mp->is_add = is_add;
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_ip_neighbor_add_del (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_ip_neighbor_add_del_t *mp;
- f64 timeout;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
- u32 vrf_id = 0;
- u8 is_add = 1;
- u8 is_static = 0;
- u8 mac_address[6];
- u8 mac_set = 0;
- u8 v4_address_set = 0;
- u8 v6_address_set = 0;
- ip4_address_t v4address;
- ip6_address_t v6address;
-
- memset (mac_address, 0, sizeof (mac_address));
-
- /* Parse args required to build the message */
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "mac %U", unformat_ethernet_address, mac_address)) {
- mac_set = 1;
- }
- else if (unformat (i, "del"))
- is_add = 0;
- else if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "is_static"))
- is_static = 1;
- else if (unformat (i, "vrf %d", &vrf_id))
- ;
- else if (unformat (i, "dst %U",
- unformat_ip4_address, &v4address))
- v4_address_set = 1;
- else if (unformat (i, "dst %U",
- unformat_ip6_address, &v6address))
- v6_address_set = 1;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
- }
-
- if (sw_if_index_set == 0) {
- errmsg ("missing interface name or sw_if_index\n");
- return -99;
- }
- if (v4_address_set && v6_address_set) {
- errmsg ("both v4 and v6 addresses set\n");
- return -99;
- }
- if (!v4_address_set && !v6_address_set) {
- errmsg ("no address set\n");
- return -99;
- }
-
- /* Construct the API message */
- M(IP_NEIGHBOR_ADD_DEL, ip_neighbor_add_del);
+static int
+api_ip_neighbor_add_del (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_ip_neighbor_add_del_t *mp;
+ f64 timeout;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
+ u32 vrf_id = 0;
+ u8 is_add = 1;
+ u8 is_static = 0;
+ u8 mac_address[6];
+ u8 mac_set = 0;
+ u8 v4_address_set = 0;
+ u8 v6_address_set = 0;
+ ip4_address_t v4address;
+ ip6_address_t v6address;
- mp->sw_if_index = ntohl (sw_if_index);
- mp->is_add = is_add;
- mp->vrf_id = ntohl (vrf_id);
- mp->is_static = is_static;
- if (mac_set)
- clib_memcpy (mp->mac_address, mac_address, 6);
- if (v6_address_set) {
- mp->is_ipv6 = 1;
- clib_memcpy (mp->dst_address, &v6address, sizeof (v6address));
- } else {
- /* mp->is_ipv6 = 0; via memset in M macro above */
- clib_memcpy (mp->dst_address, &v4address, sizeof (v4address));
- }
-
- /* send it... */
- S;
+ memset (mac_address, 0, sizeof (mac_address));
- /* Wait for a reply, return good/bad news */
- W;
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "mac %U", unformat_ethernet_address, mac_address))
+ {
+ mac_set = 1;
+ }
+ else if (unformat (i, "del"))
+ is_add = 0;
+ else if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "is_static"))
+ is_static = 1;
+ else if (unformat (i, "vrf %d", &vrf_id))
+ ;
+ else if (unformat (i, "dst %U", unformat_ip4_address, &v4address))
+ v4_address_set = 1;
+ else if (unformat (i, "dst %U", unformat_ip6_address, &v6address))
+ v6_address_set = 1;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
+ }
- /* NOTREACHED */
- return 0;
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
+ }
+ if (v4_address_set && v6_address_set)
+ {
+ errmsg ("both v4 and v6 addresses set\n");
+ return -99;
+ }
+ if (!v4_address_set && !v6_address_set)
+ {
+ errmsg ("no address set\n");
+ return -99;
+ }
+
+ /* Construct the API message */
+ M (IP_NEIGHBOR_ADD_DEL, ip_neighbor_add_del);
+
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->is_add = is_add;
+ mp->vrf_id = ntohl (vrf_id);
+ mp->is_static = is_static;
+ if (mac_set)
+ clib_memcpy (mp->mac_address, mac_address, 6);
+ if (v6_address_set)
+ {
+ mp->is_ipv6 = 1;
+ clib_memcpy (mp->dst_address, &v6address, sizeof (v6address));
+ }
+ else
+ {
+ /* mp->is_ipv6 = 0; via memset in M macro above */
+ clib_memcpy (mp->dst_address, &v4address, sizeof (v4address));
+ }
+
+ /* send it... */
+ S;
+
+ /* Wait for a reply, return good/bad news */
+ W;
+
+ /* NOTREACHED */
+ return 0;
}
-static int api_reset_vrf (vat_main_t * vam)
+static int
+api_reset_vrf (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_reset_vrf_t *mp;
- f64 timeout;
- u32 vrf_id = 0;
- u8 is_ipv6 = 0;
- u8 vrf_id_set = 0;
+ unformat_input_t *i = vam->input;
+ vl_api_reset_vrf_t *mp;
+ f64 timeout;
+ u32 vrf_id = 0;
+ u8 is_ipv6 = 0;
+ u8 vrf_id_set = 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "vrf %d", &vrf_id))
- vrf_id_set = 1;
- else if (unformat (i, "ipv6"))
- is_ipv6 = 1;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "vrf %d", &vrf_id))
+ vrf_id_set = 1;
+ else if (unformat (i, "ipv6"))
+ is_ipv6 = 1;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (vrf_id_set == 0) {
- errmsg ("missing vrf id\n");
- return -99;
+ if (vrf_id_set == 0)
+ {
+ errmsg ("missing vrf id\n");
+ return -99;
}
- M(RESET_VRF, reset_vrf);
+ M (RESET_VRF, reset_vrf);
- mp->vrf_id = ntohl(vrf_id);
- mp->is_ipv6 = is_ipv6;
+ mp->vrf_id = ntohl (vrf_id);
+ mp->is_ipv6 = is_ipv6;
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_create_vlan_subif (vat_main_t * vam)
+static int
+api_create_vlan_subif (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_create_vlan_subif_t *mp;
- f64 timeout;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
- u32 vlan_id;
- u8 vlan_id_set = 0;
+ unformat_input_t *i = vam->input;
+ vl_api_create_vlan_subif_t *mp;
+ f64 timeout;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
+ u32 vlan_id;
+ u8 vlan_id_set = 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "vlan %d", &vlan_id))
- vlan_id_set = 1;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "vlan %d", &vlan_id))
+ vlan_id_set = 1;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (sw_if_index_set == 0) {
- errmsg ("missing interface name or sw_if_index\n");
- return -99;
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
}
- if (vlan_id_set == 0) {
- errmsg ("missing vlan_id\n");
- return -99;
+ if (vlan_id_set == 0)
+ {
+ errmsg ("missing vlan_id\n");
+ return -99;
}
- M(CREATE_VLAN_SUBIF, create_vlan_subif);
+ M (CREATE_VLAN_SUBIF, create_vlan_subif);
- mp->sw_if_index = ntohl(sw_if_index);
- mp->vlan_id = ntohl(vlan_id);
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->vlan_id = ntohl (vlan_id);
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
#define foreach_create_subif_bit \
@@ -5560,921 +6039,1004 @@ _(default_sub) \
_(outer_vlan_id_any) \
_(inner_vlan_id_any)
-static int api_create_subif (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_create_subif_t *mp;
- f64 timeout;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
- u32 sub_id;
- u8 sub_id_set = 0;
- u32 no_tags = 0;
- u32 one_tag = 0;
- u32 two_tags = 0;
- u32 dot1ad = 0;
- u32 exact_match = 0;
- u32 default_sub = 0;
- u32 outer_vlan_id_any = 0;
- u32 inner_vlan_id_any = 0;
- u32 tmp;
- u16 outer_vlan_id = 0;
- u16 inner_vlan_id = 0;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "sub_id %d", &sub_id))
- sub_id_set = 1;
- else if (unformat (i, "outer_vlan_id %d", &tmp))
- outer_vlan_id = tmp;
- else if (unformat (i, "inner_vlan_id %d", &tmp))
- inner_vlan_id = tmp;
+static int
+api_create_subif (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_create_subif_t *mp;
+ f64 timeout;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
+ u32 sub_id;
+ u8 sub_id_set = 0;
+ u32 no_tags = 0;
+ u32 one_tag = 0;
+ u32 two_tags = 0;
+ u32 dot1ad = 0;
+ u32 exact_match = 0;
+ u32 default_sub = 0;
+ u32 outer_vlan_id_any = 0;
+ u32 inner_vlan_id_any = 0;
+ u32 tmp;
+ u16 outer_vlan_id = 0;
+ u16 inner_vlan_id = 0;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sub_id %d", &sub_id))
+ sub_id_set = 1;
+ else if (unformat (i, "outer_vlan_id %d", &tmp))
+ outer_vlan_id = tmp;
+ else if (unformat (i, "inner_vlan_id %d", &tmp))
+ inner_vlan_id = tmp;
#define _(a) else if (unformat (i, #a)) a = 1 ;
- foreach_create_subif_bit
+ foreach_create_subif_bit
#undef _
-
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (sw_if_index_set == 0) {
- errmsg ("missing interface name or sw_if_index\n");
- return -99;
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
}
- if (sub_id_set == 0) {
- errmsg ("missing sub_id\n");
- return -99;
+ if (sub_id_set == 0)
+ {
+ errmsg ("missing sub_id\n");
+ return -99;
}
- M(CREATE_SUBIF, create_subif);
+ M (CREATE_SUBIF, create_subif);
- mp->sw_if_index = ntohl(sw_if_index);
- mp->sub_id = ntohl(sub_id);
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->sub_id = ntohl (sub_id);
#define _(a) mp->a = a;
- foreach_create_subif_bit;
+ foreach_create_subif_bit;
#undef _
- mp->outer_vlan_id = ntohs (outer_vlan_id);
- mp->inner_vlan_id = ntohs (inner_vlan_id);
+ mp->outer_vlan_id = ntohs (outer_vlan_id);
+ mp->inner_vlan_id = ntohs (inner_vlan_id);
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_oam_add_del (vat_main_t * vam)
+static int
+api_oam_add_del (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_oam_add_del_t *mp;
- f64 timeout;
- u32 vrf_id = 0;
- u8 is_add = 1;
- ip4_address_t src, dst;
- u8 src_set = 0;
- u8 dst_set = 0;
+ unformat_input_t *i = vam->input;
+ vl_api_oam_add_del_t *mp;
+ f64 timeout;
+ u32 vrf_id = 0;
+ u8 is_add = 1;
+ ip4_address_t src, dst;
+ u8 src_set = 0;
+ u8 dst_set = 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "vrf %d", &vrf_id))
- ;
- else if (unformat (i, "src %U", unformat_ip4_address, &src))
- src_set = 1;
- else if (unformat (i, "dst %U", unformat_ip4_address, &dst))
- dst_set = 1;
- else if (unformat (i, "del"))
- is_add = 0;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "vrf %d", &vrf_id))
+ ;
+ else if (unformat (i, "src %U", unformat_ip4_address, &src))
+ src_set = 1;
+ else if (unformat (i, "dst %U", unformat_ip4_address, &dst))
+ dst_set = 1;
+ else if (unformat (i, "del"))
+ is_add = 0;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (src_set == 0) {
- errmsg ("missing src addr\n");
- return -99;
+ if (src_set == 0)
+ {
+ errmsg ("missing src addr\n");
+ return -99;
}
- if (dst_set == 0) {
- errmsg ("missing dst addr\n");
- return -99;
+ if (dst_set == 0)
+ {
+ errmsg ("missing dst addr\n");
+ return -99;
}
- M(OAM_ADD_DEL, oam_add_del);
+ M (OAM_ADD_DEL, oam_add_del);
- mp->vrf_id = ntohl(vrf_id);
- mp->is_add = is_add;
- clib_memcpy(mp->src_address, &src, sizeof (mp->src_address));
- clib_memcpy(mp->dst_address, &dst, sizeof (mp->dst_address));
+ mp->vrf_id = ntohl (vrf_id);
+ mp->is_add = is_add;
+ clib_memcpy (mp->src_address, &src, sizeof (mp->src_address));
+ clib_memcpy (mp->dst_address, &dst, sizeof (mp->dst_address));
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_reset_fib (vat_main_t * vam)
+static int
+api_reset_fib (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_reset_fib_t *mp;
- f64 timeout;
- u32 vrf_id = 0;
- u8 is_ipv6 = 0;
- u8 vrf_id_set = 0;
+ unformat_input_t *i = vam->input;
+ vl_api_reset_fib_t *mp;
+ f64 timeout;
+ u32 vrf_id = 0;
+ u8 is_ipv6 = 0;
+ u8 vrf_id_set = 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "vrf %d", &vrf_id))
- vrf_id_set = 1;
- else if (unformat (i, "ipv6"))
- is_ipv6 = 1;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "vrf %d", &vrf_id))
+ vrf_id_set = 1;
+ else if (unformat (i, "ipv6"))
+ is_ipv6 = 1;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (vrf_id_set == 0) {
- errmsg ("missing vrf id\n");
- return -99;
+ if (vrf_id_set == 0)
+ {
+ errmsg ("missing vrf id\n");
+ return -99;
}
- M(RESET_FIB, reset_fib);
+ M (RESET_FIB, reset_fib);
- mp->vrf_id = ntohl(vrf_id);
- mp->is_ipv6 = is_ipv6;
+ mp->vrf_id = ntohl (vrf_id);
+ mp->is_ipv6 = is_ipv6;
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_dhcp_proxy_config (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_dhcp_proxy_config_t *mp;
- f64 timeout;
- u32 vrf_id = 0;
- u8 is_add = 1;
- u8 insert_cid = 1;
- u8 v4_address_set = 0;
- u8 v6_address_set = 0;
- ip4_address_t v4address;
- ip6_address_t v6address;
- u8 v4_src_address_set = 0;
- u8 v6_src_address_set = 0;
- ip4_address_t v4srcaddress;
- ip6_address_t v6srcaddress;
-
- /* Parse args required to build the message */
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "del"))
- is_add = 0;
- else if (unformat (i, "vrf %d", &vrf_id))
- ;
- else if (unformat (i, "insert-cid %d", &insert_cid))
- ;
- else if (unformat (i, "svr %U",
- unformat_ip4_address, &v4address))
- v4_address_set = 1;
- else if (unformat (i, "svr %U",
- unformat_ip6_address, &v6address))
- v6_address_set = 1;
- else if (unformat (i, "src %U",
- unformat_ip4_address, &v4srcaddress))
- v4_src_address_set = 1;
- else if (unformat (i, "src %U",
- unformat_ip6_address, &v6srcaddress))
- v6_src_address_set = 1;
- else
- break;
+static int
+api_dhcp_proxy_config (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_dhcp_proxy_config_t *mp;
+ f64 timeout;
+ u32 vrf_id = 0;
+ u8 is_add = 1;
+ u8 insert_cid = 1;
+ u8 v4_address_set = 0;
+ u8 v6_address_set = 0;
+ ip4_address_t v4address;
+ ip6_address_t v6address;
+ u8 v4_src_address_set = 0;
+ u8 v6_src_address_set = 0;
+ ip4_address_t v4srcaddress;
+ ip6_address_t v6srcaddress;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "del"))
+ is_add = 0;
+ else if (unformat (i, "vrf %d", &vrf_id))
+ ;
+ else if (unformat (i, "insert-cid %d", &insert_cid))
+ ;
+ else if (unformat (i, "svr %U", unformat_ip4_address, &v4address))
+ v4_address_set = 1;
+ else if (unformat (i, "svr %U", unformat_ip6_address, &v6address))
+ v6_address_set = 1;
+ else if (unformat (i, "src %U", unformat_ip4_address, &v4srcaddress))
+ v4_src_address_set = 1;
+ else if (unformat (i, "src %U", unformat_ip6_address, &v6srcaddress))
+ v6_src_address_set = 1;
+ else
+ break;
}
- if (v4_address_set && v6_address_set) {
- errmsg ("both v4 and v6 server addresses set\n");
- return -99;
+ if (v4_address_set && v6_address_set)
+ {
+ errmsg ("both v4 and v6 server addresses set\n");
+ return -99;
}
- if (!v4_address_set && !v6_address_set) {
- errmsg ("no server addresses set\n");
- return -99;
+ if (!v4_address_set && !v6_address_set)
+ {
+ errmsg ("no server addresses set\n");
+ return -99;
}
- if (v4_src_address_set && v6_src_address_set) {
- errmsg ("both v4 and v6 src addresses set\n");
- return -99;
+ if (v4_src_address_set && v6_src_address_set)
+ {
+ errmsg ("both v4 and v6 src addresses set\n");
+ return -99;
}
- if (!v4_src_address_set && !v6_src_address_set) {
- errmsg ("no src addresses set\n");
- return -99;
+ if (!v4_src_address_set && !v6_src_address_set)
+ {
+ errmsg ("no src addresses set\n");
+ return -99;
}
- if (!(v4_src_address_set && v4_address_set) &&
- !(v6_src_address_set && v6_address_set)) {
- errmsg ("no matching server and src addresses set\n");
- return -99;
+ if (!(v4_src_address_set && v4_address_set) &&
+ !(v6_src_address_set && v6_address_set))
+ {
+ errmsg ("no matching server and src addresses set\n");
+ return -99;
}
- /* Construct the API message */
- M(DHCP_PROXY_CONFIG, dhcp_proxy_config);
+ /* Construct the API message */
+ M (DHCP_PROXY_CONFIG, dhcp_proxy_config);
- mp->insert_circuit_id = insert_cid;
- mp->is_add = is_add;
- mp->vrf_id = ntohl (vrf_id);
- if (v6_address_set) {
- mp->is_ipv6 = 1;
- clib_memcpy (mp->dhcp_server, &v6address, sizeof (v6address));
- clib_memcpy (mp->dhcp_src_address, &v6srcaddress, sizeof (v6address));
- } else {
- clib_memcpy (mp->dhcp_server, &v4address, sizeof (v4address));
- clib_memcpy (mp->dhcp_src_address, &v4srcaddress, sizeof (v4address));
+ mp->insert_circuit_id = insert_cid;
+ mp->is_add = is_add;
+ mp->vrf_id = ntohl (vrf_id);
+ if (v6_address_set)
+ {
+ mp->is_ipv6 = 1;
+ clib_memcpy (mp->dhcp_server, &v6address, sizeof (v6address));
+ clib_memcpy (mp->dhcp_src_address, &v6srcaddress, sizeof (v6address));
+ }
+ else
+ {
+ clib_memcpy (mp->dhcp_server, &v4address, sizeof (v4address));
+ clib_memcpy (mp->dhcp_src_address, &v4srcaddress, sizeof (v4address));
}
- /* send it... */
- S;
+ /* send it... */
+ S;
- /* Wait for a reply, return good/bad news */
- W;
- /* NOTREACHED */
- return 0;
+ /* Wait for a reply, return good/bad news */
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_dhcp_proxy_config_2 (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_dhcp_proxy_config_2_t *mp;
- f64 timeout;
- u32 rx_vrf_id = 0;
- u32 server_vrf_id = 0;
- u8 is_add = 1;
- u8 insert_cid = 1;
- u8 v4_address_set = 0;
- u8 v6_address_set = 0;
- ip4_address_t v4address;
- ip6_address_t v6address;
- u8 v4_src_address_set = 0;
- u8 v6_src_address_set = 0;
- ip4_address_t v4srcaddress;
- ip6_address_t v6srcaddress;
-
- /* Parse args required to build the message */
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "del"))
- is_add = 0;
- else if (unformat (i, "rx_vrf_id %d", &rx_vrf_id))
- ;
- else if (unformat (i, "server_vrf_id %d", &server_vrf_id))
- ;
- else if (unformat (i, "insert-cid %d", &insert_cid))
- ;
- else if (unformat (i, "svr %U",
- unformat_ip4_address, &v4address))
- v4_address_set = 1;
- else if (unformat (i, "svr %U",
- unformat_ip6_address, &v6address))
- v6_address_set = 1;
- else if (unformat (i, "src %U",
- unformat_ip4_address, &v4srcaddress))
- v4_src_address_set = 1;
- else if (unformat (i, "src %U",
- unformat_ip6_address, &v6srcaddress))
- v6_src_address_set = 1;
- else
- break;
+static int
+api_dhcp_proxy_config_2 (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_dhcp_proxy_config_2_t *mp;
+ f64 timeout;
+ u32 rx_vrf_id = 0;
+ u32 server_vrf_id = 0;
+ u8 is_add = 1;
+ u8 insert_cid = 1;
+ u8 v4_address_set = 0;
+ u8 v6_address_set = 0;
+ ip4_address_t v4address;
+ ip6_address_t v6address;
+ u8 v4_src_address_set = 0;
+ u8 v6_src_address_set = 0;
+ ip4_address_t v4srcaddress;
+ ip6_address_t v6srcaddress;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "del"))
+ is_add = 0;
+ else if (unformat (i, "rx_vrf_id %d", &rx_vrf_id))
+ ;
+ else if (unformat (i, "server_vrf_id %d", &server_vrf_id))
+ ;
+ else if (unformat (i, "insert-cid %d", &insert_cid))
+ ;
+ else if (unformat (i, "svr %U", unformat_ip4_address, &v4address))
+ v4_address_set = 1;
+ else if (unformat (i, "svr %U", unformat_ip6_address, &v6address))
+ v6_address_set = 1;
+ else if (unformat (i, "src %U", unformat_ip4_address, &v4srcaddress))
+ v4_src_address_set = 1;
+ else if (unformat (i, "src %U", unformat_ip6_address, &v6srcaddress))
+ v6_src_address_set = 1;
+ else
+ break;
}
- if (v4_address_set && v6_address_set) {
- errmsg ("both v4 and v6 server addresses set\n");
- return -99;
+ if (v4_address_set && v6_address_set)
+ {
+ errmsg ("both v4 and v6 server addresses set\n");
+ return -99;
}
- if (!v4_address_set && !v6_address_set) {
- errmsg ("no server addresses set\n");
- return -99;
+ if (!v4_address_set && !v6_address_set)
+ {
+ errmsg ("no server addresses set\n");
+ return -99;
}
- if (v4_src_address_set && v6_src_address_set) {
- errmsg ("both v4 and v6 src addresses set\n");
- return -99;
+ if (v4_src_address_set && v6_src_address_set)
+ {
+ errmsg ("both v4 and v6 src addresses set\n");
+ return -99;
}
- if (!v4_src_address_set && !v6_src_address_set) {
- errmsg ("no src addresses set\n");
- return -99;
+ if (!v4_src_address_set && !v6_src_address_set)
+ {
+ errmsg ("no src addresses set\n");
+ return -99;
}
- if (!(v4_src_address_set && v4_address_set) &&
- !(v6_src_address_set && v6_address_set)) {
- errmsg ("no matching server and src addresses set\n");
- return -99;
+ if (!(v4_src_address_set && v4_address_set) &&
+ !(v6_src_address_set && v6_address_set))
+ {
+ errmsg ("no matching server and src addresses set\n");
+ return -99;
}
- /* Construct the API message */
- M(DHCP_PROXY_CONFIG_2, dhcp_proxy_config_2);
+ /* Construct the API message */
+ M (DHCP_PROXY_CONFIG_2, dhcp_proxy_config_2);
- mp->insert_circuit_id = insert_cid;
- mp->is_add = is_add;
- mp->rx_vrf_id = ntohl (rx_vrf_id);
- mp->server_vrf_id = ntohl (server_vrf_id);
- if (v6_address_set) {
- mp->is_ipv6 = 1;
- clib_memcpy (mp->dhcp_server, &v6address, sizeof (v6address));
- clib_memcpy (mp->dhcp_src_address, &v6srcaddress, sizeof (v6address));
- } else {
- clib_memcpy (mp->dhcp_server, &v4address, sizeof (v4address));
- clib_memcpy (mp->dhcp_src_address, &v4srcaddress, sizeof (v4address));
+ mp->insert_circuit_id = insert_cid;
+ mp->is_add = is_add;
+ mp->rx_vrf_id = ntohl (rx_vrf_id);
+ mp->server_vrf_id = ntohl (server_vrf_id);
+ if (v6_address_set)
+ {
+ mp->is_ipv6 = 1;
+ clib_memcpy (mp->dhcp_server, &v6address, sizeof (v6address));
+ clib_memcpy (mp->dhcp_src_address, &v6srcaddress, sizeof (v6address));
+ }
+ else
+ {
+ clib_memcpy (mp->dhcp_server, &v4address, sizeof (v4address));
+ clib_memcpy (mp->dhcp_src_address, &v4srcaddress, sizeof (v4address));
}
- /* send it... */
- S;
+ /* send it... */
+ S;
- /* Wait for a reply, return good/bad news */
- W;
- /* NOTREACHED */
- return 0;
+ /* Wait for a reply, return good/bad news */
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_dhcp_proxy_set_vss (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_dhcp_proxy_set_vss_t *mp;
- f64 timeout;
- u8 is_ipv6 = 0;
- u8 is_add = 1;
- u32 tbl_id;
- u8 tbl_id_set = 0;
- u32 oui;
- u8 oui_set = 0;
- u32 fib_id;
- u8 fib_id_set = 0;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "tbl_id %d", &tbl_id))
- tbl_id_set = 1;
- if (unformat (i, "fib_id %d", &fib_id))
- fib_id_set = 1;
- if (unformat (i, "oui %d", &oui))
- oui_set = 1;
- else if (unformat (i, "ipv6"))
- is_ipv6 = 1;
- else if (unformat (i, "del"))
- is_add = 0;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
- }
-
- if (tbl_id_set == 0) {
- errmsg ("missing tbl id\n");
- return -99;
- }
-
- if (fib_id_set == 0) {
- errmsg ("missing fib id\n");
- return -99;
- }
- if (oui_set == 0) {
- errmsg ("missing oui\n");
- return -99;
- }
-
- M(DHCP_PROXY_SET_VSS, dhcp_proxy_set_vss);
- mp->tbl_id = ntohl(tbl_id);
- mp->fib_id = ntohl(fib_id);
- mp->oui = ntohl(oui);
- mp->is_ipv6 = is_ipv6;
- mp->is_add = is_add;
-
- S; W;
- /* NOTREACHED */
- return 0;
+static int
+api_dhcp_proxy_set_vss (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_dhcp_proxy_set_vss_t *mp;
+ f64 timeout;
+ u8 is_ipv6 = 0;
+ u8 is_add = 1;
+ u32 tbl_id;
+ u8 tbl_id_set = 0;
+ u32 oui;
+ u8 oui_set = 0;
+ u32 fib_id;
+ u8 fib_id_set = 0;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "tbl_id %d", &tbl_id))
+ tbl_id_set = 1;
+ if (unformat (i, "fib_id %d", &fib_id))
+ fib_id_set = 1;
+ if (unformat (i, "oui %d", &oui))
+ oui_set = 1;
+ else if (unformat (i, "ipv6"))
+ is_ipv6 = 1;
+ else if (unformat (i, "del"))
+ is_add = 0;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
+ }
+
+ if (tbl_id_set == 0)
+ {
+ errmsg ("missing tbl id\n");
+ return -99;
+ }
+
+ if (fib_id_set == 0)
+ {
+ errmsg ("missing fib id\n");
+ return -99;
+ }
+ if (oui_set == 0)
+ {
+ errmsg ("missing oui\n");
+ return -99;
+ }
+
+ M (DHCP_PROXY_SET_VSS, dhcp_proxy_set_vss);
+ mp->tbl_id = ntohl (tbl_id);
+ mp->fib_id = ntohl (fib_id);
+ mp->oui = ntohl (oui);
+ mp->is_ipv6 = is_ipv6;
+ mp->is_add = is_add;
+
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_dhcp_client_config (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_dhcp_client_config_t *mp;
- f64 timeout;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
- u8 is_add = 1;
- u8 * hostname = 0;
- u8 disable_event = 0;
-
- /* Parse args required to build the message */
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "del"))
- is_add = 0;
- else if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "hostname %s", &hostname))
- ;
- else if (unformat (i, "disable_event"))
- disable_event = 1;
- else
- break;
+static int
+api_dhcp_client_config (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_dhcp_client_config_t *mp;
+ f64 timeout;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
+ u8 is_add = 1;
+ u8 *hostname = 0;
+ u8 disable_event = 0;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "del"))
+ is_add = 0;
+ else if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "hostname %s", &hostname))
+ ;
+ else if (unformat (i, "disable_event"))
+ disable_event = 1;
+ else
+ break;
}
- if (sw_if_index_set == 0) {
- errmsg ("missing interface name or sw_if_index\n");
- return -99;
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
}
- if (vec_len (hostname) > 63) {
- errmsg ("hostname too long\n");
+ if (vec_len (hostname) > 63)
+ {
+ errmsg ("hostname too long\n");
}
- vec_add1 (hostname, 0);
+ vec_add1 (hostname, 0);
- /* Construct the API message */
- M(DHCP_CLIENT_CONFIG, dhcp_client_config);
+ /* Construct the API message */
+ M (DHCP_CLIENT_CONFIG, dhcp_client_config);
- mp->sw_if_index = ntohl (sw_if_index);
- clib_memcpy (mp->hostname, hostname, vec_len (hostname));
- vec_free (hostname);
- mp->is_add = is_add;
- mp->want_dhcp_event = disable_event ? 0 : 1;
- mp->pid = getpid();
+ mp->sw_if_index = ntohl (sw_if_index);
+ clib_memcpy (mp->hostname, hostname, vec_len (hostname));
+ vec_free (hostname);
+ mp->is_add = is_add;
+ mp->want_dhcp_event = disable_event ? 0 : 1;
+ mp->pid = getpid ();
- /* send it... */
- S;
+ /* send it... */
+ S;
- /* Wait for a reply, return good/bad news */
- W;
- /* NOTREACHED */
- return 0;
+ /* Wait for a reply, return good/bad news */
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_set_ip_flow_hash (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_set_ip_flow_hash_t *mp;
- f64 timeout;
- u32 vrf_id = 0;
- u8 is_ipv6 = 0;
- u8 vrf_id_set = 0;
- u8 src = 0;
- u8 dst = 0;
- u8 sport = 0;
- u8 dport = 0;
- u8 proto = 0;
- u8 reverse = 0;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "vrf %d", &vrf_id))
- vrf_id_set = 1;
- else if (unformat (i, "ipv6"))
- is_ipv6 = 1;
- else if (unformat (i, "src"))
- src = 1;
- else if (unformat (i, "dst"))
- dst = 1;
- else if (unformat (i, "sport"))
- sport = 1;
- else if (unformat (i, "dport"))
- dport = 1;
- else if (unformat (i, "proto"))
- proto = 1;
- else if (unformat (i, "reverse"))
- reverse = 1;
-
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
- }
-
- if (vrf_id_set == 0) {
- errmsg ("missing vrf id\n");
- return -99;
- }
-
- M(SET_IP_FLOW_HASH, set_ip_flow_hash);
- mp->src = src;
- mp->dst = dst;
- mp->sport = sport;
- mp->dport = dport;
- mp->proto = proto;
- mp->reverse = reverse;
- mp->vrf_id = ntohl(vrf_id);
- mp->is_ipv6 = is_ipv6;
-
- S; W;
- /* NOTREACHED */
- return 0;
+static int
+api_set_ip_flow_hash (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_set_ip_flow_hash_t *mp;
+ f64 timeout;
+ u32 vrf_id = 0;
+ u8 is_ipv6 = 0;
+ u8 vrf_id_set = 0;
+ u8 src = 0;
+ u8 dst = 0;
+ u8 sport = 0;
+ u8 dport = 0;
+ u8 proto = 0;
+ u8 reverse = 0;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "vrf %d", &vrf_id))
+ vrf_id_set = 1;
+ else if (unformat (i, "ipv6"))
+ is_ipv6 = 1;
+ else if (unformat (i, "src"))
+ src = 1;
+ else if (unformat (i, "dst"))
+ dst = 1;
+ else if (unformat (i, "sport"))
+ sport = 1;
+ else if (unformat (i, "dport"))
+ dport = 1;
+ else if (unformat (i, "proto"))
+ proto = 1;
+ else if (unformat (i, "reverse"))
+ reverse = 1;
+
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
+ }
+
+ if (vrf_id_set == 0)
+ {
+ errmsg ("missing vrf id\n");
+ return -99;
+ }
+
+ M (SET_IP_FLOW_HASH, set_ip_flow_hash);
+ mp->src = src;
+ mp->dst = dst;
+ mp->sport = sport;
+ mp->dport = dport;
+ mp->proto = proto;
+ mp->reverse = reverse;
+ mp->vrf_id = ntohl (vrf_id);
+ mp->is_ipv6 = is_ipv6;
+
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_sw_interface_ip6_enable_disable (vat_main_t * vam)
+static int
+api_sw_interface_ip6_enable_disable (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_sw_interface_ip6_enable_disable_t *mp;
- f64 timeout;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
- u8 enable = 0;
+ unformat_input_t *i = vam->input;
+ vl_api_sw_interface_ip6_enable_disable_t *mp;
+ f64 timeout;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
+ u8 enable = 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "enable"))
- enable = 1;
- else if (unformat (i, "disable"))
- enable = 0;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "enable"))
+ enable = 1;
+ else if (unformat (i, "disable"))
+ enable = 0;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (sw_if_index_set == 0) {
- errmsg ("missing interface name or sw_if_index\n");
- return -99;
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
}
- M(SW_INTERFACE_IP6_ENABLE_DISABLE, sw_interface_ip6_enable_disable);
+ M (SW_INTERFACE_IP6_ENABLE_DISABLE, sw_interface_ip6_enable_disable);
- mp->sw_if_index = ntohl(sw_if_index);
- mp->enable = enable;
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->enable = enable;
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_sw_interface_ip6_set_link_local_address (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_sw_interface_ip6_set_link_local_address_t *mp;
- f64 timeout;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
- u32 address_length = 0;
- u8 v6_address_set = 0;
- ip6_address_t v6address;
-
- /* Parse args required to build the message */
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "%U/%d",
- unformat_ip6_address, &v6address,
- &address_length))
- v6_address_set = 1;
- else
- break;
+static int
+api_sw_interface_ip6_set_link_local_address (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_sw_interface_ip6_set_link_local_address_t *mp;
+ f64 timeout;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
+ u32 address_length = 0;
+ u8 v6_address_set = 0;
+ ip6_address_t v6address;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "%U/%d",
+ unformat_ip6_address, &v6address, &address_length))
+ v6_address_set = 1;
+ else
+ break;
}
- if (sw_if_index_set == 0) {
- errmsg ("missing interface name or sw_if_index\n");
- return -99;
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
}
- if (!v6_address_set) {
- errmsg ("no address set\n");
- return -99;
+ if (!v6_address_set)
+ {
+ errmsg ("no address set\n");
+ return -99;
}
- /* Construct the API message */
- M(SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS, \
- sw_interface_ip6_set_link_local_address);
+ /* Construct the API message */
+ M (SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS,
+ sw_interface_ip6_set_link_local_address);
- mp->sw_if_index = ntohl (sw_if_index);
- clib_memcpy (mp->address, &v6address, sizeof (v6address));
- mp->address_length = address_length;
+ mp->sw_if_index = ntohl (sw_if_index);
+ clib_memcpy (mp->address, &v6address, sizeof (v6address));
+ mp->address_length = address_length;
- /* send it... */
- S;
+ /* send it... */
+ S;
- /* Wait for a reply, return good/bad news */
- W;
+ /* Wait for a reply, return good/bad news */
+ W;
- /* NOTREACHED */
- return 0;
+ /* NOTREACHED */
+ return 0;
}
-static int api_sw_interface_ip6nd_ra_prefix (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_sw_interface_ip6nd_ra_prefix_t *mp;
- f64 timeout;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
- u32 address_length = 0;
- u8 v6_address_set = 0;
- ip6_address_t v6address;
- u8 use_default = 0;
- u8 no_advertise = 0;
- u8 off_link = 0;
- u8 no_autoconfig = 0;
- u8 no_onlink = 0;
- u8 is_no = 0;
- u32 val_lifetime = 0;
- u32 pref_lifetime = 0;
-
- /* Parse args required to build the message */
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "%U/%d",
- unformat_ip6_address, &v6address,
- &address_length))
- v6_address_set = 1;
- else if (unformat (i, "val_life %d", &val_lifetime))
- ;
- else if (unformat (i, "pref_life %d", &pref_lifetime))
- ;
- else if (unformat (i, "def"))
- use_default = 1;
- else if (unformat (i, "noadv"))
- no_advertise = 1;
- else if (unformat (i, "offl"))
- off_link = 1;
- else if (unformat (i, "noauto"))
- no_autoconfig = 1;
- else if (unformat (i, "nolink"))
- no_onlink = 1;
- else if (unformat (i, "isno"))
- is_no = 1;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
- }
-
- if (sw_if_index_set == 0) {
- errmsg ("missing interface name or sw_if_index\n");
- return -99;
- }
- if (!v6_address_set) {
- errmsg ("no address set\n");
- return -99;
- }
-
- /* Construct the API message */
- M(SW_INTERFACE_IP6ND_RA_PREFIX, sw_interface_ip6nd_ra_prefix);
+static int
+api_sw_interface_ip6nd_ra_prefix (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_sw_interface_ip6nd_ra_prefix_t *mp;
+ f64 timeout;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
+ u32 address_length = 0;
+ u8 v6_address_set = 0;
+ ip6_address_t v6address;
+ u8 use_default = 0;
+ u8 no_advertise = 0;
+ u8 off_link = 0;
+ u8 no_autoconfig = 0;
+ u8 no_onlink = 0;
+ u8 is_no = 0;
+ u32 val_lifetime = 0;
+ u32 pref_lifetime = 0;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "%U/%d",
+ unformat_ip6_address, &v6address, &address_length))
+ v6_address_set = 1;
+ else if (unformat (i, "val_life %d", &val_lifetime))
+ ;
+ else if (unformat (i, "pref_life %d", &pref_lifetime))
+ ;
+ else if (unformat (i, "def"))
+ use_default = 1;
+ else if (unformat (i, "noadv"))
+ no_advertise = 1;
+ else if (unformat (i, "offl"))
+ off_link = 1;
+ else if (unformat (i, "noauto"))
+ no_autoconfig = 1;
+ else if (unformat (i, "nolink"))
+ no_onlink = 1;
+ else if (unformat (i, "isno"))
+ is_no = 1;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
+ }
+
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
+ }
+ if (!v6_address_set)
+ {
+ errmsg ("no address set\n");
+ return -99;
+ }
- mp->sw_if_index = ntohl (sw_if_index);
- clib_memcpy (mp->address, &v6address, sizeof (v6address));
- mp->address_length = address_length;
- mp->use_default = use_default;
- mp->no_advertise = no_advertise;
- mp->off_link = off_link;
- mp->no_autoconfig = no_autoconfig;
- mp->no_onlink = no_onlink;
- mp->is_no = is_no;
- mp->val_lifetime = ntohl(val_lifetime);
- mp->pref_lifetime = ntohl(pref_lifetime);
-
- /* send it... */
- S;
+ /* Construct the API message */
+ M (SW_INTERFACE_IP6ND_RA_PREFIX, sw_interface_ip6nd_ra_prefix);
+
+ mp->sw_if_index = ntohl (sw_if_index);
+ clib_memcpy (mp->address, &v6address, sizeof (v6address));
+ mp->address_length = address_length;
+ mp->use_default = use_default;
+ mp->no_advertise = no_advertise;
+ mp->off_link = off_link;
+ mp->no_autoconfig = no_autoconfig;
+ mp->no_onlink = no_onlink;
+ mp->is_no = is_no;
+ mp->val_lifetime = ntohl (val_lifetime);
+ mp->pref_lifetime = ntohl (pref_lifetime);
- /* Wait for a reply, return good/bad news */
- W;
+ /* send it... */
+ S;
- /* NOTREACHED */
- return 0;
+ /* Wait for a reply, return good/bad news */
+ W;
+
+ /* NOTREACHED */
+ return 0;
}
-static int api_sw_interface_ip6nd_ra_config (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_sw_interface_ip6nd_ra_config_t *mp;
- f64 timeout;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
- u8 suppress = 0;
- u8 managed = 0;
- u8 other = 0;
- u8 ll_option = 0;
- u8 send_unicast = 0;
- u8 cease = 0;
- u8 is_no = 0;
- u8 default_router = 0;
- u32 max_interval = 0;
- u32 min_interval = 0;
- u32 lifetime = 0;
- u32 initial_count = 0;
- u32 initial_interval = 0;
-
-
- /* Parse args required to build the message */
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "maxint %d", &max_interval))
- ;
- else if (unformat (i, "minint %d", &min_interval))
- ;
- else if (unformat (i, "life %d", &lifetime))
- ;
- else if (unformat (i, "count %d", &initial_count))
- ;
- else if (unformat (i, "interval %d", &initial_interval))
- ;
- else if (unformat (i, "suppress") || unformat (i, "surpress"))
- suppress = 1;
- else if (unformat (i, "managed"))
- managed = 1;
- else if (unformat (i, "other"))
- other = 1;
- else if (unformat (i, "ll"))
- ll_option = 1;
- else if (unformat (i, "send"))
- send_unicast = 1;
- else if (unformat (i, "cease"))
- cease = 1;
- else if (unformat (i, "isno"))
- is_no = 1;
- else if (unformat (i, "def"))
- default_router = 1;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
- }
-
- if (sw_if_index_set == 0) {
- errmsg ("missing interface name or sw_if_index\n");
- return -99;
- }
-
- /* Construct the API message */
- M(SW_INTERFACE_IP6ND_RA_CONFIG, sw_interface_ip6nd_ra_config);
+static int
+api_sw_interface_ip6nd_ra_config (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_sw_interface_ip6nd_ra_config_t *mp;
+ f64 timeout;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
+ u8 suppress = 0;
+ u8 managed = 0;
+ u8 other = 0;
+ u8 ll_option = 0;
+ u8 send_unicast = 0;
+ u8 cease = 0;
+ u8 is_no = 0;
+ u8 default_router = 0;
+ u32 max_interval = 0;
+ u32 min_interval = 0;
+ u32 lifetime = 0;
+ u32 initial_count = 0;
+ u32 initial_interval = 0;
+
- mp->sw_if_index = ntohl (sw_if_index);
- mp->max_interval = ntohl(max_interval);
- mp->min_interval = ntohl(min_interval);
- mp->lifetime = ntohl(lifetime);
- mp->initial_count = ntohl(initial_count);
- mp->initial_interval = ntohl(initial_interval);
- mp->suppress = suppress;
- mp->managed = managed;
- mp->other = other;
- mp->ll_option = ll_option;
- mp->send_unicast = send_unicast;
- mp->cease = cease;
- mp->is_no = is_no;
- mp->default_router = default_router;
-
- /* send it... */
- S;
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "maxint %d", &max_interval))
+ ;
+ else if (unformat (i, "minint %d", &min_interval))
+ ;
+ else if (unformat (i, "life %d", &lifetime))
+ ;
+ else if (unformat (i, "count %d", &initial_count))
+ ;
+ else if (unformat (i, "interval %d", &initial_interval))
+ ;
+ else if (unformat (i, "suppress") || unformat (i, "surpress"))
+ suppress = 1;
+ else if (unformat (i, "managed"))
+ managed = 1;
+ else if (unformat (i, "other"))
+ other = 1;
+ else if (unformat (i, "ll"))
+ ll_option = 1;
+ else if (unformat (i, "send"))
+ send_unicast = 1;
+ else if (unformat (i, "cease"))
+ cease = 1;
+ else if (unformat (i, "isno"))
+ is_no = 1;
+ else if (unformat (i, "def"))
+ default_router = 1;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
+ }
- /* Wait for a reply, return good/bad news */
- W;
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
+ }
- /* NOTREACHED */
- return 0;
+ /* Construct the API message */
+ M (SW_INTERFACE_IP6ND_RA_CONFIG, sw_interface_ip6nd_ra_config);
+
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->max_interval = ntohl (max_interval);
+ mp->min_interval = ntohl (min_interval);
+ mp->lifetime = ntohl (lifetime);
+ mp->initial_count = ntohl (initial_count);
+ mp->initial_interval = ntohl (initial_interval);
+ mp->suppress = suppress;
+ mp->managed = managed;
+ mp->other = other;
+ mp->ll_option = ll_option;
+ mp->send_unicast = send_unicast;
+ mp->cease = cease;
+ mp->is_no = is_no;
+ mp->default_router = default_router;
+
+ /* send it... */
+ S;
+
+ /* Wait for a reply, return good/bad news */
+ W;
+
+ /* NOTREACHED */
+ return 0;
}
-static int api_set_arp_neighbor_limit (vat_main_t * vam)
+static int
+api_set_arp_neighbor_limit (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_set_arp_neighbor_limit_t *mp;
- f64 timeout;
- u32 arp_nbr_limit;
- u8 limit_set = 0;
- u8 is_ipv6 = 0;
+ unformat_input_t *i = vam->input;
+ vl_api_set_arp_neighbor_limit_t *mp;
+ f64 timeout;
+ u32 arp_nbr_limit;
+ u8 limit_set = 0;
+ u8 is_ipv6 = 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "arp_nbr_limit %d", &arp_nbr_limit))
- limit_set = 1;
- else if (unformat (i, "ipv6"))
- is_ipv6 = 1;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "arp_nbr_limit %d", &arp_nbr_limit))
+ limit_set = 1;
+ else if (unformat (i, "ipv6"))
+ is_ipv6 = 1;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (limit_set == 0) {
- errmsg ("missing limit value\n");
- return -99;
+ if (limit_set == 0)
+ {
+ errmsg ("missing limit value\n");
+ return -99;
}
- M(SET_ARP_NEIGHBOR_LIMIT, set_arp_neighbor_limit);
+ M (SET_ARP_NEIGHBOR_LIMIT, set_arp_neighbor_limit);
- mp->arp_neighbor_limit = ntohl(arp_nbr_limit);
- mp->is_ipv6 = is_ipv6;
+ mp->arp_neighbor_limit = ntohl (arp_nbr_limit);
+ mp->is_ipv6 = is_ipv6;
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_l2_patch_add_del (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_l2_patch_add_del_t *mp;
- f64 timeout;
- u32 rx_sw_if_index;
- u8 rx_sw_if_index_set = 0;
- u32 tx_sw_if_index;
- u8 tx_sw_if_index_set = 0;
- u8 is_add = 1;
-
- /* Parse args required to build the message */
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "rx_sw_if_index %d", &rx_sw_if_index))
- rx_sw_if_index_set = 1;
- else if (unformat (i, "tx_sw_if_index %d", &tx_sw_if_index))
- tx_sw_if_index_set = 1;
- else if (unformat (i, "rx")) {
- if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", unformat_sw_if_index, vam,
- &rx_sw_if_index))
- rx_sw_if_index_set = 1;
- } else
- break;
- } else if (unformat (i, "tx")) {
- if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", unformat_sw_if_index, vam,
- &tx_sw_if_index))
- tx_sw_if_index_set = 1;
- } else
- break;
- } else if (unformat (i, "del"))
- is_add = 0;
- else
- break;
+static int
+api_l2_patch_add_del (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_l2_patch_add_del_t *mp;
+ f64 timeout;
+ u32 rx_sw_if_index;
+ u8 rx_sw_if_index_set = 0;
+ u32 tx_sw_if_index;
+ u8 tx_sw_if_index_set = 0;
+ u8 is_add = 1;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "rx_sw_if_index %d", &rx_sw_if_index))
+ rx_sw_if_index_set = 1;
+ else if (unformat (i, "tx_sw_if_index %d", &tx_sw_if_index))
+ tx_sw_if_index_set = 1;
+ else if (unformat (i, "rx"))
+ {
+ if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", unformat_sw_if_index, vam,
+ &rx_sw_if_index))
+ rx_sw_if_index_set = 1;
+ }
+ else
+ break;
+ }
+ else if (unformat (i, "tx"))
+ {
+ if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", unformat_sw_if_index, vam,
+ &tx_sw_if_index))
+ tx_sw_if_index_set = 1;
+ }
+ else
+ break;
+ }
+ else if (unformat (i, "del"))
+ is_add = 0;
+ else
+ break;
}
- if (rx_sw_if_index_set == 0) {
- errmsg ("missing rx interface name or rx_sw_if_index\n");
- return -99;
+ if (rx_sw_if_index_set == 0)
+ {
+ errmsg ("missing rx interface name or rx_sw_if_index\n");
+ return -99;
}
- if (tx_sw_if_index_set == 0) {
- errmsg ("missing tx interface name or tx_sw_if_index\n");
- return -99;
+ if (tx_sw_if_index_set == 0)
+ {
+ errmsg ("missing tx interface name or tx_sw_if_index\n");
+ return -99;
}
- M(L2_PATCH_ADD_DEL, l2_patch_add_del);
+ M (L2_PATCH_ADD_DEL, l2_patch_add_del);
- mp->rx_sw_if_index = ntohl(rx_sw_if_index);
- mp->tx_sw_if_index = ntohl(tx_sw_if_index);
- mp->is_add = is_add;
+ mp->rx_sw_if_index = ntohl (rx_sw_if_index);
+ mp->tx_sw_if_index = ntohl (tx_sw_if_index);
+ mp->is_add = is_add;
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_trace_profile_add (vat_main_t *vam)
+
+static int
+api_trace_profile_add (vat_main_t * vam)
{
- unformat_input_t * input = vam->input;
- vl_api_trace_profile_add_t *mp;
- f64 timeout;
- u32 id = 0;
- u32 trace_option_elts = 0;
- u32 trace_type = 0, node_id = 0, app_data = 0, trace_tsp = 2;
- int has_pow_option = 0;
- int has_ppc_option = 0;
+ unformat_input_t *input = vam->input;
+ vl_api_trace_profile_add_t *mp;
+ f64 timeout;
+ u32 id = 0;
+ u32 trace_option_elts = 0;
+ u32 trace_type = 0, node_id = 0, app_data = 0, trace_tsp = 2;
+ int has_pow_option = 0;
+ int has_ppc_option = 0;
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
if (unformat (input, "id %d trace-type 0x%x trace-elts %d "
- "trace-tsp %d node-id 0x%x app-data 0x%x",
+ "trace-tsp %d node-id 0x%x app-data 0x%x",
&id, &trace_type, &trace_option_elts, &trace_tsp,
- &node_id, &app_data))
- ;
+ &node_id, &app_data))
+ ;
else if (unformat (input, "pow"))
- has_pow_option = 1;
+ has_pow_option = 1;
else if (unformat (input, "ppc encap"))
- has_ppc_option = PPC_ENCAP;
+ has_ppc_option = PPC_ENCAP;
else if (unformat (input, "ppc decap"))
- has_ppc_option = PPC_DECAP;
+ has_ppc_option = PPC_DECAP;
else if (unformat (input, "ppc none"))
- has_ppc_option = PPC_NONE;
+ has_ppc_option = PPC_NONE;
else
- break;
+ break;
}
- M(TRACE_PROFILE_ADD, trace_profile_add);
- mp->id = htons(id);
+ M (TRACE_PROFILE_ADD, trace_profile_add);
+ mp->id = htons (id);
mp->trace_type = trace_type;
mp->trace_num_elt = trace_option_elts;
mp->trace_ppc = has_ppc_option;
- mp->trace_app_data = htonl(app_data);
+ mp->trace_app_data = htonl (app_data);
mp->pow_enable = has_pow_option;
mp->trace_tsp = trace_tsp;
- mp->node_id = htonl(node_id);
+ mp->node_id = htonl (node_id);
- S; W;
+ S;
+ W;
- return(0);
+ return (0);
}
-static int api_trace_profile_apply (vat_main_t *vam)
+
+static int
+api_trace_profile_apply (vat_main_t * vam)
{
- unformat_input_t * input = vam->input;
+ unformat_input_t *input = vam->input;
vl_api_trace_profile_apply_t *mp;
f64 timeout;
ip6_address_t addr;
@@ -6487,36 +7049,37 @@ static int api_trace_profile_apply (vat_main_t *vam)
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (input, "%U/%d",
- unformat_ip6_address, &addr, &mask_width))
- ;
+ if (unformat (input, "%U/%d", unformat_ip6_address, &addr, &mask_width))
+ ;
else if (unformat (input, "id %d", &id))
;
else if (unformat (input, "vrf-id %d", &vrf_id))
- ;
+ ;
else if (unformat (input, "add"))
- is_add = 1;
+ is_add = 1;
else if (unformat (input, "pop"))
- is_pop = 1;
+ is_pop = 1;
else if (unformat (input, "none"))
- is_none = 1;
+ is_none = 1;
else
- break;
+ break;
}
- if ((is_add + is_pop + is_none) != 1) {
- errmsg("One of (add, pop, none) required");
- return -99;
- }
- if (mask_width == ~0) {
- errmsg("<address>/<mask-width> required");
- return -99;
- }
- M(TRACE_PROFILE_APPLY, trace_profile_apply);
- clib_memcpy(mp->dest_ipv6, &addr, sizeof(mp->dest_ipv6));
- mp->id = htons(id);
- mp->prefix_length = htonl(mask_width);
- mp->vrf_id = htonl(vrf_id);
+ if ((is_add + is_pop + is_none) != 1)
+ {
+ errmsg ("One of (add, pop, none) required");
+ return -99;
+ }
+ if (mask_width == ~0)
+ {
+ errmsg ("<address>/<mask-width> required");
+ return -99;
+ }
+ M (TRACE_PROFILE_APPLY, trace_profile_apply);
+ clib_memcpy (mp->dest_ipv6, &addr, sizeof (mp->dest_ipv6));
+ mp->id = htons (id);
+ mp->prefix_length = htonl (mask_width);
+ mp->vrf_id = htonl (vrf_id);
if (is_add)
mp->trace_op = IOAM_HBYH_ADD;
else if (is_pop)
@@ -6524,29 +7087,33 @@ static int api_trace_profile_apply (vat_main_t *vam)
else
mp->trace_op = IOAM_HBYH_MOD;
- if(is_none)
+ if (is_none)
mp->enable = 0;
else
mp->enable = 1;
- S; W;
+ S;
+ W;
return 0;
}
-static int api_trace_profile_del (vat_main_t *vam)
+static int
+api_trace_profile_del (vat_main_t * vam)
{
- vl_api_trace_profile_del_t *mp;
- f64 timeout;
+ vl_api_trace_profile_del_t *mp;
+ f64 timeout;
- M(TRACE_PROFILE_DEL, trace_profile_del);
- S; W;
- return 0;
+ M (TRACE_PROFILE_DEL, trace_profile_del);
+ S;
+ W;
+ return 0;
}
-static int api_sr_tunnel_add_del (vat_main_t * vam)
+static int
+api_sr_tunnel_add_del (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
+ unformat_input_t *i = vam->input;
vl_api_sr_tunnel_add_del_t *mp;
f64 timeout;
int is_del = 0;
@@ -6559,72 +7126,73 @@ static int api_sr_tunnel_add_del (vat_main_t * vam)
u16 flags = 0;
u32 rx_table_id = 0;
u32 tx_table_id = 0;
- ip6_address_t * segments = 0;
- ip6_address_t * this_seg;
- ip6_address_t * tags = 0;
- ip6_address_t * this_tag;
+ ip6_address_t *segments = 0;
+ ip6_address_t *this_seg;
+ ip6_address_t *tags = 0;
+ ip6_address_t *this_tag;
ip6_address_t next_address, tag;
- u8 * name = 0;
- u8 * policy_name = 0;
+ u8 *name = 0;
+ u8 *policy_name = 0;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
if (unformat (i, "del"))
- is_del = 1;
+ is_del = 1;
else if (unformat (i, "name %s", &name))
- ;
+ ;
else if (unformat (i, "policy %s", &policy_name))
- ;
+ ;
else if (unformat (i, "rx_fib_id %d", &rx_table_id))
- ;
+ ;
else if (unformat (i, "tx_fib_id %d", &tx_table_id))
- ;
+ ;
else if (unformat (i, "src %U", unformat_ip6_address, &src_address))
- src_address_set = 1;
+ src_address_set = 1;
else if (unformat (i, "dst %U/%d",
- unformat_ip6_address, &dst_address,
- &dst_mask_width))
- dst_address_set = 1;
- else if (unformat (i, "next %U", unformat_ip6_address,
- &next_address))
- {
- vec_add2 (segments, this_seg, 1);
- clib_memcpy (this_seg->as_u8, next_address.as_u8, sizeof (*this_seg));
- }
- else if (unformat (i, "tag %U", unformat_ip6_address,
- &tag))
- {
- vec_add2 (tags, this_tag, 1);
- clib_memcpy (this_tag->as_u8, tag.as_u8, sizeof (*this_tag));
- }
+ unformat_ip6_address, &dst_address, &dst_mask_width))
+ dst_address_set = 1;
+ else if (unformat (i, "next %U", unformat_ip6_address, &next_address))
+ {
+ vec_add2 (segments, this_seg, 1);
+ clib_memcpy (this_seg->as_u8, next_address.as_u8,
+ sizeof (*this_seg));
+ }
+ else if (unformat (i, "tag %U", unformat_ip6_address, &tag))
+ {
+ vec_add2 (tags, this_tag, 1);
+ clib_memcpy (this_tag->as_u8, tag.as_u8, sizeof (*this_tag));
+ }
else if (unformat (i, "clean"))
- flags |= IP6_SR_HEADER_FLAG_CLEANUP;
+ flags |= IP6_SR_HEADER_FLAG_CLEANUP;
else if (unformat (i, "protected"))
- flags |= IP6_SR_HEADER_FLAG_PROTECTED;
+ flags |= IP6_SR_HEADER_FLAG_PROTECTED;
else if (unformat (i, "InPE %d", &pl_index))
- {
- if (pl_index <= 0 || pl_index > 4)
- {
- pl_index_range_error:
- errmsg ("pl index %d out of range\n", pl_index);
- return -99;
- }
- flags |= IP6_SR_HEADER_FLAG_PL_ELT_INGRESS_PE << (3*(pl_index - 1));
- }
+ {
+ if (pl_index <= 0 || pl_index > 4)
+ {
+ pl_index_range_error:
+ errmsg ("pl index %d out of range\n", pl_index);
+ return -99;
+ }
+ flags |=
+ IP6_SR_HEADER_FLAG_PL_ELT_INGRESS_PE << (3 * (pl_index - 1));
+ }
else if (unformat (i, "EgPE %d", &pl_index))
- {
- if (pl_index <= 0 || pl_index > 4)
- goto pl_index_range_error;
- flags |= IP6_SR_HEADER_FLAG_PL_ELT_EGRESS_PE << (3*(pl_index - 1));
- }
+ {
+ if (pl_index <= 0 || pl_index > 4)
+ goto pl_index_range_error;
+ flags |=
+ IP6_SR_HEADER_FLAG_PL_ELT_EGRESS_PE << (3 * (pl_index - 1));
+ }
else if (unformat (i, "OrgSrc %d", &pl_index))
- {
- if (pl_index <= 0 || pl_index > 4)
- goto pl_index_range_error;
- flags |= IP6_SR_HEADER_FLAG_PL_ELT_ORIG_SRC_ADDR << (3*(pl_index - 1));
- }
+ {
+ if (pl_index <= 0 || pl_index > 4)
+ goto pl_index_range_error;
+ flags |=
+ IP6_SR_HEADER_FLAG_PL_ELT_ORIG_SRC_ADDR << (3 * (pl_index - 1));
+ }
else
- break;
+ break;
}
if (!src_address_set)
@@ -6645,9 +7213,9 @@ static int api_sr_tunnel_add_del (vat_main_t * vam)
return -99;
}
- M2(SR_TUNNEL_ADD_DEL, sr_tunnel_add_del,
- vec_len(segments) * sizeof (ip6_address_t)
- + vec_len(tags) * sizeof (ip6_address_t));
+ M2 (SR_TUNNEL_ADD_DEL, sr_tunnel_add_del,
+ vec_len (segments) * sizeof (ip6_address_t)
+ + vec_len (tags) * sizeof (ip6_address_t));
clib_memcpy (mp->src_address, &src_address, sizeof (mp->src_address));
clib_memcpy (mp->dst_address, &dst_address, sizeof (mp->dst_address));
@@ -6657,60 +7225,63 @@ static int api_sr_tunnel_add_del (vat_main_t * vam)
mp->n_tags = vec_len (tags);
mp->is_add = is_del == 0;
clib_memcpy (mp->segs_and_tags, segments,
- vec_len(segments)* sizeof (ip6_address_t));
- clib_memcpy (mp->segs_and_tags + vec_len(segments)*sizeof (ip6_address_t),
- tags, vec_len(tags)* sizeof (ip6_address_t));
+ vec_len (segments) * sizeof (ip6_address_t));
+ clib_memcpy (mp->segs_and_tags +
+ vec_len (segments) * sizeof (ip6_address_t), tags,
+ vec_len (tags) * sizeof (ip6_address_t));
mp->outer_vrf_id = ntohl (rx_table_id);
mp->inner_vrf_id = ntohl (tx_table_id);
- memcpy (mp->name, name, vec_len(name));
- memcpy (mp->policy_name, policy_name, vec_len(policy_name));
+ memcpy (mp->name, name, vec_len (name));
+ memcpy (mp->policy_name, policy_name, vec_len (policy_name));
vec_free (segments);
vec_free (tags);
- S; W;
+ S;
+ W;
/* NOTREACHED */
}
-static int api_sr_policy_add_del (vat_main_t * vam)
+static int
+api_sr_policy_add_del (vat_main_t * vam)
{
- unformat_input_t * input = vam->input;
+ unformat_input_t *input = vam->input;
vl_api_sr_policy_add_del_t *mp;
f64 timeout;
int is_del = 0;
- u8 * name = 0;
- u8 * tunnel_name = 0;
- u8 ** tunnel_names = 0;
+ u8 *name = 0;
+ u8 *tunnel_name = 0;
+ u8 **tunnel_names = 0;
- int name_set = 0 ;
+ int name_set = 0;
int tunnel_set = 0;
int j = 0;
- int tunnel_names_length = 1; // Init to 1 to offset the #tunnel_names counter byte
- int tun_name_len = 0; // Different naming convention used as confusing these would be "bad" (TM)
+ int tunnel_names_length = 1; // Init to 1 to offset the #tunnel_names counter byte
+ int tun_name_len = 0; // Different naming convention used as confusing these would be "bad" (TM)
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
if (unformat (input, "del"))
- is_del = 1;
+ is_del = 1;
else if (unformat (input, "name %s", &name))
name_set = 1;
else if (unformat (input, "tunnel %s", &tunnel_name))
- {
+ {
if (tunnel_name)
{
vec_add1 (tunnel_names, tunnel_name);
/* For serializer:
- - length = #bytes to store in serial vector
- - +1 = byte to store that length
- */
+ - length = #bytes to store in serial vector
+ - +1 = byte to store that length
+ */
tunnel_names_length += (vec_len (tunnel_name) + 1);
tunnel_set = 1;
tunnel_name = 0;
}
- }
+ }
else
- break;
+ break;
}
if (!name_set)
@@ -6725,56 +7296,60 @@ static int api_sr_policy_add_del (vat_main_t * vam)
return -99;
}
- M2(SR_POLICY_ADD_DEL, sr_policy_add_del, tunnel_names_length);
+ M2 (SR_POLICY_ADD_DEL, sr_policy_add_del, tunnel_names_length);
mp->is_add = !is_del;
- memcpy (mp->name, name, vec_len(name));
+ memcpy (mp->name, name, vec_len (name));
// Since mp->tunnel_names is of type u8[0] and not a u8 *, u8 ** needs to be serialized
- u8 * serial_orig = 0;
+ u8 *serial_orig = 0;
vec_validate (serial_orig, tunnel_names_length);
- *serial_orig = vec_len(tunnel_names); // Store the number of tunnels as length in first byte of serialized vector
- serial_orig += 1; // Move along one byte to store the length of first tunnel_name
+ *serial_orig = vec_len (tunnel_names); // Store the number of tunnels as length in first byte of serialized vector
+ serial_orig += 1; // Move along one byte to store the length of first tunnel_name
- for (j=0; j < vec_len(tunnel_names); j++)
+ for (j = 0; j < vec_len (tunnel_names); j++)
{
tun_name_len = vec_len (tunnel_names[j]);
- *serial_orig = tun_name_len; // Store length of tunnel name in first byte of Length/Value pair
- serial_orig += 1; // Move along one byte to store the actual tunnel name
+ *serial_orig = tun_name_len; // Store length of tunnel name in first byte of Length/Value pair
+ serial_orig += 1; // Move along one byte to store the actual tunnel name
memcpy (serial_orig, tunnel_names[j], tun_name_len);
- serial_orig += tun_name_len; // Advance past the copy
+ serial_orig += tun_name_len; // Advance past the copy
}
- memcpy (mp->tunnel_names, serial_orig - tunnel_names_length, tunnel_names_length); // Regress serial_orig to head then copy fwd
+ memcpy (mp->tunnel_names, serial_orig - tunnel_names_length, tunnel_names_length); // Regress serial_orig to head then copy fwd
vec_free (tunnel_names);
vec_free (tunnel_name);
- S; W;
+ S;
+ W;
/* NOTREACHED */
}
-static int api_sr_multicast_map_add_del (vat_main_t * vam)
+static int
+api_sr_multicast_map_add_del (vat_main_t * vam)
{
- unformat_input_t * input = vam->input;
+ unformat_input_t *input = vam->input;
vl_api_sr_multicast_map_add_del_t *mp;
f64 timeout;
int is_del = 0;
ip6_address_t multicast_address;
- u8 * policy_name = 0;
+ u8 *policy_name = 0;
int multicast_address_set = 0;
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
if (unformat (input, "del"))
- is_del = 1;
- else if (unformat (input, "address %U", unformat_ip6_address, &multicast_address))
+ is_del = 1;
+ else
+ if (unformat
+ (input, "address %U", unformat_ip6_address, &multicast_address))
multicast_address_set = 1;
else if (unformat (input, "sr-policy %s", &policy_name))
- ;
+ ;
else
- break;
+ break;
}
if (!is_del && !policy_name)
@@ -6790,16 +7365,18 @@ static int api_sr_multicast_map_add_del (vat_main_t * vam)
return -99;
}
- M(SR_MULTICAST_MAP_ADD_DEL, sr_multicast_map_add_del);
+ M (SR_MULTICAST_MAP_ADD_DEL, sr_multicast_map_add_del);
mp->is_add = !is_del;
- memcpy (mp->policy_name, policy_name, vec_len(policy_name));
- clib_memcpy (mp->multicast_address, &multicast_address, sizeof (mp->multicast_address));
+ memcpy (mp->policy_name, policy_name, vec_len (policy_name));
+ clib_memcpy (mp->multicast_address, &multicast_address,
+ sizeof (mp->multicast_address));
vec_free (policy_name);
- S; W;
+ S;
+ W;
/* NOTREACHED */
}
@@ -6814,12 +7391,13 @@ _(ttl) \
_(protocol) \
_(checksum)
-uword unformat_ip4_mask (unformat_input_t * input, va_list * args)
+uword
+unformat_ip4_mask (unformat_input_t * input, va_list * args)
{
- u8 ** maskp = va_arg (*args, u8 **);
- u8 * mask = 0;
+ u8 **maskp = va_arg (*args, u8 **);
+ u8 *mask = 0;
u8 found_something = 0;
- ip4_header_t * ip;
+ ip4_header_t *ip;
#define _(a) u8 a=0;
foreach_ip4_proto_field;
@@ -6831,21 +7409,21 @@ uword unformat_ip4_mask (unformat_input_t * input, va_list * args)
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
if (unformat (input, "version"))
- version = 1;
+ version = 1;
else if (unformat (input, "hdr_length"))
- hdr_length = 1;
+ hdr_length = 1;
else if (unformat (input, "src"))
- src_address = 1;
+ src_address = 1;
else if (unformat (input, "dst"))
- dst_address = 1;
+ dst_address = 1;
else if (unformat (input, "proto"))
- protocol = 1;
+ protocol = 1;
#define _(a) else if (unformat (input, #a)) a=1;
foreach_ip4_proto_field
#undef _
- else
- break;
+ else
+ break;
}
#define _(a) found_something += a;
@@ -6882,12 +7460,13 @@ _(payload_length) \
_(hop_limit) \
_(protocol)
-uword unformat_ip6_mask (unformat_input_t * input, va_list * args)
+uword
+unformat_ip6_mask (unformat_input_t * input, va_list * args)
{
- u8 ** maskp = va_arg (*args, u8 **);
- u8 * mask = 0;
+ u8 **maskp = va_arg (*args, u8 **);
+ u8 *mask = 0;
u8 found_something = 0;
- ip6_header_t * ip;
+ ip6_header_t *ip;
u32 ip_version_traffic_class_and_flow_label;
#define _(a) u8 a=0;
@@ -6900,23 +7479,23 @@ uword unformat_ip6_mask (unformat_input_t * input, va_list * args)
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
if (unformat (input, "version"))
- version = 1;
+ version = 1;
else if (unformat (input, "traffic-class"))
- traffic_class = 1;
+ traffic_class = 1;
else if (unformat (input, "flow-label"))
- flow_label = 1;
+ flow_label = 1;
else if (unformat (input, "src"))
- src_address = 1;
+ src_address = 1;
else if (unformat (input, "dst"))
- dst_address = 1;
+ dst_address = 1;
else if (unformat (input, "proto"))
- protocol = 1;
+ protocol = 1;
#define _(a) else if (unformat (input, #a)) a=1;
foreach_ip6_proto_field
#undef _
- else
- break;
+ else
+ break;
}
#define _(a) found_something += a;
@@ -6952,25 +7531,28 @@ uword unformat_ip6_mask (unformat_input_t * input, va_list * args)
return 1;
}
-uword unformat_l3_mask (unformat_input_t * input, va_list * args)
+uword
+unformat_l3_mask (unformat_input_t * input, va_list * args)
{
- u8 ** maskp = va_arg (*args, u8 **);
+ u8 **maskp = va_arg (*args, u8 **);
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
- if (unformat (input, "ip4 %U", unformat_ip4_mask, maskp))
- return 1;
- else if (unformat (input, "ip6 %U", unformat_ip6_mask, maskp))
- return 1;
- else
- break;
- }
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "ip4 %U", unformat_ip4_mask, maskp))
+ return 1;
+ else if (unformat (input, "ip6 %U", unformat_ip6_mask, maskp))
+ return 1;
+ else
+ break;
+ }
return 0;
}
-uword unformat_l2_mask (unformat_input_t * input, va_list * args)
+uword
+unformat_l2_mask (unformat_input_t * input, va_list * args)
{
- u8 ** maskp = va_arg (*args, u8 **);
- u8 * mask = 0;
+ u8 **maskp = va_arg (*args, u8 **);
+ u8 *mask = 0;
u8 src = 0;
u8 dst = 0;
u8 proto = 0;
@@ -6984,34 +7566,35 @@ uword unformat_l2_mask (unformat_input_t * input, va_list * args)
u8 dot1ad = 0;
int len = 14;
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
- if (unformat (input, "src"))
- src = 1;
- else if (unformat (input, "dst"))
- dst = 1;
- else if (unformat (input, "proto"))
- proto = 1;
- else if (unformat (input, "tag1"))
- tag1 = 1;
- else if (unformat (input, "tag2"))
- tag2 = 1;
- else if (unformat (input, "ignore-tag1"))
- ignore_tag1 = 1;
- else if (unformat (input, "ignore-tag2"))
- ignore_tag2 = 1;
- else if (unformat (input, "cos1"))
- cos1 = 1;
- else if (unformat (input, "cos2"))
- cos2 = 1;
- else if (unformat (input, "dot1q"))
- dot1q = 1;
- else if (unformat (input, "dot1ad"))
- dot1ad = 1;
- else
- break;
- }
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "src"))
+ src = 1;
+ else if (unformat (input, "dst"))
+ dst = 1;
+ else if (unformat (input, "proto"))
+ proto = 1;
+ else if (unformat (input, "tag1"))
+ tag1 = 1;
+ else if (unformat (input, "tag2"))
+ tag2 = 1;
+ else if (unformat (input, "ignore-tag1"))
+ ignore_tag1 = 1;
+ else if (unformat (input, "ignore-tag2"))
+ ignore_tag2 = 1;
+ else if (unformat (input, "cos1"))
+ cos1 = 1;
+ else if (unformat (input, "cos2"))
+ cos2 = 1;
+ else if (unformat (input, "dot1q"))
+ dot1q = 1;
+ else if (unformat (input, "dot1ad"))
+ dot1ad = 1;
+ else
+ break;
+ }
if ((src + dst + proto + tag1 + tag2 + dot1q + dot1ad +
- ignore_tag1 + ignore_tag2 + cos1 + cos2) == 0)
+ ignore_tag1 + ignore_tag2 + cos1 + cos2) == 0)
return 0;
if (tag1 || ignore_tag1 || cos1 || dot1q)
@@ -7019,7 +7602,7 @@ uword unformat_l2_mask (unformat_input_t * input, va_list * args)
if (tag2 || ignore_tag2 || cos2 || dot1ad)
len = 22;
- vec_validate (mask, len-1);
+ vec_validate (mask, len - 1);
if (dst)
memset (mask, 0xff, 6);
@@ -7031,35 +7614,35 @@ uword unformat_l2_mask (unformat_input_t * input, va_list * args)
{
/* inner vlan tag */
if (tag2)
- {
- mask[19] = 0xff;
- mask[18] = 0x0f;
- }
+ {
+ mask[19] = 0xff;
+ mask[18] = 0x0f;
+ }
if (cos2)
- mask[18] |= 0xe0;
+ mask[18] |= 0xe0;
if (proto)
- mask[21] = mask [20] = 0xff;
+ mask[21] = mask[20] = 0xff;
if (tag1)
- {
- mask [15] = 0xff;
- mask [14] = 0x0f;
- }
+ {
+ mask[15] = 0xff;
+ mask[14] = 0x0f;
+ }
if (cos1)
- mask[14] |= 0xe0;
+ mask[14] |= 0xe0;
*maskp = mask;
return 1;
}
if (tag1 | dot1q)
{
if (tag1)
- {
- mask [15] = 0xff;
- mask [14] = 0x0f;
- }
+ {
+ mask[15] = 0xff;
+ mask[14] = 0x0f;
+ }
if (cos1)
- mask[14] |= 0xe0;
+ mask[14] |= 0xe0;
if (proto)
- mask[16] = mask [17] = 0xff;
+ mask[16] = mask[17] = 0xff;
*maskp = mask;
return 1;
@@ -7069,72 +7652,74 @@ uword unformat_l2_mask (unformat_input_t * input, va_list * args)
if (cos1)
mask[14] |= 0xe0;
if (proto)
- mask[12] = mask [13] = 0xff;
+ mask[12] = mask[13] = 0xff;
*maskp = mask;
return 1;
}
-uword unformat_classify_mask (unformat_input_t * input, va_list * args)
+uword
+unformat_classify_mask (unformat_input_t * input, va_list * args)
{
- u8 ** maskp = va_arg (*args, u8 **);
- u32 * skipp = va_arg (*args, u32 *);
- u32 * matchp = va_arg (*args, u32 *);
+ u8 **maskp = va_arg (*args, u8 **);
+ u32 *skipp = va_arg (*args, u32 *);
+ u32 *matchp = va_arg (*args, u32 *);
u32 match;
- u8 * mask = 0;
- u8 * l2 = 0;
- u8 * l3 = 0;
+ u8 *mask = 0;
+ u8 *l2 = 0;
+ u8 *l3 = 0;
int i;
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
- if (unformat (input, "hex %U", unformat_hex_string, &mask))
- ;
- else if (unformat (input, "l2 %U", unformat_l2_mask, &l2))
- ;
- else if (unformat (input, "l3 %U", unformat_l3_mask, &l3))
- ;
- else
- break;
- }
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "hex %U", unformat_hex_string, &mask))
+ ;
+ else if (unformat (input, "l2 %U", unformat_l2_mask, &l2))
+ ;
+ else if (unformat (input, "l3 %U", unformat_l3_mask, &l3))
+ ;
+ else
+ break;
+ }
if (mask || l2 || l3)
{
if (l2 || l3)
- {
- /* "With a free Ethernet header in every package" */
- if (l2 == 0)
- vec_validate (l2, 13);
- mask = l2;
- vec_append (mask, l3);
- vec_free (l3);
- }
+ {
+ /* "With a free Ethernet header in every package" */
+ if (l2 == 0)
+ vec_validate (l2, 13);
+ mask = l2;
+ vec_append (mask, l3);
+ vec_free (l3);
+ }
/* Scan forward looking for the first significant mask octet */
for (i = 0; i < vec_len (mask); i++)
- if (mask[i])
- break;
+ if (mask[i])
+ break;
/* compute (skip, match) params */
- *skipp = i / sizeof(u32x4);
- vec_delete (mask, *skipp * sizeof(u32x4), 0);
+ *skipp = i / sizeof (u32x4);
+ vec_delete (mask, *skipp * sizeof (u32x4), 0);
/* Pad mask to an even multiple of the vector size */
while (vec_len (mask) % sizeof (u32x4))
- vec_add1 (mask, 0);
+ vec_add1 (mask, 0);
match = vec_len (mask) / sizeof (u32x4);
- for (i = match*sizeof(u32x4); i > 0; i-= sizeof(u32x4))
- {
- u64 *tmp = (u64 *)(mask + (i-sizeof(u32x4)));
- if (*tmp || *(tmp+1))
- break;
- match--;
- }
+ for (i = match * sizeof (u32x4); i > 0; i -= sizeof (u32x4))
+ {
+ u64 *tmp = (u64 *) (mask + (i - sizeof (u32x4)));
+ if (*tmp || *(tmp + 1))
+ break;
+ match--;
+ }
if (match == 0)
- clib_warning ("BUG: match 0");
+ clib_warning ("BUG: match 0");
- _vec_len (mask) = match * sizeof(u32x4);
+ _vec_len (mask) = match * sizeof (u32x4);
*matchp = match;
*maskp = mask;
@@ -7151,9 +7736,10 @@ _(ethernet, ETHERNET_INPUT) \
_(ip4, IP4_INPUT) \
_(ip6, IP6_INPUT)
-uword unformat_l2_next_index (unformat_input_t * input, va_list * args)
+uword
+unformat_l2_next_index (unformat_input_t * input, va_list * args)
{
- u32 * miss_next_indexp = va_arg (*args, u32 *);
+ u32 *miss_next_indexp = va_arg (*args, u32 *);
u32 next_index = 0;
u32 tmp;
@@ -7170,7 +7756,7 @@ uword unformat_l2_next_index (unformat_input_t * input, va_list * args)
return 0;
- out:
+out:
*miss_next_indexp = next_index;
return 1;
}
@@ -7181,9 +7767,10 @@ _(drop, DROP) \
_(local, LOCAL) \
_(rewrite, REWRITE)
-uword unformat_ip_next_index (unformat_input_t * input, va_list * args)
+uword
+unformat_ip_next_index (unformat_input_t * input, va_list * args)
{
- u32 * miss_next_indexp = va_arg (*args, u32 *);
+ u32 *miss_next_indexp = va_arg (*args, u32 *);
u32 next_index = 0;
u32 tmp;
@@ -7200,7 +7787,7 @@ uword unformat_ip_next_index (unformat_input_t * input, va_list * args)
return 0;
- out:
+out:
*miss_next_indexp = next_index;
return 1;
}
@@ -7208,9 +7795,10 @@ uword unformat_ip_next_index (unformat_input_t * input, va_list * args)
#define foreach_acl_next \
_(deny, DENY)
-uword unformat_acl_next_index (unformat_input_t * input, va_list * args)
+uword
+unformat_acl_next_index (unformat_input_t * input, va_list * args)
{
- u32 * miss_next_indexp = va_arg (*args, u32 *);
+ u32 *miss_next_indexp = va_arg (*args, u32 *);
u32 next_index = 0;
u32 tmp;
@@ -7232,14 +7820,15 @@ uword unformat_acl_next_index (unformat_input_t * input, va_list * args)
return 0;
- out:
+out:
*miss_next_indexp = next_index;
return 1;
}
-uword unformat_policer_precolor (unformat_input_t * input, va_list * args)
+uword
+unformat_policer_precolor (unformat_input_t * input, va_list * args)
{
- u32 * r = va_arg (*args, u32 *);
+ u32 *r = va_arg (*args, u32 *);
if (unformat (input, "conform-color"))
*r = POLICE_CONFORM;
@@ -7251,9 +7840,10 @@ uword unformat_policer_precolor (unformat_input_t * input, va_list * args)
return 1;
}
-static int api_classify_add_del_table (vat_main_t * vam)
+static int
+api_classify_add_del_table (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
+ unformat_input_t *i = vam->input;
vl_api_classify_add_del_table_t *mp;
u32 nbuckets = 2;
@@ -7263,85 +7853,91 @@ static int api_classify_add_del_table (vat_main_t * vam)
u32 table_index = ~0;
u32 next_table_index = ~0;
u32 miss_next_index = ~0;
- u32 memory_size = 32<<20;
- u8 * mask = 0;
+ u32 memory_size = 32 << 20;
+ u8 *mask = 0;
f64 timeout;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "del"))
- is_add = 0;
- else if (unformat (i, "buckets %d", &nbuckets))
- ;
- else if (unformat (i, "memory_size %d", &memory_size))
- ;
- else if (unformat (i, "skip %d", &skip))
- ;
- else if (unformat (i, "match %d", &match))
- ;
- else if (unformat (i, "table %d", &table_index))
- ;
- else if (unformat (i, "mask %U", unformat_classify_mask,
- &mask, &skip, &match))
- ;
- else if (unformat (i, "next-table %d", &next_table_index))
- ;
- else if (unformat (i, "miss-next %U", unformat_ip_next_index,
- &miss_next_index))
- ;
- else if (unformat (i, "l2-miss-next %U", unformat_l2_next_index,
- &miss_next_index))
- ;
- else if (unformat (i, "acl-miss-next %U", unformat_acl_next_index,
- &miss_next_index))
- ;
- else
- break;
- }
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "del"))
+ is_add = 0;
+ else if (unformat (i, "buckets %d", &nbuckets))
+ ;
+ else if (unformat (i, "memory_size %d", &memory_size))
+ ;
+ else if (unformat (i, "skip %d", &skip))
+ ;
+ else if (unformat (i, "match %d", &match))
+ ;
+ else if (unformat (i, "table %d", &table_index))
+ ;
+ else if (unformat (i, "mask %U", unformat_classify_mask,
+ &mask, &skip, &match))
+ ;
+ else if (unformat (i, "next-table %d", &next_table_index))
+ ;
+ else if (unformat (i, "miss-next %U", unformat_ip_next_index,
+ &miss_next_index))
+ ;
+ else if (unformat (i, "l2-miss-next %U", unformat_l2_next_index,
+ &miss_next_index))
+ ;
+ else if (unformat (i, "acl-miss-next %U", unformat_acl_next_index,
+ &miss_next_index))
+ ;
+ else
+ break;
+ }
- if (is_add && mask == 0) {
+ if (is_add && mask == 0)
+ {
errmsg ("Mask required\n");
return -99;
- }
+ }
- if (is_add && skip == ~0) {
+ if (is_add && skip == ~0)
+ {
errmsg ("skip count required\n");
return -99;
- }
+ }
- if (is_add && match == ~0) {
+ if (is_add && match == ~0)
+ {
errmsg ("match count required\n");
return -99;
- }
+ }
- if (!is_add && table_index == ~0) {
+ if (!is_add && table_index == ~0)
+ {
errmsg ("table index required for delete\n");
return -99;
- }
+ }
- M2 (CLASSIFY_ADD_DEL_TABLE, classify_add_del_table,
- vec_len(mask));
+ M2 (CLASSIFY_ADD_DEL_TABLE, classify_add_del_table, vec_len (mask));
mp->is_add = is_add;
- mp->table_index = ntohl(table_index);
- mp->nbuckets = ntohl(nbuckets);
- mp->memory_size = ntohl(memory_size);
- mp->skip_n_vectors = ntohl(skip);
- mp->match_n_vectors = ntohl(match);
- mp->next_table_index = ntohl(next_table_index);
- mp->miss_next_index = ntohl(miss_next_index);
- clib_memcpy (mp->mask, mask, vec_len(mask));
-
- vec_free(mask);
-
- S; W;
+ mp->table_index = ntohl (table_index);
+ mp->nbuckets = ntohl (nbuckets);
+ mp->memory_size = ntohl (memory_size);
+ mp->skip_n_vectors = ntohl (skip);
+ mp->match_n_vectors = ntohl (match);
+ mp->next_table_index = ntohl (next_table_index);
+ mp->miss_next_index = ntohl (miss_next_index);
+ clib_memcpy (mp->mask, mask, vec_len (mask));
+
+ vec_free (mask);
+
+ S;
+ W;
/* NOTREACHED */
}
-uword unformat_ip4_match (unformat_input_t * input, va_list * args)
+uword
+unformat_ip4_match (unformat_input_t * input, va_list * args)
{
- u8 ** matchp = va_arg (*args, u8 **);
- u8 * match = 0;
- ip4_header_t * ip;
+ u8 **matchp = va_arg (*args, u8 **);
+ u8 *match = 0;
+ ip4_header_t *ip;
int version = 0;
u32 version_val;
int hdr_length = 0;
@@ -7364,27 +7960,27 @@ uword unformat_ip4_match (unformat_input_t * input, va_list * args)
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
if (unformat (input, "version %d", &version_val))
- version = 1;
+ version = 1;
else if (unformat (input, "hdr_length %d", &hdr_length_val))
- hdr_length = 1;
+ hdr_length = 1;
else if (unformat (input, "src %U", unformat_ip4_address, &src_val))
- src = 1;
+ src = 1;
else if (unformat (input, "dst %U", unformat_ip4_address, &dst_val))
- dst = 1;
+ dst = 1;
else if (unformat (input, "proto %d", &proto_val))
- proto = 1;
+ proto = 1;
else if (unformat (input, "tos %d", &tos_val))
- tos = 1;
+ tos = 1;
else if (unformat (input, "length %d", &length_val))
- length = 1;
+ length = 1;
else if (unformat (input, "fragment_id %d", &fragment_id_val))
- fragment_id = 1;
+ fragment_id = 1;
else if (unformat (input, "ttl %d", &ttl_val))
- ttl = 1;
+ ttl = 1;
else if (unformat (input, "checksum %d", &checksum_val))
- checksum = 1;
+ checksum = 1;
else
- break;
+ break;
}
if (version + hdr_length + src + dst + proto + tos + length + fragment_id
@@ -7394,7 +7990,7 @@ uword unformat_ip4_match (unformat_input_t * input, va_list * args)
/*
* Aligned because we use the real comparison functions
*/
- vec_validate_aligned (match, sizeof (*ip) - 1, sizeof(u32x4));
+ vec_validate_aligned (match, sizeof (*ip) - 1, sizeof (u32x4));
ip = (ip4_header_t *) match;
@@ -7411,7 +8007,7 @@ uword unformat_ip4_match (unformat_input_t * input, va_list * args)
/* These are not, but they're included for completeness */
if (version)
- ip->ip_version_and_header_length |= (version_val & 0xF)<<4;
+ ip->ip_version_and_header_length |= (version_val & 0xF) << 4;
if (hdr_length)
ip->ip_version_and_header_length |= (hdr_length_val & 0xF);
@@ -7432,17 +8028,18 @@ uword unformat_ip4_match (unformat_input_t * input, va_list * args)
return 1;
}
-uword unformat_ip6_match (unformat_input_t * input, va_list * args)
+uword
+unformat_ip6_match (unformat_input_t * input, va_list * args)
{
- u8 ** matchp = va_arg (*args, u8 **);
- u8 * match = 0;
- ip6_header_t * ip;
+ u8 **matchp = va_arg (*args, u8 **);
+ u8 *match = 0;
+ ip6_header_t *ip;
int version = 0;
u32 version_val;
- u8 traffic_class;
+ u8 traffic_class;
u32 traffic_class_val;
- u8 flow_label;
- u8 flow_label_val;
+ u8 flow_label;
+ u8 flow_label_val;
int src = 0, dst = 0;
ip6_address_t src_val, dst_val;
int proto = 0;
@@ -7456,23 +8053,23 @@ uword unformat_ip6_match (unformat_input_t * input, va_list * args)
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
if (unformat (input, "version %d", &version_val))
- version = 1;
+ version = 1;
else if (unformat (input, "traffic_class %d", &traffic_class_val))
- traffic_class = 1;
+ traffic_class = 1;
else if (unformat (input, "flow_label %d", &flow_label_val))
- flow_label = 1;
+ flow_label = 1;
else if (unformat (input, "src %U", unformat_ip6_address, &src_val))
- src = 1;
+ src = 1;
else if (unformat (input, "dst %U", unformat_ip6_address, &dst_val))
- dst = 1;
+ dst = 1;
else if (unformat (input, "proto %d", &proto_val))
- proto = 1;
+ proto = 1;
else if (unformat (input, "payload_length %d", &payload_length_val))
- payload_length = 1;
+ payload_length = 1;
else if (unformat (input, "hop_limit %d", &hop_limit_val))
- hop_limit = 1;
+ hop_limit = 1;
else
- break;
+ break;
}
if (version + traffic_class + flow_label + src + dst + proto +
@@ -7482,7 +8079,7 @@ uword unformat_ip6_match (unformat_input_t * input, va_list * args)
/*
* Aligned because we use the real comparison functions
*/
- vec_validate_aligned (match, sizeof (*ip) - 1, sizeof(u32x4));
+ vec_validate_aligned (match, sizeof (*ip) - 1, sizeof (u32x4));
ip = (ip6_header_t *) match;
@@ -7501,7 +8098,8 @@ uword unformat_ip6_match (unformat_input_t * input, va_list * args)
ip_version_traffic_class_and_flow_label |= (version_val & 0xF) << 28;
if (traffic_class)
- ip_version_traffic_class_and_flow_label |= (traffic_class_val & 0xFF) << 20;
+ ip_version_traffic_class_and_flow_label |=
+ (traffic_class_val & 0xFF) << 20;
if (flow_label)
ip_version_traffic_class_and_flow_label |= (flow_label_val & 0xFFFFF);
@@ -7519,29 +8117,32 @@ uword unformat_ip6_match (unformat_input_t * input, va_list * args)
return 1;
}
-uword unformat_l3_match (unformat_input_t * input, va_list * args)
+uword
+unformat_l3_match (unformat_input_t * input, va_list * args)
{
- u8 ** matchp = va_arg (*args, u8 **);
+ u8 **matchp = va_arg (*args, u8 **);
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
- if (unformat (input, "ip4 %U", unformat_ip4_match, matchp))
- return 1;
- else if (unformat (input, "ip6 %U", unformat_ip6_match, matchp))
- return 1;
- else
- break;
- }
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "ip4 %U", unformat_ip4_match, matchp))
+ return 1;
+ else if (unformat (input, "ip6 %U", unformat_ip6_match, matchp))
+ return 1;
+ else
+ break;
+ }
return 0;
}
-uword unformat_vlan_tag (unformat_input_t * input, va_list * args)
+uword
+unformat_vlan_tag (unformat_input_t * input, va_list * args)
{
- u8 * tagp = va_arg (*args, u8 *);
+ u8 *tagp = va_arg (*args, u8 *);
u32 tag;
- if (unformat(input, "%d", &tag))
+ if (unformat (input, "%d", &tag))
{
- tagp[0] = (tag>>8) & 0x0F;
+ tagp[0] = (tag >> 8) & 0x0F;
tagp[1] = tag & 0xFF;
return 1;
}
@@ -7549,10 +8150,11 @@ uword unformat_vlan_tag (unformat_input_t * input, va_list * args)
return 0;
}
-uword unformat_l2_match (unformat_input_t * input, va_list * args)
+uword
+unformat_l2_match (unformat_input_t * input, va_list * args)
{
- u8 ** matchp = va_arg (*args, u8 **);
- u8 * match = 0;
+ u8 **matchp = va_arg (*args, u8 **);
+ u8 *match = 0;
u8 src = 0;
u8 src_val[6];
u8 dst = 0;
@@ -7560,9 +8162,9 @@ uword unformat_l2_match (unformat_input_t * input, va_list * args)
u8 proto = 0;
u16 proto_val;
u8 tag1 = 0;
- u8 tag1_val [2];
+ u8 tag1_val[2];
u8 tag2 = 0;
- u8 tag2_val [2];
+ u8 tag2_val[2];
int len = 14;
u8 ignore_tag1 = 0;
u8 ignore_tag2 = 0;
@@ -7571,31 +8173,33 @@ uword unformat_l2_match (unformat_input_t * input, va_list * args)
u32 cos1_val = 0;
u32 cos2_val = 0;
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
- if (unformat (input, "src %U", unformat_ethernet_address, &src_val))
- src = 1;
- else if (unformat (input, "dst %U", unformat_ethernet_address, &dst_val))
- dst = 1;
- else if (unformat (input, "proto %U",
- unformat_ethernet_type_host_byte_order, &proto_val))
- proto = 1;
- else if (unformat (input, "tag1 %U", unformat_vlan_tag, tag1_val))
- tag1 = 1;
- else if (unformat (input, "tag2 %U", unformat_vlan_tag, tag2_val))
- tag2 = 1;
- else if (unformat (input, "ignore-tag1"))
- ignore_tag1 = 1;
- else if (unformat (input, "ignore-tag2"))
- ignore_tag2 = 1;
- else if (unformat (input, "cos1 %d", &cos1_val))
- cos1 = 1;
- else if (unformat (input, "cos2 %d", &cos2_val))
- cos2 = 1;
- else
- break;
- }
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "src %U", unformat_ethernet_address, &src_val))
+ src = 1;
+ else
+ if (unformat (input, "dst %U", unformat_ethernet_address, &dst_val))
+ dst = 1;
+ else if (unformat (input, "proto %U",
+ unformat_ethernet_type_host_byte_order, &proto_val))
+ proto = 1;
+ else if (unformat (input, "tag1 %U", unformat_vlan_tag, tag1_val))
+ tag1 = 1;
+ else if (unformat (input, "tag2 %U", unformat_vlan_tag, tag2_val))
+ tag2 = 1;
+ else if (unformat (input, "ignore-tag1"))
+ ignore_tag1 = 1;
+ else if (unformat (input, "ignore-tag2"))
+ ignore_tag2 = 1;
+ else if (unformat (input, "cos1 %d", &cos1_val))
+ cos1 = 1;
+ else if (unformat (input, "cos2 %d", &cos2_val))
+ cos2 = 1;
+ else
+ break;
+ }
if ((src + dst + proto + tag1 + tag2 +
- ignore_tag1 + ignore_tag2 + cos1 + cos2) == 0)
+ ignore_tag1 + ignore_tag2 + cos1 + cos2) == 0)
return 0;
if (tag1 || ignore_tag1 || cos1)
@@ -7603,7 +8207,7 @@ uword unformat_l2_match (unformat_input_t * input, va_list * args)
if (tag2 || ignore_tag2 || cos2)
len = 22;
- vec_validate_aligned (match, len-1, sizeof(u32x4));
+ vec_validate_aligned (match, len - 1, sizeof (u32x4));
if (dst)
clib_memcpy (match, dst_val, 6);
@@ -7617,41 +8221,41 @@ uword unformat_l2_match (unformat_input_t * input, va_list * args)
match[19] = tag2_val[1];
match[18] = tag2_val[0];
if (cos2)
- match [18] |= (cos2_val & 0x7) << 5;
+ match[18] |= (cos2_val & 0x7) << 5;
if (proto)
- {
- match[21] = proto_val & 0xff;
- match[20] = proto_val >> 8;
- }
+ {
+ match[21] = proto_val & 0xff;
+ match[20] = proto_val >> 8;
+ }
if (tag1)
- {
- match [15] = tag1_val[1];
- match [14] = tag1_val[0];
- }
+ {
+ match[15] = tag1_val[1];
+ match[14] = tag1_val[0];
+ }
if (cos1)
- match [14] |= (cos1_val & 0x7) << 5;
+ match[14] |= (cos1_val & 0x7) << 5;
*matchp = match;
return 1;
}
if (tag1)
{
- match [15] = tag1_val[1];
- match [14] = tag1_val[0];
+ match[15] = tag1_val[1];
+ match[14] = tag1_val[0];
if (proto)
- {
- match[17] = proto_val & 0xff;
- match[16] = proto_val >> 8;
- }
+ {
+ match[17] = proto_val & 0xff;
+ match[16] = proto_val >> 8;
+ }
if (cos1)
- match [14] |= (cos1_val & 0x7) << 5;
+ match[14] |= (cos1_val & 0x7) << 5;
*matchp = match;
return 1;
}
if (cos2)
- match [18] |= (cos2_val & 0x7) << 5;
+ match[18] |= (cos2_val & 0x7) << 5;
if (cos1)
- match [14] |= (cos1_val & 0x7) << 5;
+ match[14] |= (cos1_val & 0x7) << 5;
if (proto)
{
match[13] = proto_val & 0xff;
@@ -7663,46 +8267,48 @@ uword unformat_l2_match (unformat_input_t * input, va_list * args)
}
-uword unformat_classify_match (unformat_input_t * input, va_list * args)
+uword
+unformat_classify_match (unformat_input_t * input, va_list * args)
{
- u8 ** matchp = va_arg (*args, u8 **);
+ u8 **matchp = va_arg (*args, u8 **);
u32 skip_n_vectors = va_arg (*args, u32);
u32 match_n_vectors = va_arg (*args, u32);
- u8 * match = 0;
- u8 * l2 = 0;
- u8 * l3 = 0;
-
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
- if (unformat (input, "hex %U", unformat_hex_string, &match))
- ;
- else if (unformat (input, "l2 %U", unformat_l2_match, &l2))
- ;
- else if (unformat (input, "l3 %U", unformat_l3_match, &l3))
- ;
- else
- break;
- }
+ u8 *match = 0;
+ u8 *l2 = 0;
+ u8 *l3 = 0;
+
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "hex %U", unformat_hex_string, &match))
+ ;
+ else if (unformat (input, "l2 %U", unformat_l2_match, &l2))
+ ;
+ else if (unformat (input, "l3 %U", unformat_l3_match, &l3))
+ ;
+ else
+ break;
+ }
if (match || l2 || l3)
{
if (l2 || l3)
- {
- /* "Win a free Ethernet header in every packet" */
- if (l2 == 0)
- vec_validate_aligned (l2, 13, sizeof(u32x4));
- match = l2;
- vec_append_aligned (match, l3, sizeof(u32x4));
- vec_free (l3);
- }
+ {
+ /* "Win a free Ethernet header in every packet" */
+ if (l2 == 0)
+ vec_validate_aligned (l2, 13, sizeof (u32x4));
+ match = l2;
+ vec_append_aligned (match, l3, sizeof (u32x4));
+ vec_free (l3);
+ }
/* Make sure the vector is big enough even if key is all 0's */
vec_validate_aligned
- (match, ((match_n_vectors + skip_n_vectors) * sizeof(u32x4)) - 1,
- sizeof(u32x4));
+ (match, ((match_n_vectors + skip_n_vectors) * sizeof (u32x4)) - 1,
+ sizeof (u32x4));
- /* Set size, include skipped vectors*/
- _vec_len (match) = (match_n_vectors+skip_n_vectors) * sizeof(u32x4);
+ /* Set size, include skipped vectors */
+ _vec_len (match) = (match_n_vectors + skip_n_vectors) * sizeof (u32x4);
*matchp = match;
@@ -7712,646 +8318,707 @@ uword unformat_classify_match (unformat_input_t * input, va_list * args)
return 0;
}
-static int api_classify_add_del_session (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_classify_add_del_session_t *mp;
- int is_add = 1;
- u32 table_index = ~0;
- u32 hit_next_index = ~0;
- u32 opaque_index = ~0;
- u8 * match = 0;
- i32 advance = 0;
- f64 timeout;
- u32 skip_n_vectors = 0;
- u32 match_n_vectors = 0;
-
- /*
- * Warning: you have to supply skip_n and match_n
- * because the API client cant simply look at the classify
- * table object.
- */
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "del"))
- is_add = 0;
- else if (unformat (i, "hit-next %U", unformat_ip_next_index,
- &hit_next_index))
- ;
- else if (unformat (i, "l2-hit-next %U", unformat_l2_next_index,
- &hit_next_index))
- ;
- else if (unformat (i, "acl-hit-next %U", unformat_acl_next_index,
- &hit_next_index))
- ;
- else if (unformat (i, "policer-hit-next %d", &hit_next_index))
- ;
- else if (unformat (i, "%U", unformat_policer_precolor, &opaque_index))
- ;
- else if (unformat (i, "opaque-index %d", &opaque_index))
- ;
- else if (unformat (i, "skip_n %d", &skip_n_vectors))
- ;
- else if (unformat (i, "match_n %d", &match_n_vectors))
- ;
- else if (unformat (i, "match %U", unformat_classify_match,
- &match, skip_n_vectors, match_n_vectors))
- ;
- else if (unformat (i, "advance %d", &advance))
- ;
- else if (unformat (i, "table-index %d", &table_index))
- ;
- else
- break;
+static int
+api_classify_add_del_session (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_classify_add_del_session_t *mp;
+ int is_add = 1;
+ u32 table_index = ~0;
+ u32 hit_next_index = ~0;
+ u32 opaque_index = ~0;
+ u8 *match = 0;
+ i32 advance = 0;
+ f64 timeout;
+ u32 skip_n_vectors = 0;
+ u32 match_n_vectors = 0;
+
+ /*
+ * Warning: you have to supply skip_n and match_n
+ * because the API client cant simply look at the classify
+ * table object.
+ */
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "del"))
+ is_add = 0;
+ else if (unformat (i, "hit-next %U", unformat_ip_next_index,
+ &hit_next_index))
+ ;
+ else if (unformat (i, "l2-hit-next %U", unformat_l2_next_index,
+ &hit_next_index))
+ ;
+ else if (unformat (i, "acl-hit-next %U", unformat_acl_next_index,
+ &hit_next_index))
+ ;
+ else if (unformat (i, "policer-hit-next %d", &hit_next_index))
+ ;
+ else if (unformat (i, "%U", unformat_policer_precolor, &opaque_index))
+ ;
+ else if (unformat (i, "opaque-index %d", &opaque_index))
+ ;
+ else if (unformat (i, "skip_n %d", &skip_n_vectors))
+ ;
+ else if (unformat (i, "match_n %d", &match_n_vectors))
+ ;
+ else if (unformat (i, "match %U", unformat_classify_match,
+ &match, skip_n_vectors, match_n_vectors))
+ ;
+ else if (unformat (i, "advance %d", &advance))
+ ;
+ else if (unformat (i, "table-index %d", &table_index))
+ ;
+ else
+ break;
}
- if (table_index == ~0) {
- errmsg ("Table index required\n");
- return -99;
+ if (table_index == ~0)
+ {
+ errmsg ("Table index required\n");
+ return -99;
}
- if (is_add && match == 0) {
- errmsg ("Match value required\n");
- return -99;
+ if (is_add && match == 0)
+ {
+ errmsg ("Match value required\n");
+ return -99;
}
- M2 (CLASSIFY_ADD_DEL_SESSION, classify_add_del_session,
- vec_len(match));
+ M2 (CLASSIFY_ADD_DEL_SESSION, classify_add_del_session, vec_len (match));
- mp->is_add = is_add;
- mp->table_index = ntohl(table_index);
- mp->hit_next_index = ntohl(hit_next_index);
- mp->opaque_index = ntohl(opaque_index);
- mp->advance = ntohl(advance);
- clib_memcpy (mp->match, match, vec_len(match));
- vec_free(match);
+ mp->is_add = is_add;
+ mp->table_index = ntohl (table_index);
+ mp->hit_next_index = ntohl (hit_next_index);
+ mp->opaque_index = ntohl (opaque_index);
+ mp->advance = ntohl (advance);
+ clib_memcpy (mp->match, match, vec_len (match));
+ vec_free (match);
- S; W;
- /* NOTREACHED */
+ S;
+ W;
+ /* NOTREACHED */
}
-static int api_classify_set_interface_ip_table (vat_main_t * vam)
+static int
+api_classify_set_interface_ip_table (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_classify_set_interface_ip_table_t *mp;
- f64 timeout;
- u32 sw_if_index;
- int sw_if_index_set;
- u32 table_index = ~0;
- u8 is_ipv6 = 0;
+ unformat_input_t *i = vam->input;
+ vl_api_classify_set_interface_ip_table_t *mp;
+ f64 timeout;
+ u32 sw_if_index;
+ int sw_if_index_set;
+ u32 table_index = ~0;
+ u8 is_ipv6 = 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "table %d", &table_index))
- ;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "table %d", &table_index))
+ ;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (sw_if_index_set == 0) {
- errmsg ("missing interface name or sw_if_index\n");
- return -99;
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
}
- M(CLASSIFY_SET_INTERFACE_IP_TABLE, classify_set_interface_ip_table);
+ M (CLASSIFY_SET_INTERFACE_IP_TABLE, classify_set_interface_ip_table);
- mp->sw_if_index = ntohl(sw_if_index);
- mp->table_index = ntohl(table_index);
- mp->is_ipv6 = is_ipv6;
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->table_index = ntohl (table_index);
+ mp->is_ipv6 = is_ipv6;
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_classify_set_interface_l2_tables (vat_main_t * vam)
+static int
+api_classify_set_interface_l2_tables (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_classify_set_interface_l2_tables_t *mp;
- f64 timeout;
- u32 sw_if_index;
- int sw_if_index_set;
- u32 ip4_table_index = ~0;
- u32 ip6_table_index = ~0;
- u32 other_table_index = ~0;
+ unformat_input_t *i = vam->input;
+ vl_api_classify_set_interface_l2_tables_t *mp;
+ f64 timeout;
+ u32 sw_if_index;
+ int sw_if_index_set;
+ u32 ip4_table_index = ~0;
+ u32 ip6_table_index = ~0;
+ u32 other_table_index = ~0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "ip4-table %d", &ip4_table_index))
- ;
- else if (unformat (i, "ip6-table %d", &ip6_table_index))
- ;
- else if (unformat (i, "other-table %d", &other_table_index))
- ;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "ip4-table %d", &ip4_table_index))
+ ;
+ else if (unformat (i, "ip6-table %d", &ip6_table_index))
+ ;
+ else if (unformat (i, "other-table %d", &other_table_index))
+ ;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (sw_if_index_set == 0) {
- errmsg ("missing interface name or sw_if_index\n");
- return -99;
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
}
- M(CLASSIFY_SET_INTERFACE_L2_TABLES, classify_set_interface_l2_tables);
+ M (CLASSIFY_SET_INTERFACE_L2_TABLES, classify_set_interface_l2_tables);
- mp->sw_if_index = ntohl(sw_if_index);
- mp->ip4_table_index = ntohl(ip4_table_index);
- mp->ip6_table_index = ntohl(ip6_table_index);
- mp->other_table_index = ntohl(other_table_index);
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->ip4_table_index = ntohl (ip4_table_index);
+ mp->ip6_table_index = ntohl (ip6_table_index);
+ mp->other_table_index = ntohl (other_table_index);
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_ipfix_enable (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_ipfix_enable_t *mp;
- ip4_address_t collector_address;
- u8 collector_address_set = 0;
- u32 collector_port = ~0;
- ip4_address_t src_address;
- u8 src_address_set = 0;
- u32 vrf_id = ~0;
- u32 path_mtu = ~0;
- u32 template_interval = ~0;
- f64 timeout;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "collector_address %U", unformat_ip4_address,
- &collector_address))
- collector_address_set = 1;
- else if (unformat (i, "collector_port %d", &collector_port))
- ;
- else if (unformat (i, "src_address %U", unformat_ip4_address,
- &src_address))
- src_address_set = 1;
- else if (unformat (i, "vrf_id %d", &vrf_id))
- ;
- else if (unformat (i, "path_mtu %d", &path_mtu))
- ;
- else if (unformat (i, "template_interval %d", &template_interval))
- ;
- else
- break;
+static int
+api_ipfix_enable (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_ipfix_enable_t *mp;
+ ip4_address_t collector_address;
+ u8 collector_address_set = 0;
+ u32 collector_port = ~0;
+ ip4_address_t src_address;
+ u8 src_address_set = 0;
+ u32 vrf_id = ~0;
+ u32 path_mtu = ~0;
+ u32 template_interval = ~0;
+ f64 timeout;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "collector_address %U", unformat_ip4_address,
+ &collector_address))
+ collector_address_set = 1;
+ else if (unformat (i, "collector_port %d", &collector_port))
+ ;
+ else if (unformat (i, "src_address %U", unformat_ip4_address,
+ &src_address))
+ src_address_set = 1;
+ else if (unformat (i, "vrf_id %d", &vrf_id))
+ ;
+ else if (unformat (i, "path_mtu %d", &path_mtu))
+ ;
+ else if (unformat (i, "template_interval %d", &template_interval))
+ ;
+ else
+ break;
}
- if (collector_address_set == 0) {
- errmsg ("collector_address required\n");
- return -99;
+ if (collector_address_set == 0)
+ {
+ errmsg ("collector_address required\n");
+ return -99;
}
- if (src_address_set == 0) {
- errmsg ("src_address required\n");
- return -99;
+ if (src_address_set == 0)
+ {
+ errmsg ("src_address required\n");
+ return -99;
}
- M (IPFIX_ENABLE, ipfix_enable);
+ M (IPFIX_ENABLE, ipfix_enable);
- memcpy(mp->collector_address, collector_address.data,
- sizeof(collector_address.data));
- mp->collector_port = htons((u16)collector_port);
- memcpy(mp->src_address, src_address.data,
- sizeof(src_address.data));
- mp->vrf_id = htonl(vrf_id);
- mp->path_mtu = htonl(path_mtu);
- mp->template_interval = htonl(template_interval);
+ memcpy (mp->collector_address, collector_address.data,
+ sizeof (collector_address.data));
+ mp->collector_port = htons ((u16) collector_port);
+ memcpy (mp->src_address, src_address.data, sizeof (src_address.data));
+ mp->vrf_id = htonl (vrf_id);
+ mp->path_mtu = htonl (path_mtu);
+ mp->template_interval = htonl (template_interval);
- S; W;
- /* NOTREACHED */
+ S;
+ W;
+ /* NOTREACHED */
}
-static int api_get_node_index (vat_main_t * vam)
+static int
+api_get_node_index (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_get_node_index_t * mp;
- f64 timeout;
- u8 * name = 0;
+ unformat_input_t *i = vam->input;
+ vl_api_get_node_index_t *mp;
+ f64 timeout;
+ u8 *name = 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "node %s", &name))
- ;
- else
- break;
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "node %s", &name))
+ ;
+ else
+ break;
}
- if (name == 0) {
- errmsg ("node name required\n");
- return -99;
+ if (name == 0)
+ {
+ errmsg ("node name required\n");
+ return -99;
}
- if (vec_len (name) >= ARRAY_LEN(mp->node_name)) {
- errmsg ("node name too long, max %d\n", ARRAY_LEN(mp->node_name));
- return -99;
+ if (vec_len (name) >= ARRAY_LEN (mp->node_name))
+ {
+ errmsg ("node name too long, max %d\n", ARRAY_LEN (mp->node_name));
+ return -99;
}
- M(GET_NODE_INDEX, get_node_index);
- clib_memcpy (mp->node_name, name, vec_len(name));
- vec_free(name);
+ M (GET_NODE_INDEX, get_node_index);
+ clib_memcpy (mp->node_name, name, vec_len (name));
+ vec_free (name);
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_get_next_index (vat_main_t * vam)
+static int
+api_get_next_index (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_get_next_index_t * mp;
- f64 timeout;
- u8 * node_name = 0, * next_node_name = 0;
+ unformat_input_t *i = vam->input;
+ vl_api_get_next_index_t *mp;
+ f64 timeout;
+ u8 *node_name = 0, *next_node_name = 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "node-name %s", &node_name))
- ;
- else if (unformat (i, "next-node-name %s", &next_node_name))
- break;
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "node-name %s", &node_name))
+ ;
+ else if (unformat (i, "next-node-name %s", &next_node_name))
+ break;
}
- if (node_name == 0) {
- errmsg ("node name required\n");
- return -99;
+ if (node_name == 0)
+ {
+ errmsg ("node name required\n");
+ return -99;
}
- if (vec_len (node_name) >= ARRAY_LEN(mp->node_name)) {
- errmsg ("node name too long, max %d\n", ARRAY_LEN(mp->node_name));
- return -99;
+ if (vec_len (node_name) >= ARRAY_LEN (mp->node_name))
+ {
+ errmsg ("node name too long, max %d\n", ARRAY_LEN (mp->node_name));
+ return -99;
}
- if (next_node_name == 0) {
- errmsg ("next node name required\n");
- return -99;
+ if (next_node_name == 0)
+ {
+ errmsg ("next node name required\n");
+ return -99;
}
- if (vec_len (next_node_name) >= ARRAY_LEN(mp->next_name)) {
- errmsg ("next node name too long, max %d\n", ARRAY_LEN(mp->next_name));
- return -99;
+ if (vec_len (next_node_name) >= ARRAY_LEN (mp->next_name))
+ {
+ errmsg ("next node name too long, max %d\n", ARRAY_LEN (mp->next_name));
+ return -99;
}
- M(GET_NEXT_INDEX, get_next_index);
- clib_memcpy (mp->node_name, node_name, vec_len(node_name));
- clib_memcpy (mp->next_name, next_node_name, vec_len(next_node_name));
- vec_free(node_name);
- vec_free(next_node_name);
+ M (GET_NEXT_INDEX, get_next_index);
+ clib_memcpy (mp->node_name, node_name, vec_len (node_name));
+ clib_memcpy (mp->next_name, next_node_name, vec_len (next_node_name));
+ vec_free (node_name);
+ vec_free (next_node_name);
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_add_node_next (vat_main_t * vam)
+static int
+api_add_node_next (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_add_node_next_t * mp;
- f64 timeout;
- u8 * name = 0;
- u8 * next = 0;
+ unformat_input_t *i = vam->input;
+ vl_api_add_node_next_t *mp;
+ f64 timeout;
+ u8 *name = 0;
+ u8 *next = 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "node %s", &name))
- ;
- else if (unformat (i, "next %s", &next))
- ;
- else
- break;
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "node %s", &name))
+ ;
+ else if (unformat (i, "next %s", &next))
+ ;
+ else
+ break;
}
- if (name == 0) {
- errmsg ("node name required\n");
- return -99;
+ if (name == 0)
+ {
+ errmsg ("node name required\n");
+ return -99;
}
- if (vec_len (name) >= ARRAY_LEN(mp->node_name)) {
- errmsg ("node name too long, max %d\n", ARRAY_LEN(mp->node_name));
- return -99;
+ if (vec_len (name) >= ARRAY_LEN (mp->node_name))
+ {
+ errmsg ("node name too long, max %d\n", ARRAY_LEN (mp->node_name));
+ return -99;
}
- if (next == 0) {
- errmsg ("next node required\n");
- return -99;
+ if (next == 0)
+ {
+ errmsg ("next node required\n");
+ return -99;
}
- if (vec_len (next) >= ARRAY_LEN(mp->next_name)) {
- errmsg ("next name too long, max %d\n", ARRAY_LEN(mp->next_name));
- return -99;
+ if (vec_len (next) >= ARRAY_LEN (mp->next_name))
+ {
+ errmsg ("next name too long, max %d\n", ARRAY_LEN (mp->next_name));
+ return -99;
}
- M(ADD_NODE_NEXT, add_node_next);
- clib_memcpy (mp->node_name, name, vec_len(name));
- clib_memcpy (mp->next_name, next, vec_len(next));
- vec_free(name);
- vec_free(next);
+ M (ADD_NODE_NEXT, add_node_next);
+ clib_memcpy (mp->node_name, name, vec_len (name));
+ clib_memcpy (mp->next_name, next, vec_len (next));
+ vec_free (name);
+ vec_free (next);
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_l2tpv3_create_tunnel (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- ip6_address_t client_address, our_address;
- int client_address_set = 0;
- int our_address_set = 0;
- u32 local_session_id = 0;
- u32 remote_session_id = 0;
- u64 local_cookie = 0;
- u64 remote_cookie = 0;
- u8 l2_sublayer_present = 0;
- vl_api_l2tpv3_create_tunnel_t * mp;
- f64 timeout;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "client_address %U", unformat_ip6_address,
- &client_address))
- client_address_set = 1;
- else if (unformat (i, "our_address %U", unformat_ip6_address,
- &our_address))
- our_address_set = 1;
- else if (unformat (i, "local_session_id %d", &local_session_id))
- ;
- else if (unformat (i, "remote_session_id %d", &remote_session_id))
- ;
- else if (unformat (i, "local_cookie %lld", &local_cookie))
- ;
- else if (unformat (i, "remote_cookie %lld", &remote_cookie))
- ;
- else if (unformat (i, "l2-sublayer-present"))
- l2_sublayer_present = 1;
- else
- break;
+static int
+api_l2tpv3_create_tunnel (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ ip6_address_t client_address, our_address;
+ int client_address_set = 0;
+ int our_address_set = 0;
+ u32 local_session_id = 0;
+ u32 remote_session_id = 0;
+ u64 local_cookie = 0;
+ u64 remote_cookie = 0;
+ u8 l2_sublayer_present = 0;
+ vl_api_l2tpv3_create_tunnel_t *mp;
+ f64 timeout;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "client_address %U", unformat_ip6_address,
+ &client_address))
+ client_address_set = 1;
+ else if (unformat (i, "our_address %U", unformat_ip6_address,
+ &our_address))
+ our_address_set = 1;
+ else if (unformat (i, "local_session_id %d", &local_session_id))
+ ;
+ else if (unformat (i, "remote_session_id %d", &remote_session_id))
+ ;
+ else if (unformat (i, "local_cookie %lld", &local_cookie))
+ ;
+ else if (unformat (i, "remote_cookie %lld", &remote_cookie))
+ ;
+ else if (unformat (i, "l2-sublayer-present"))
+ l2_sublayer_present = 1;
+ else
+ break;
}
- if (client_address_set == 0) {
- errmsg ("client_address required\n");
- return -99;
+ if (client_address_set == 0)
+ {
+ errmsg ("client_address required\n");
+ return -99;
}
- if (our_address_set == 0) {
- errmsg ("our_address required\n");
- return -99;
+ if (our_address_set == 0)
+ {
+ errmsg ("our_address required\n");
+ return -99;
}
- M(L2TPV3_CREATE_TUNNEL, l2tpv3_create_tunnel);
+ M (L2TPV3_CREATE_TUNNEL, l2tpv3_create_tunnel);
- clib_memcpy (mp->client_address, client_address.as_u8,
- sizeof (mp->client_address));
+ clib_memcpy (mp->client_address, client_address.as_u8,
+ sizeof (mp->client_address));
- clib_memcpy (mp->our_address, our_address.as_u8,
- sizeof (mp->our_address));
+ clib_memcpy (mp->our_address, our_address.as_u8, sizeof (mp->our_address));
- mp->local_session_id = ntohl (local_session_id);
- mp->remote_session_id = ntohl (remote_session_id);
- mp->local_cookie = clib_host_to_net_u64 (local_cookie);
- mp->remote_cookie = clib_host_to_net_u64 (remote_cookie);
- mp->l2_sublayer_present = l2_sublayer_present;
- mp->is_ipv6 = 1;
+ mp->local_session_id = ntohl (local_session_id);
+ mp->remote_session_id = ntohl (remote_session_id);
+ mp->local_cookie = clib_host_to_net_u64 (local_cookie);
+ mp->remote_cookie = clib_host_to_net_u64 (remote_cookie);
+ mp->l2_sublayer_present = l2_sublayer_present;
+ mp->is_ipv6 = 1;
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_l2tpv3_set_tunnel_cookies (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
- u64 new_local_cookie = 0;
- u64 new_remote_cookie = 0;
- vl_api_l2tpv3_set_tunnel_cookies_t *mp;
- f64 timeout;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "new_local_cookie %lld", &new_local_cookie))
- ;
- else if (unformat (i, "new_remote_cookie %lld", &new_remote_cookie))
- ;
- else
- break;
+static int
+api_l2tpv3_set_tunnel_cookies (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
+ u64 new_local_cookie = 0;
+ u64 new_remote_cookie = 0;
+ vl_api_l2tpv3_set_tunnel_cookies_t *mp;
+ f64 timeout;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "new_local_cookie %lld", &new_local_cookie))
+ ;
+ else if (unformat (i, "new_remote_cookie %lld", &new_remote_cookie))
+ ;
+ else
+ break;
}
- if (sw_if_index_set == 0) {
- errmsg ("missing interface name or sw_if_index\n");
- return -99;
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
}
- M(L2TPV3_SET_TUNNEL_COOKIES, l2tpv3_set_tunnel_cookies);
+ M (L2TPV3_SET_TUNNEL_COOKIES, l2tpv3_set_tunnel_cookies);
- mp->sw_if_index = ntohl(sw_if_index);
- mp->new_local_cookie = clib_host_to_net_u64 (new_local_cookie);
- mp->new_remote_cookie = clib_host_to_net_u64 (new_remote_cookie);
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->new_local_cookie = clib_host_to_net_u64 (new_local_cookie);
+ mp->new_remote_cookie = clib_host_to_net_u64 (new_remote_cookie);
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_l2tpv3_interface_enable_disable (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_l2tpv3_interface_enable_disable_t *mp;
- f64 timeout;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
- u8 enable_disable = 1;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "enable"))
- enable_disable = 1;
- else if (unformat (i, "disable"))
- enable_disable = 0;
- else
- break;
+static int
+api_l2tpv3_interface_enable_disable (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_l2tpv3_interface_enable_disable_t *mp;
+ f64 timeout;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
+ u8 enable_disable = 1;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "enable"))
+ enable_disable = 1;
+ else if (unformat (i, "disable"))
+ enable_disable = 0;
+ else
+ break;
}
- if (sw_if_index_set == 0) {
- errmsg ("missing interface name or sw_if_index\n");
- return -99;
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
}
- M(L2TPV3_INTERFACE_ENABLE_DISABLE, l2tpv3_interface_enable_disable);
+ M (L2TPV3_INTERFACE_ENABLE_DISABLE, l2tpv3_interface_enable_disable);
- mp->sw_if_index = ntohl(sw_if_index);
- mp->enable_disable = enable_disable;
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->enable_disable = enable_disable;
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_l2tpv3_set_lookup_key (vat_main_t * vam)
+static int
+api_l2tpv3_set_lookup_key (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_l2tpv3_set_lookup_key_t * mp;
- f64 timeout;
- u8 key = ~0;
+ unformat_input_t *i = vam->input;
+ vl_api_l2tpv3_set_lookup_key_t *mp;
+ f64 timeout;
+ u8 key = ~0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "lookup_v6_src"))
- key = L2T_LOOKUP_SRC_ADDRESS;
- else if (unformat (i, "lookup_v6_dst"))
- key = L2T_LOOKUP_DST_ADDRESS;
- else if (unformat (i, "lookup_session_id"))
- key = L2T_LOOKUP_SESSION_ID;
- else
- break;
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "lookup_v6_src"))
+ key = L2T_LOOKUP_SRC_ADDRESS;
+ else if (unformat (i, "lookup_v6_dst"))
+ key = L2T_LOOKUP_DST_ADDRESS;
+ else if (unformat (i, "lookup_session_id"))
+ key = L2T_LOOKUP_SESSION_ID;
+ else
+ break;
}
- if (key == (u8) ~0) {
- errmsg ("l2tp session lookup key unset\n");
- return -99;
+ if (key == (u8) ~ 0)
+ {
+ errmsg ("l2tp session lookup key unset\n");
+ return -99;
}
- M(L2TPV3_SET_LOOKUP_KEY, l2tpv3_set_lookup_key);
+ M (L2TPV3_SET_LOOKUP_KEY, l2tpv3_set_lookup_key);
- mp->key = key;
+ mp->key = key;
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
static void vl_api_sw_if_l2tpv3_tunnel_details_t_handler
-(vl_api_sw_if_l2tpv3_tunnel_details_t * mp)
+ (vl_api_sw_if_l2tpv3_tunnel_details_t * mp)
{
- vat_main_t * vam = &vat_main;
+ vat_main_t *vam = &vat_main;
- fformat(vam->ofp, "* %U (our) %U (client) (sw_if_index %d)\n",
- format_ip6_address, mp->our_address,
- format_ip6_address, mp->client_address,
- clib_net_to_host_u32(mp->sw_if_index));
+ fformat (vam->ofp, "* %U (our) %U (client) (sw_if_index %d)\n",
+ format_ip6_address, mp->our_address,
+ format_ip6_address, mp->client_address,
+ clib_net_to_host_u32 (mp->sw_if_index));
- fformat (vam->ofp, " local cookies %016llx %016llx remote cookie %016llx\n",
- clib_net_to_host_u64 (mp->local_cookie[0]),
- clib_net_to_host_u64 (mp->local_cookie[1]),
- clib_net_to_host_u64 (mp->remote_cookie));
+ fformat (vam->ofp,
+ " local cookies %016llx %016llx remote cookie %016llx\n",
+ clib_net_to_host_u64 (mp->local_cookie[0]),
+ clib_net_to_host_u64 (mp->local_cookie[1]),
+ clib_net_to_host_u64 (mp->remote_cookie));
- fformat (vam->ofp, " local session-id %d remote session-id %d\n",
- clib_net_to_host_u32 (mp->local_session_id),
- clib_net_to_host_u32 (mp->remote_session_id));
+ fformat (vam->ofp, " local session-id %d remote session-id %d\n",
+ clib_net_to_host_u32 (mp->local_session_id),
+ clib_net_to_host_u32 (mp->remote_session_id));
- fformat (vam->ofp, " l2 specific sublayer %s\n\n",
- mp->l2_sublayer_present ? "preset" : "absent");
+ fformat (vam->ofp, " l2 specific sublayer %s\n\n",
+ mp->l2_sublayer_present ? "preset" : "absent");
}
static void vl_api_sw_if_l2tpv3_tunnel_details_t_handler_json
-(vl_api_sw_if_l2tpv3_tunnel_details_t * mp)
+ (vl_api_sw_if_l2tpv3_tunnel_details_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t *node = NULL;
- struct in6_addr addr;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
+ struct in6_addr addr;
- if (VAT_JSON_ARRAY != vam->json_tree.type) {
- ASSERT(VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array(&vam->json_tree);
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
}
- node = vat_json_array_add(&vam->json_tree);
+ node = vat_json_array_add (&vam->json_tree);
- vat_json_init_object(node);
+ vat_json_init_object (node);
- clib_memcpy(&addr, mp->our_address, sizeof(addr));
- vat_json_object_add_ip6(node, "our_address", addr);
- clib_memcpy(&addr, mp->client_address, sizeof(addr));
- vat_json_object_add_ip6(node, "client_address", addr);
+ clib_memcpy (&addr, mp->our_address, sizeof (addr));
+ vat_json_object_add_ip6 (node, "our_address", addr);
+ clib_memcpy (&addr, mp->client_address, sizeof (addr));
+ vat_json_object_add_ip6 (node, "client_address", addr);
- vat_json_node_t * lc = vat_json_object_add(node, "local_cookie");
- vat_json_init_array(lc);
- vat_json_array_add_uint(lc, clib_net_to_host_u64(mp->local_cookie[0]));
- vat_json_array_add_uint(lc, clib_net_to_host_u64(mp->local_cookie[1]));
- vat_json_object_add_uint(node, "remote_cookie", clib_net_to_host_u64(mp->remote_cookie));
+ vat_json_node_t *lc = vat_json_object_add (node, "local_cookie");
+ vat_json_init_array (lc);
+ vat_json_array_add_uint (lc, clib_net_to_host_u64 (mp->local_cookie[0]));
+ vat_json_array_add_uint (lc, clib_net_to_host_u64 (mp->local_cookie[1]));
+ vat_json_object_add_uint (node, "remote_cookie",
+ clib_net_to_host_u64 (mp->remote_cookie));
- printf("local id: %u", clib_net_to_host_u32(mp->local_session_id));
- vat_json_object_add_uint(node, "local_session_id", clib_net_to_host_u32(mp->local_session_id));
- vat_json_object_add_uint(node, "remote_session_id", clib_net_to_host_u32(mp->remote_session_id));
- vat_json_object_add_string_copy(node, "l2_sublayer", mp->l2_sublayer_present ?
- (u8*)"present" : (u8*)"absent");
+ printf ("local id: %u", clib_net_to_host_u32 (mp->local_session_id));
+ vat_json_object_add_uint (node, "local_session_id",
+ clib_net_to_host_u32 (mp->local_session_id));
+ vat_json_object_add_uint (node, "remote_session_id",
+ clib_net_to_host_u32 (mp->remote_session_id));
+ vat_json_object_add_string_copy (node, "l2_sublayer",
+ mp->l2_sublayer_present ? (u8 *) "present"
+ : (u8 *) "absent");
}
-static int api_sw_if_l2tpv3_tunnel_dump (vat_main_t * vam)
+static int
+api_sw_if_l2tpv3_tunnel_dump (vat_main_t * vam)
{
- vl_api_sw_if_l2tpv3_tunnel_dump_t *mp;
- f64 timeout;
+ vl_api_sw_if_l2tpv3_tunnel_dump_t *mp;
+ f64 timeout;
- /* Get list of l2tpv3-tunnel interfaces */
- M(SW_IF_L2TPV3_TUNNEL_DUMP, sw_if_l2tpv3_tunnel_dump);
- S;
+ /* Get list of l2tpv3-tunnel interfaces */
+ M (SW_IF_L2TPV3_TUNNEL_DUMP, sw_if_l2tpv3_tunnel_dump);
+ S;
- /* Use a control ping for synchronization */
- {
- vl_api_control_ping_t * mp;
- M(CONTROL_PING, control_ping);
- S;
- }
- W;
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
+ S;
+ }
+ W;
}
static void vl_api_sw_interface_tap_details_t_handler
-(vl_api_sw_interface_tap_details_t * mp)
+ (vl_api_sw_interface_tap_details_t * mp)
{
- vat_main_t * vam = &vat_main;
+ vat_main_t *vam = &vat_main;
- fformat(vam->ofp, "%-16s %d\n",
- mp->dev_name,
- clib_net_to_host_u32(mp->sw_if_index));
+ fformat (vam->ofp, "%-16s %d\n",
+ mp->dev_name, clib_net_to_host_u32 (mp->sw_if_index));
}
static void vl_api_sw_interface_tap_details_t_handler_json
-(vl_api_sw_interface_tap_details_t * mp)
+ (vl_api_sw_interface_tap_details_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t *node = NULL;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
- if (VAT_JSON_ARRAY != vam->json_tree.type) {
- ASSERT(VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array(&vam->json_tree);
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
}
- node = vat_json_array_add(&vam->json_tree);
+ node = vat_json_array_add (&vam->json_tree);
- vat_json_init_object(node);
- vat_json_object_add_uint(node, "sw_if_index", ntohl(mp->sw_if_index));
- vat_json_object_add_string_copy(node, "dev_name", mp->dev_name);
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+ vat_json_object_add_string_copy (node, "dev_name", mp->dev_name);
}
-static int api_sw_interface_tap_dump (vat_main_t * vam)
+static int
+api_sw_interface_tap_dump (vat_main_t * vam)
{
- vl_api_sw_interface_tap_dump_t *mp;
- f64 timeout;
+ vl_api_sw_interface_tap_dump_t *mp;
+ f64 timeout;
- fformat(vam->ofp, "\n%-16s %s\n", "dev_name", "sw_if_index");
- /* Get list of tap interfaces */
- M(SW_INTERFACE_TAP_DUMP, sw_interface_tap_dump);
- S;
+ fformat (vam->ofp, "\n%-16s %s\n", "dev_name", "sw_if_index");
+ /* Get list of tap interfaces */
+ M (SW_INTERFACE_TAP_DUMP, sw_interface_tap_dump);
+ S;
- /* Use a control ping for synchronization */
- {
- vl_api_control_ping_t * mp;
- M(CONTROL_PING, control_ping);
- S;
- }
- W;
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
+ S;
+ }
+ W;
}
static uword unformat_vxlan_decap_next
-(unformat_input_t * input, va_list * args)
+ (unformat_input_t * input, va_list * args)
{
- u32 * result = va_arg (*args, u32 *);
+ u32 *result = va_arg (*args, u32 *);
u32 tmp;
if (unformat (input, "drop"))
@@ -8369,367 +9036,396 @@ static uword unformat_vxlan_decap_next
return 1;
}
-static int api_vxlan_add_del_tunnel (vat_main_t * vam)
-{
- unformat_input_t * line_input = vam->input;
- vl_api_vxlan_add_del_tunnel_t *mp;
- f64 timeout;
- ip4_address_t src4, dst4;
- ip6_address_t src6, dst6;
- u8 is_add = 1;
- u8 ipv4_set = 0, ipv6_set = 0;
- u8 src_set = 0;
- u8 dst_set = 0;
- u32 encap_vrf_id = 0;
- u32 decap_next_index = ~0;
- u32 vni = 0;
-
- while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
- if (unformat (line_input, "del"))
- is_add = 0;
- else if (unformat (line_input, "src %U",
- unformat_ip4_address, &src4))
- {
- ipv4_set = 1;
- src_set = 1;
- }
- else if (unformat (line_input, "dst %U",
- unformat_ip4_address, &dst4))
- {
- ipv4_set = 1;
- dst_set = 1;
- }
- else if (unformat (line_input, "src %U",
- unformat_ip6_address, &src6))
- {
- ipv6_set = 1;
- src_set = 1;
- }
- else if (unformat (line_input, "dst %U",
- unformat_ip6_address, &dst6))
- {
- ipv6_set = 1;
- dst_set = 1;
- }
- else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id))
- ;
- else if (unformat (line_input, "decap-next %U",
- unformat_vxlan_decap_next, &decap_next_index))
- ;
- else if (unformat (line_input, "vni %d", &vni))
- ;
- else {
- errmsg ("parse error '%U'\n", format_unformat_error, line_input);
- return -99;
- }
+static int
+api_vxlan_add_del_tunnel (vat_main_t * vam)
+{
+ unformat_input_t *line_input = vam->input;
+ vl_api_vxlan_add_del_tunnel_t *mp;
+ f64 timeout;
+ ip4_address_t src4, dst4;
+ ip6_address_t src6, dst6;
+ u8 is_add = 1;
+ u8 ipv4_set = 0, ipv6_set = 0;
+ u8 src_set = 0;
+ u8 dst_set = 0;
+ u32 encap_vrf_id = 0;
+ u32 decap_next_index = ~0;
+ u32 vni = 0;
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (line_input, "del"))
+ is_add = 0;
+ else if (unformat (line_input, "src %U", unformat_ip4_address, &src4))
+ {
+ ipv4_set = 1;
+ src_set = 1;
+ }
+ else if (unformat (line_input, "dst %U", unformat_ip4_address, &dst4))
+ {
+ ipv4_set = 1;
+ dst_set = 1;
+ }
+ else if (unformat (line_input, "src %U", unformat_ip6_address, &src6))
+ {
+ ipv6_set = 1;
+ src_set = 1;
+ }
+ else if (unformat (line_input, "dst %U", unformat_ip6_address, &dst6))
+ {
+ ipv6_set = 1;
+ dst_set = 1;
+ }
+ else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id))
+ ;
+ else if (unformat (line_input, "decap-next %U",
+ unformat_vxlan_decap_next, &decap_next_index))
+ ;
+ else if (unformat (line_input, "vni %d", &vni))
+ ;
+ else
+ {
+ errmsg ("parse error '%U'\n", format_unformat_error, line_input);
+ return -99;
+ }
}
- if (src_set == 0) {
- errmsg ("tunnel src address not specified\n");
- return -99;
+ if (src_set == 0)
+ {
+ errmsg ("tunnel src address not specified\n");
+ return -99;
}
- if (dst_set == 0) {
- errmsg ("tunnel dst address not specified\n");
- return -99;
+ if (dst_set == 0)
+ {
+ errmsg ("tunnel dst address not specified\n");
+ return -99;
}
- if (ipv4_set && ipv6_set) {
- errmsg ("both IPv4 and IPv6 addresses specified");
- return -99;
+ if (ipv4_set && ipv6_set)
+ {
+ errmsg ("both IPv4 and IPv6 addresses specified");
+ return -99;
}
- if ((vni == 0) || (vni>>24)) {
- errmsg ("vni not specified or out of range\n");
- return -99;
+ if ((vni == 0) || (vni >> 24))
+ {
+ errmsg ("vni not specified or out of range\n");
+ return -99;
}
- M (VXLAN_ADD_DEL_TUNNEL, vxlan_add_del_tunnel);
+ M (VXLAN_ADD_DEL_TUNNEL, vxlan_add_del_tunnel);
- if (ipv6_set) {
- clib_memcpy(&mp->src_address, &src6, sizeof(src6));
- clib_memcpy(&mp->dst_address, &dst6, sizeof(dst6));
- } else {
- clib_memcpy(&mp->src_address, &src4, sizeof(src4));
- clib_memcpy(&mp->dst_address, &dst4, sizeof(dst4));
+ if (ipv6_set)
+ {
+ clib_memcpy (&mp->src_address, &src6, sizeof (src6));
+ clib_memcpy (&mp->dst_address, &dst6, sizeof (dst6));
+ }
+ else
+ {
+ clib_memcpy (&mp->src_address, &src4, sizeof (src4));
+ clib_memcpy (&mp->dst_address, &dst4, sizeof (dst4));
}
- mp->encap_vrf_id = ntohl(encap_vrf_id);
- mp->decap_next_index = ntohl(decap_next_index);
- mp->vni = ntohl(vni);
- mp->is_add = is_add;
- mp->is_ipv6 = ipv6_set;
+ mp->encap_vrf_id = ntohl (encap_vrf_id);
+ mp->decap_next_index = ntohl (decap_next_index);
+ mp->vni = ntohl (vni);
+ mp->is_add = is_add;
+ mp->is_ipv6 = ipv6_set;
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
static void vl_api_vxlan_tunnel_details_t_handler
-(vl_api_vxlan_tunnel_details_t * mp)
+ (vl_api_vxlan_tunnel_details_t * mp)
{
- vat_main_t * vam = &vat_main;
+ vat_main_t *vam = &vat_main;
- fformat(vam->ofp, "%11d%24U%24U%14d%18d%13d\n",
- ntohl(mp->sw_if_index),
- format_ip46_address, &(mp->src_address[0]),
- IP46_TYPE_ANY,
- format_ip46_address, &(mp->dst_address[0]),
- IP46_TYPE_ANY,
- ntohl(mp->encap_vrf_id),
- ntohl(mp->decap_next_index),
- ntohl(mp->vni));
+ fformat (vam->ofp, "%11d%24U%24U%14d%18d%13d\n",
+ ntohl (mp->sw_if_index),
+ format_ip46_address, &(mp->src_address[0]),
+ IP46_TYPE_ANY,
+ format_ip46_address, &(mp->dst_address[0]),
+ IP46_TYPE_ANY,
+ ntohl (mp->encap_vrf_id),
+ ntohl (mp->decap_next_index), ntohl (mp->vni));
}
static void vl_api_vxlan_tunnel_details_t_handler_json
-(vl_api_vxlan_tunnel_details_t * mp)
-{
- vat_main_t * vam = &vat_main;
- vat_json_node_t *node = NULL;
- struct in_addr ip4;
- struct in6_addr ip6;
-
- if (VAT_JSON_ARRAY != vam->json_tree.type) {
- ASSERT(VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array(&vam->json_tree);
- }
- node = vat_json_array_add(&vam->json_tree);
-
- vat_json_init_object(node);
- vat_json_object_add_uint(node, "sw_if_index", ntohl(mp->sw_if_index));
- if (mp->is_ipv6) {
- clib_memcpy(&ip6, &(mp->src_address[0]), sizeof(ip6));
- vat_json_object_add_ip6(node, "src_address", ip6);
- clib_memcpy(&ip6, &(mp->dst_address[0]), sizeof(ip6));
- vat_json_object_add_ip6(node, "dst_address", ip6);
- } else {
- clib_memcpy(&ip4, &(mp->src_address[0]), sizeof(ip4));
- vat_json_object_add_ip4(node, "src_address", ip4);
- clib_memcpy(&ip4, &(mp->dst_address[0]), sizeof(ip4));
- vat_json_object_add_ip4(node, "dst_address", ip4);
- }
- vat_json_object_add_uint(node, "encap_vrf_id", ntohl(mp->encap_vrf_id));
- vat_json_object_add_uint(node, "decap_next_index", ntohl(mp->decap_next_index));
- vat_json_object_add_uint(node, "vni", ntohl(mp->vni));
- vat_json_object_add_uint(node, "is_ipv6", mp->is_ipv6 ? 1 : 0);
-}
-
-static int api_vxlan_tunnel_dump (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_vxlan_tunnel_dump_t *mp;
- f64 timeout;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
-
- /* Parse args required to build the message */
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else
- break;
- }
+ (vl_api_vxlan_tunnel_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
+ struct in_addr ip4;
+ struct in6_addr ip6;
- if (sw_if_index_set == 0) {
- sw_if_index = ~0;
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
}
+ node = vat_json_array_add (&vam->json_tree);
- if (!vam->json_output) {
- fformat(vam->ofp, "%11s%24s%24s%14s%18s%13s\n",
- "sw_if_index", "src_address", "dst_address",
- "encap_vrf_id", "decap_next_index", "vni");
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+ if (mp->is_ipv6)
+ {
+ clib_memcpy (&ip6, &(mp->src_address[0]), sizeof (ip6));
+ vat_json_object_add_ip6 (node, "src_address", ip6);
+ clib_memcpy (&ip6, &(mp->dst_address[0]), sizeof (ip6));
+ vat_json_object_add_ip6 (node, "dst_address", ip6);
}
+ else
+ {
+ clib_memcpy (&ip4, &(mp->src_address[0]), sizeof (ip4));
+ vat_json_object_add_ip4 (node, "src_address", ip4);
+ clib_memcpy (&ip4, &(mp->dst_address[0]), sizeof (ip4));
+ vat_json_object_add_ip4 (node, "dst_address", ip4);
+ }
+ vat_json_object_add_uint (node, "encap_vrf_id", ntohl (mp->encap_vrf_id));
+ vat_json_object_add_uint (node, "decap_next_index",
+ ntohl (mp->decap_next_index));
+ vat_json_object_add_uint (node, "vni", ntohl (mp->vni));
+ vat_json_object_add_uint (node, "is_ipv6", mp->is_ipv6 ? 1 : 0);
+}
- /* Get list of vxlan-tunnel interfaces */
- M(VXLAN_TUNNEL_DUMP, vxlan_tunnel_dump);
+static int
+api_vxlan_tunnel_dump (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_vxlan_tunnel_dump_t *mp;
+ f64 timeout;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
- mp->sw_if_index = htonl(sw_if_index);
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else
+ break;
+ }
- S;
+ if (sw_if_index_set == 0)
+ {
+ sw_if_index = ~0;
+ }
- /* Use a control ping for synchronization */
+ if (!vam->json_output)
{
- vl_api_control_ping_t * mp;
- M(CONTROL_PING, control_ping);
- S;
+ fformat (vam->ofp, "%11s%24s%24s%14s%18s%13s\n",
+ "sw_if_index", "src_address", "dst_address",
+ "encap_vrf_id", "decap_next_index", "vni");
}
- W;
+
+ /* Get list of vxlan-tunnel interfaces */
+ M (VXLAN_TUNNEL_DUMP, vxlan_tunnel_dump);
+
+ mp->sw_if_index = htonl (sw_if_index);
+
+ S;
+
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
+ S;
+ }
+ W;
}
-static int api_gre_add_del_tunnel (vat_main_t * vam)
+static int
+api_gre_add_del_tunnel (vat_main_t * vam)
{
- unformat_input_t * line_input = vam->input;
- vl_api_gre_add_del_tunnel_t *mp;
- f64 timeout;
- ip4_address_t src4, dst4;
- u8 is_add = 1;
- u8 src_set = 0;
- u8 dst_set = 0;
- u32 outer_fib_id = 0;
+ unformat_input_t *line_input = vam->input;
+ vl_api_gre_add_del_tunnel_t *mp;
+ f64 timeout;
+ ip4_address_t src4, dst4;
+ u8 is_add = 1;
+ u8 src_set = 0;
+ u8 dst_set = 0;
+ u32 outer_fib_id = 0;
- while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
- if (unformat (line_input, "del"))
- is_add = 0;
- else if (unformat (line_input, "src %U",
- unformat_ip4_address, &src4))
- src_set = 1;
- else if (unformat (line_input, "dst %U",
- unformat_ip4_address, &dst4))
- dst_set = 1;
- else if (unformat (line_input, "outer-fib-id %d", &outer_fib_id))
- ;
- else {
- errmsg ("parse error '%U'\n", format_unformat_error, line_input);
- return -99;
- }
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (line_input, "del"))
+ is_add = 0;
+ else if (unformat (line_input, "src %U", unformat_ip4_address, &src4))
+ src_set = 1;
+ else if (unformat (line_input, "dst %U", unformat_ip4_address, &dst4))
+ dst_set = 1;
+ else if (unformat (line_input, "outer-fib-id %d", &outer_fib_id))
+ ;
+ else
+ {
+ errmsg ("parse error '%U'\n", format_unformat_error, line_input);
+ return -99;
+ }
}
- if (src_set == 0) {
- errmsg ("tunnel src address not specified\n");
- return -99;
+ if (src_set == 0)
+ {
+ errmsg ("tunnel src address not specified\n");
+ return -99;
}
- if (dst_set == 0) {
- errmsg ("tunnel dst address not specified\n");
- return -99;
+ if (dst_set == 0)
+ {
+ errmsg ("tunnel dst address not specified\n");
+ return -99;
}
- M (GRE_ADD_DEL_TUNNEL, gre_add_del_tunnel);
+ M (GRE_ADD_DEL_TUNNEL, gre_add_del_tunnel);
- clib_memcpy(&mp->src_address, &src4, sizeof(src4));
- clib_memcpy(&mp->dst_address, &dst4, sizeof(dst4));
- mp->outer_fib_id = ntohl(outer_fib_id);
- mp->is_add = is_add;
+ clib_memcpy (&mp->src_address, &src4, sizeof (src4));
+ clib_memcpy (&mp->dst_address, &dst4, sizeof (dst4));
+ mp->outer_fib_id = ntohl (outer_fib_id);
+ mp->is_add = is_add;
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
static void vl_api_gre_tunnel_details_t_handler
-(vl_api_gre_tunnel_details_t * mp)
+ (vl_api_gre_tunnel_details_t * mp)
{
- vat_main_t * vam = &vat_main;
+ vat_main_t *vam = &vat_main;
- fformat(vam->ofp, "%11d%15U%15U%14d\n",
- ntohl(mp->sw_if_index),
- format_ip4_address, &mp->src_address,
- format_ip4_address, &mp->dst_address,
- ntohl(mp->outer_fib_id));
+ fformat (vam->ofp, "%11d%15U%15U%14d\n",
+ ntohl (mp->sw_if_index),
+ format_ip4_address, &mp->src_address,
+ format_ip4_address, &mp->dst_address, ntohl (mp->outer_fib_id));
}
static void vl_api_gre_tunnel_details_t_handler_json
-(vl_api_gre_tunnel_details_t * mp)
+ (vl_api_gre_tunnel_details_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t *node = NULL;
- struct in_addr ip4;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
+ struct in_addr ip4;
- if (VAT_JSON_ARRAY != vam->json_tree.type) {
- ASSERT(VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array(&vam->json_tree);
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
}
- node = vat_json_array_add(&vam->json_tree);
+ node = vat_json_array_add (&vam->json_tree);
- vat_json_init_object(node);
- vat_json_object_add_uint(node, "sw_if_index", ntohl(mp->sw_if_index));
- clib_memcpy(&ip4, &mp->src_address, sizeof(ip4));
- vat_json_object_add_ip4(node, "src_address", ip4);
- clib_memcpy(&ip4, &mp->dst_address, sizeof(ip4));
- vat_json_object_add_ip4(node, "dst_address", ip4);
- vat_json_object_add_uint(node, "outer_fib_id", ntohl(mp->outer_fib_id));
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+ clib_memcpy (&ip4, &mp->src_address, sizeof (ip4));
+ vat_json_object_add_ip4 (node, "src_address", ip4);
+ clib_memcpy (&ip4, &mp->dst_address, sizeof (ip4));
+ vat_json_object_add_ip4 (node, "dst_address", ip4);
+ vat_json_object_add_uint (node, "outer_fib_id", ntohl (mp->outer_fib_id));
}
-static int api_gre_tunnel_dump (vat_main_t * vam)
+static int
+api_gre_tunnel_dump (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_gre_tunnel_dump_t *mp;
- f64 timeout;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
+ unformat_input_t *i = vam->input;
+ vl_api_gre_tunnel_dump_t *mp;
+ f64 timeout;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
- /* Parse args required to build the message */
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else
- break;
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else
+ break;
}
- if (sw_if_index_set == 0) {
- sw_if_index = ~0;
+ if (sw_if_index_set == 0)
+ {
+ sw_if_index = ~0;
}
- if (!vam->json_output) {
- fformat(vam->ofp, "%11s%15s%15s%14s\n",
- "sw_if_index", "src_address", "dst_address",
- "outer_fib_id");
+ if (!vam->json_output)
+ {
+ fformat (vam->ofp, "%11s%15s%15s%14s\n",
+ "sw_if_index", "src_address", "dst_address", "outer_fib_id");
}
- /* Get list of gre-tunnel interfaces */
- M(GRE_TUNNEL_DUMP, gre_tunnel_dump);
+ /* Get list of gre-tunnel interfaces */
+ M (GRE_TUNNEL_DUMP, gre_tunnel_dump);
- mp->sw_if_index = htonl(sw_if_index);
+ mp->sw_if_index = htonl (sw_if_index);
- S;
+ S;
- /* Use a control ping for synchronization */
- {
- vl_api_control_ping_t * mp;
- M(CONTROL_PING, control_ping);
- S;
- }
- W;
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
+ S;
+ }
+ W;
}
-static int api_l2_fib_clear_table (vat_main_t * vam)
+static int
+api_l2_fib_clear_table (vat_main_t * vam)
{
// unformat_input_t * i = vam->input;
- vl_api_l2_fib_clear_table_t *mp;
- f64 timeout;
+ vl_api_l2_fib_clear_table_t *mp;
+ f64 timeout;
- M(L2_FIB_CLEAR_TABLE, l2_fib_clear_table);
+ M (L2_FIB_CLEAR_TABLE, l2_fib_clear_table);
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_l2_interface_efp_filter (vat_main_t * vam)
+static int
+api_l2_interface_efp_filter (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_l2_interface_efp_filter_t *mp;
- f64 timeout;
- u32 sw_if_index;
- u8 enable = 1;
- u8 sw_if_index_set = 0;
+ unformat_input_t *i = vam->input;
+ vl_api_l2_interface_efp_filter_t *mp;
+ f64 timeout;
+ u32 sw_if_index;
+ u8 enable = 1;
+ u8 sw_if_index_set = 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "enable"))
- enable = 1;
- else if (unformat (i, "disable"))
- enable = 0;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "enable"))
+ enable = 1;
+ else if (unformat (i, "disable"))
+ enable = 0;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (sw_if_index_set == 0) {
- errmsg ("missing sw_if_index\n");
- return -99;
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing sw_if_index\n");
+ return -99;
}
- M(L2_INTERFACE_EFP_FILTER, l2_interface_efp_filter);
+ M (L2_INTERFACE_EFP_FILTER, l2_interface_efp_filter);
- mp->sw_if_index = ntohl(sw_if_index);
- mp->enable_disable = enable;
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->enable_disable = enable;
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
#define foreach_vtr_op \
@@ -8743,816 +9439,893 @@ _("translate-1-2", L2_VTR_TRANSLATE_1_2) \
_("translate-2-1", L2_VTR_TRANSLATE_2_1) \
_("translate-2-2", L2_VTR_TRANSLATE_2_2)
-static int api_l2_interface_vlan_tag_rewrite (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_l2_interface_vlan_tag_rewrite_t *mp;
- f64 timeout;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
- u8 vtr_op_set = 0;
- u32 vtr_op = 0;
- u32 push_dot1q = 1;
- u32 tag1 = ~0;
- u32 tag2 = ~0;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "vtr_op %d", &vtr_op))
- vtr_op_set = 1;
+static int
+api_l2_interface_vlan_tag_rewrite (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_l2_interface_vlan_tag_rewrite_t *mp;
+ f64 timeout;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
+ u8 vtr_op_set = 0;
+ u32 vtr_op = 0;
+ u32 push_dot1q = 1;
+ u32 tag1 = ~0;
+ u32 tag2 = ~0;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "vtr_op %d", &vtr_op))
+ vtr_op_set = 1;
#define _(n,v) else if (unformat(i, n)) {vtr_op = v; vtr_op_set = 1;}
- foreach_vtr_op
+ foreach_vtr_op
#undef _
-
- else if (unformat (i, "push_dot1q %d", &push_dot1q))
- ;
- else if (unformat (i, "tag1 %d", &tag1))
- ;
- else if (unformat (i, "tag2 %d", &tag2))
- ;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ else if (unformat (i, "push_dot1q %d", &push_dot1q))
+ ;
+ else if (unformat (i, "tag1 %d", &tag1))
+ ;
+ else if (unformat (i, "tag2 %d", &tag2))
+ ;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if ((sw_if_index_set == 0)||(vtr_op_set == 0)) {
- errmsg ("missing vtr operation or sw_if_index\n");
- return -99;
+ if ((sw_if_index_set == 0) || (vtr_op_set == 0))
+ {
+ errmsg ("missing vtr operation or sw_if_index\n");
+ return -99;
}
- M(L2_INTERFACE_VLAN_TAG_REWRITE, l2_interface_vlan_tag_rewrite)
-
- mp->sw_if_index = ntohl(sw_if_index);
- mp->vtr_op = ntohl(vtr_op);
- mp->push_dot1q = ntohl(push_dot1q);
- mp->tag1 = ntohl(tag1);
- mp->tag2 = ntohl(tag2);
+ M (L2_INTERFACE_VLAN_TAG_REWRITE, l2_interface_vlan_tag_rewrite)
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->vtr_op = ntohl (vtr_op);
+ mp->push_dot1q = ntohl (push_dot1q);
+ mp->tag1 = ntohl (tag1);
+ mp->tag2 = ntohl (tag2);
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_create_vhost_user_if (vat_main_t * vam)
+static int
+api_create_vhost_user_if (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_create_vhost_user_if_t *mp;
- f64 timeout;
- u8 * file_name;
- u8 is_server = 0;
- u8 file_name_set = 0;
- u32 custom_dev_instance = ~0;
- u8 hwaddr[6];
- u8 use_custom_mac = 0;
+ unformat_input_t *i = vam->input;
+ vl_api_create_vhost_user_if_t *mp;
+ f64 timeout;
+ u8 *file_name;
+ u8 is_server = 0;
+ u8 file_name_set = 0;
+ u32 custom_dev_instance = ~0;
+ u8 hwaddr[6];
+ u8 use_custom_mac = 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "socket %s", &file_name)) {
- file_name_set = 1;
- }
- else if (unformat (i, "renumber %"PRIu32, &custom_dev_instance))
- ;
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "socket %s", &file_name))
+ {
+ file_name_set = 1;
+ }
+ else if (unformat (i, "renumber %" PRIu32, &custom_dev_instance))
+ ;
else if (unformat (i, "mac %U", unformat_ethernet_address, hwaddr))
- use_custom_mac = 1;
+ use_custom_mac = 1;
else if (unformat (i, "server"))
- is_server = 1;
+ is_server = 1;
else
- break;
+ break;
}
- if (file_name_set == 0) {
+ if (file_name_set == 0)
+ {
errmsg ("missing socket file name\n");
return -99;
}
- if (vec_len (file_name) > 255) {
+ if (vec_len (file_name) > 255)
+ {
errmsg ("socket file name too long\n");
return -99;
}
- vec_add1 (file_name, 0);
+ vec_add1 (file_name, 0);
- M(CREATE_VHOST_USER_IF, create_vhost_user_if);
+ M (CREATE_VHOST_USER_IF, create_vhost_user_if);
- mp->is_server = is_server;
- clib_memcpy(mp->sock_filename, file_name, vec_len(file_name));
- vec_free(file_name);
- if (custom_dev_instance != ~0) {
- mp->renumber = 1;
- mp->custom_dev_instance = ntohl(custom_dev_instance);
+ mp->is_server = is_server;
+ clib_memcpy (mp->sock_filename, file_name, vec_len (file_name));
+ vec_free (file_name);
+ if (custom_dev_instance != ~0)
+ {
+ mp->renumber = 1;
+ mp->custom_dev_instance = ntohl (custom_dev_instance);
}
- mp->use_custom_mac = use_custom_mac;
- clib_memcpy(mp->mac_address, hwaddr, 6);
+ mp->use_custom_mac = use_custom_mac;
+ clib_memcpy (mp->mac_address, hwaddr, 6);
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_modify_vhost_user_if (vat_main_t * vam)
+static int
+api_modify_vhost_user_if (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_modify_vhost_user_if_t *mp;
- f64 timeout;
- u8 * file_name;
- u8 is_server = 0;
- u8 file_name_set = 0;
- u32 custom_dev_instance = ~0;
- u8 sw_if_index_set = 0;
- u32 sw_if_index = (u32)~0;
+ unformat_input_t *i = vam->input;
+ vl_api_modify_vhost_user_if_t *mp;
+ f64 timeout;
+ u8 *file_name;
+ u8 is_server = 0;
+ u8 file_name_set = 0;
+ u32 custom_dev_instance = ~0;
+ u8 sw_if_index_set = 0;
+ u32 sw_if_index = (u32) ~ 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
+ sw_if_index_set = 1;
else if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "socket %s", &file_name)) {
- file_name_set = 1;
- }
- else if (unformat (i, "renumber %"PRIu32, &custom_dev_instance))
- ;
+ sw_if_index_set = 1;
+ else if (unformat (i, "socket %s", &file_name))
+ {
+ file_name_set = 1;
+ }
+ else if (unformat (i, "renumber %" PRIu32, &custom_dev_instance))
+ ;
else if (unformat (i, "server"))
- is_server = 1;
+ is_server = 1;
else
- break;
+ break;
}
- if (sw_if_index_set == 0) {
- errmsg ("missing sw_if_index or interface name\n");
- return -99;
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing sw_if_index or interface name\n");
+ return -99;
}
- if (file_name_set == 0) {
+ if (file_name_set == 0)
+ {
errmsg ("missing socket file name\n");
return -99;
}
- if (vec_len (file_name) > 255) {
+ if (vec_len (file_name) > 255)
+ {
errmsg ("socket file name too long\n");
return -99;
}
- vec_add1 (file_name, 0);
+ vec_add1 (file_name, 0);
- M(MODIFY_VHOST_USER_IF, modify_vhost_user_if);
+ M (MODIFY_VHOST_USER_IF, modify_vhost_user_if);
- mp->sw_if_index = ntohl(sw_if_index);
- mp->is_server = is_server;
- clib_memcpy(mp->sock_filename, file_name, vec_len(file_name));
- vec_free(file_name);
- if (custom_dev_instance != ~0) {
- mp->renumber = 1;
- mp->custom_dev_instance = ntohl(custom_dev_instance);
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->is_server = is_server;
+ clib_memcpy (mp->sock_filename, file_name, vec_len (file_name));
+ vec_free (file_name);
+ if (custom_dev_instance != ~0)
+ {
+ mp->renumber = 1;
+ mp->custom_dev_instance = ntohl (custom_dev_instance);
}
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_delete_vhost_user_if (vat_main_t * vam)
+static int
+api_delete_vhost_user_if (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_delete_vhost_user_if_t *mp;
- f64 timeout;
- u32 sw_if_index = ~0;
- u8 sw_if_index_set = 0;
+ unformat_input_t *i = vam->input;
+ vl_api_delete_vhost_user_if_t *mp;
+ f64 timeout;
+ u32 sw_if_index = ~0;
+ u8 sw_if_index_set = 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
+ sw_if_index_set = 1;
else if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
+ sw_if_index_set = 1;
else
- break;
+ break;
}
- if (sw_if_index_set == 0) {
- errmsg ("missing sw_if_index or interface name\n");
- return -99;
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing sw_if_index or interface name\n");
+ return -99;
}
- M(DELETE_VHOST_USER_IF, delete_vhost_user_if);
+ M (DELETE_VHOST_USER_IF, delete_vhost_user_if);
- mp->sw_if_index = ntohl(sw_if_index);
+ mp->sw_if_index = ntohl (sw_if_index);
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
static void vl_api_sw_interface_vhost_user_details_t_handler
-(vl_api_sw_interface_vhost_user_details_t * mp)
+ (vl_api_sw_interface_vhost_user_details_t * mp)
{
- vat_main_t * vam = &vat_main;
+ vat_main_t *vam = &vat_main;
- fformat(vam->ofp, "%-25s %3" PRIu32 " %6" PRIu32 " %8x %6d %7d %s\n",
- (char *)mp->interface_name,
- ntohl(mp->sw_if_index), ntohl(mp->virtio_net_hdr_sz),
- clib_net_to_host_u64(mp->features), mp->is_server,
- ntohl(mp->num_regions), (char *)mp->sock_filename);
- fformat(vam->ofp, " Status: '%s'\n", strerror(ntohl(mp->sock_errno)));
+ fformat (vam->ofp, "%-25s %3" PRIu32 " %6" PRIu32 " %8x %6d %7d %s\n",
+ (char *) mp->interface_name,
+ ntohl (mp->sw_if_index), ntohl (mp->virtio_net_hdr_sz),
+ clib_net_to_host_u64 (mp->features), mp->is_server,
+ ntohl (mp->num_regions), (char *) mp->sock_filename);
+ fformat (vam->ofp, " Status: '%s'\n", strerror (ntohl (mp->sock_errno)));
}
static void vl_api_sw_interface_vhost_user_details_t_handler_json
-(vl_api_sw_interface_vhost_user_details_t * mp)
+ (vl_api_sw_interface_vhost_user_details_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t *node = NULL;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
- if (VAT_JSON_ARRAY != vam->json_tree.type) {
- ASSERT(VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array(&vam->json_tree);
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
}
- node = vat_json_array_add(&vam->json_tree);
+ node = vat_json_array_add (&vam->json_tree);
- vat_json_init_object(node);
- vat_json_object_add_uint(node, "sw_if_index", ntohl(mp->sw_if_index));
- vat_json_object_add_string_copy(node, "interface_name", mp->interface_name);
- vat_json_object_add_uint(node, "virtio_net_hdr_sz", ntohl(mp->virtio_net_hdr_sz));
- vat_json_object_add_uint(node, "features", clib_net_to_host_u64(mp->features));
- vat_json_object_add_uint(node, "is_server", mp->is_server);
- vat_json_object_add_string_copy(node, "sock_filename", mp->sock_filename);
- vat_json_object_add_uint(node, "num_regions", ntohl(mp->num_regions));
- vat_json_object_add_uint(node, "sock_errno", ntohl(mp->sock_errno));
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+ vat_json_object_add_string_copy (node, "interface_name",
+ mp->interface_name);
+ vat_json_object_add_uint (node, "virtio_net_hdr_sz",
+ ntohl (mp->virtio_net_hdr_sz));
+ vat_json_object_add_uint (node, "features",
+ clib_net_to_host_u64 (mp->features));
+ vat_json_object_add_uint (node, "is_server", mp->is_server);
+ vat_json_object_add_string_copy (node, "sock_filename", mp->sock_filename);
+ vat_json_object_add_uint (node, "num_regions", ntohl (mp->num_regions));
+ vat_json_object_add_uint (node, "sock_errno", ntohl (mp->sock_errno));
}
-static int api_sw_interface_vhost_user_dump (vat_main_t * vam)
+static int
+api_sw_interface_vhost_user_dump (vat_main_t * vam)
{
- vl_api_sw_interface_vhost_user_dump_t *mp;
- f64 timeout;
- fformat(vam->ofp, "Interface name idx hdr_sz features server regions filename\n");
+ vl_api_sw_interface_vhost_user_dump_t *mp;
+ f64 timeout;
+ fformat (vam->ofp,
+ "Interface name idx hdr_sz features server regions filename\n");
- /* Get list of vhost-user interfaces */
- M(SW_INTERFACE_VHOST_USER_DUMP, sw_interface_vhost_user_dump);
- S;
+ /* Get list of vhost-user interfaces */
+ M (SW_INTERFACE_VHOST_USER_DUMP, sw_interface_vhost_user_dump);
+ S;
- /* Use a control ping for synchronization */
- {
- vl_api_control_ping_t * mp;
- M(CONTROL_PING, control_ping);
- S;
- }
- W;
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
+ S;
+ }
+ W;
}
-static int api_show_version (vat_main_t * vam)
+static int
+api_show_version (vat_main_t * vam)
{
- vl_api_show_version_t *mp;
- f64 timeout;
+ vl_api_show_version_t *mp;
+ f64 timeout;
- M(SHOW_VERSION, show_version);
+ M (SHOW_VERSION, show_version);
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_vxlan_gpe_add_del_tunnel (vat_main_t * vam)
-{
- unformat_input_t * line_input = vam->input;
- vl_api_vxlan_gpe_add_del_tunnel_t *mp;
- f64 timeout;
- ip4_address_t local4, remote4;
- ip6_address_t local6, remote6;
- u8 is_add = 1;
- u8 ipv4_set = 0, ipv6_set = 0;
- u8 local_set = 0;
- u8 remote_set = 0;
- u32 encap_vrf_id = 0;
- u32 decap_vrf_id = 0;
- u8 protocol = ~0;
- u32 vni;
- u8 vni_set = 0;
-
- while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
- if (unformat (line_input, "del"))
- is_add = 0;
- else if (unformat (line_input, "local %U",
- unformat_ip4_address, &local4))
- {
- local_set = 1;
- ipv4_set = 1;
- }
- else if (unformat (line_input, "remote %U",
- unformat_ip4_address, &remote4))
- {
- remote_set = 1;
- ipv4_set = 1;
- }
- else if (unformat (line_input, "local %U",
- unformat_ip6_address, &local6))
- {
- local_set = 1;
- ipv6_set = 1;
- }
- else if (unformat (line_input, "remote %U",
- unformat_ip6_address, &remote6))
- {
- remote_set = 1;
- ipv6_set = 1;
- }
- else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id))
- ;
- else if (unformat (line_input, "decap-vrf-id %d", &decap_vrf_id))
- ;
- else if (unformat (line_input, "vni %d", &vni))
- vni_set = 1;
- else if (unformat(line_input, "next-ip4"))
- protocol = 1;
- else if (unformat(line_input, "next-ip6"))
- protocol = 2;
- else if (unformat(line_input, "next-ethernet"))
- protocol = 3;
- else if (unformat(line_input, "next-nsh"))
- protocol = 4;
- else {
- errmsg ("parse error '%U'\n", format_unformat_error, line_input);
- return -99;
- }
- }
-
- if (local_set == 0) {
- errmsg ("tunnel local address not specified\n");
- return -99;
- }
- if (remote_set == 0) {
- errmsg ("tunnel remote address not specified\n");
- return -99;
- }
- if (ipv4_set && ipv6_set) {
- errmsg ("both IPv4 and IPv6 addresses specified");
- return -99;
- }
-
- if (vni_set == 0) {
- errmsg ("vni not specified\n");
- return -99;
- }
-
- M(VXLAN_GPE_ADD_DEL_TUNNEL, vxlan_gpe_add_del_tunnel);
-
-
- if (ipv6_set) {
- clib_memcpy(&mp->local, &local6, sizeof(local6));
- clib_memcpy(&mp->remote, &remote6, sizeof(remote6));
- } else {
- clib_memcpy(&mp->local, &local4, sizeof(local4));
- clib_memcpy(&mp->remote, &remote4, sizeof(remote4));
- }
-
- mp->encap_vrf_id = ntohl(encap_vrf_id);
- mp->decap_vrf_id = ntohl(decap_vrf_id);
- mp->protocol = ntohl(protocol);
- mp->vni = ntohl(vni);
- mp->is_add = is_add;
- mp->is_ipv6 = ipv6_set;
-
- S; W;
- /* NOTREACHED */
- return 0;
+static int
+api_vxlan_gpe_add_del_tunnel (vat_main_t * vam)
+{
+ unformat_input_t *line_input = vam->input;
+ vl_api_vxlan_gpe_add_del_tunnel_t *mp;
+ f64 timeout;
+ ip4_address_t local4, remote4;
+ ip6_address_t local6, remote6;
+ u8 is_add = 1;
+ u8 ipv4_set = 0, ipv6_set = 0;
+ u8 local_set = 0;
+ u8 remote_set = 0;
+ u32 encap_vrf_id = 0;
+ u32 decap_vrf_id = 0;
+ u8 protocol = ~0;
+ u32 vni;
+ u8 vni_set = 0;
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (line_input, "del"))
+ is_add = 0;
+ else if (unformat (line_input, "local %U",
+ unformat_ip4_address, &local4))
+ {
+ local_set = 1;
+ ipv4_set = 1;
+ }
+ else if (unformat (line_input, "remote %U",
+ unformat_ip4_address, &remote4))
+ {
+ remote_set = 1;
+ ipv4_set = 1;
+ }
+ else if (unformat (line_input, "local %U",
+ unformat_ip6_address, &local6))
+ {
+ local_set = 1;
+ ipv6_set = 1;
+ }
+ else if (unformat (line_input, "remote %U",
+ unformat_ip6_address, &remote6))
+ {
+ remote_set = 1;
+ ipv6_set = 1;
+ }
+ else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id))
+ ;
+ else if (unformat (line_input, "decap-vrf-id %d", &decap_vrf_id))
+ ;
+ else if (unformat (line_input, "vni %d", &vni))
+ vni_set = 1;
+ else if (unformat (line_input, "next-ip4"))
+ protocol = 1;
+ else if (unformat (line_input, "next-ip6"))
+ protocol = 2;
+ else if (unformat (line_input, "next-ethernet"))
+ protocol = 3;
+ else if (unformat (line_input, "next-nsh"))
+ protocol = 4;
+ else
+ {
+ errmsg ("parse error '%U'\n", format_unformat_error, line_input);
+ return -99;
+ }
+ }
+
+ if (local_set == 0)
+ {
+ errmsg ("tunnel local address not specified\n");
+ return -99;
+ }
+ if (remote_set == 0)
+ {
+ errmsg ("tunnel remote address not specified\n");
+ return -99;
+ }
+ if (ipv4_set && ipv6_set)
+ {
+ errmsg ("both IPv4 and IPv6 addresses specified");
+ return -99;
+ }
+
+ if (vni_set == 0)
+ {
+ errmsg ("vni not specified\n");
+ return -99;
+ }
+
+ M (VXLAN_GPE_ADD_DEL_TUNNEL, vxlan_gpe_add_del_tunnel);
+
+
+ if (ipv6_set)
+ {
+ clib_memcpy (&mp->local, &local6, sizeof (local6));
+ clib_memcpy (&mp->remote, &remote6, sizeof (remote6));
+ }
+ else
+ {
+ clib_memcpy (&mp->local, &local4, sizeof (local4));
+ clib_memcpy (&mp->remote, &remote4, sizeof (remote4));
+ }
+
+ mp->encap_vrf_id = ntohl (encap_vrf_id);
+ mp->decap_vrf_id = ntohl (decap_vrf_id);
+ mp->protocol = ntohl (protocol);
+ mp->vni = ntohl (vni);
+ mp->is_add = is_add;
+ mp->is_ipv6 = ipv6_set;
+
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
static void vl_api_vxlan_gpe_tunnel_details_t_handler
-(vl_api_vxlan_gpe_tunnel_details_t * mp)
+ (vl_api_vxlan_gpe_tunnel_details_t * mp)
{
- vat_main_t * vam = &vat_main;
+ vat_main_t *vam = &vat_main;
- fformat(vam->ofp, "%11d%24U%24U%13d%12d%14d%14d\n",
- ntohl(mp->sw_if_index),
- format_ip46_address, &(mp->local[0]),
- format_ip46_address, &(mp->remote[0]),
- ntohl(mp->vni),
- ntohl(mp->protocol),
- ntohl(mp->encap_vrf_id),
- ntohl(mp->decap_vrf_id));
+ fformat (vam->ofp, "%11d%24U%24U%13d%12d%14d%14d\n",
+ ntohl (mp->sw_if_index),
+ format_ip46_address, &(mp->local[0]),
+ format_ip46_address, &(mp->remote[0]),
+ ntohl (mp->vni),
+ ntohl (mp->protocol),
+ ntohl (mp->encap_vrf_id), ntohl (mp->decap_vrf_id));
}
static void vl_api_vxlan_gpe_tunnel_details_t_handler_json
-(vl_api_vxlan_gpe_tunnel_details_t * mp)
-{
- vat_main_t * vam = &vat_main;
- vat_json_node_t *node = NULL;
- struct in_addr ip4;
- struct in6_addr ip6;
-
- if (VAT_JSON_ARRAY != vam->json_tree.type) {
- ASSERT(VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array(&vam->json_tree);
- }
- node = vat_json_array_add(&vam->json_tree);
-
- vat_json_init_object(node);
- vat_json_object_add_uint(node, "sw_if_index", ntohl(mp->sw_if_index));
- if (mp->is_ipv6) {
- clib_memcpy(&ip6, &(mp->local[0]), sizeof(ip6));
- vat_json_object_add_ip6(node, "local", ip6);
- clib_memcpy(&ip6, &(mp->remote[0]), sizeof(ip6));
- vat_json_object_add_ip6(node, "remote", ip6);
- } else {
- clib_memcpy(&ip4, &(mp->local[0]), sizeof(ip4));
- vat_json_object_add_ip4(node, "local", ip4);
- clib_memcpy(&ip4, &(mp->remote[0]), sizeof(ip4));
- vat_json_object_add_ip4(node, "remote", ip4);
- }
- vat_json_object_add_uint(node, "vni", ntohl(mp->vni));
- vat_json_object_add_uint(node, "protocol", ntohl(mp->protocol));
- vat_json_object_add_uint(node, "encap_vrf_id", ntohl(mp->encap_vrf_id));
- vat_json_object_add_uint(node, "decap_vrf_id", ntohl(mp->decap_vrf_id));
- vat_json_object_add_uint(node, "is_ipv6", mp->is_ipv6 ? 1 : 0);
-}
-
-static int api_vxlan_gpe_tunnel_dump (vat_main_t * vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_vxlan_gpe_tunnel_dump_t *mp;
- f64 timeout;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
-
- /* Parse args required to build the message */
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else
- break;
- }
+ (vl_api_vxlan_gpe_tunnel_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
+ struct in_addr ip4;
+ struct in6_addr ip6;
- if (sw_if_index_set == 0) {
- sw_if_index = ~0;
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
}
+ node = vat_json_array_add (&vam->json_tree);
- if (!vam->json_output) {
- fformat(vam->ofp, "%11s%24s%24s%13s%15s%14s%14s\n",
- "sw_if_index", "local", "remote", "vni",
- "protocol","encap_vrf_id", "decap_vrf_id");
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+ if (mp->is_ipv6)
+ {
+ clib_memcpy (&ip6, &(mp->local[0]), sizeof (ip6));
+ vat_json_object_add_ip6 (node, "local", ip6);
+ clib_memcpy (&ip6, &(mp->remote[0]), sizeof (ip6));
+ vat_json_object_add_ip6 (node, "remote", ip6);
}
+ else
+ {
+ clib_memcpy (&ip4, &(mp->local[0]), sizeof (ip4));
+ vat_json_object_add_ip4 (node, "local", ip4);
+ clib_memcpy (&ip4, &(mp->remote[0]), sizeof (ip4));
+ vat_json_object_add_ip4 (node, "remote", ip4);
+ }
+ vat_json_object_add_uint (node, "vni", ntohl (mp->vni));
+ vat_json_object_add_uint (node, "protocol", ntohl (mp->protocol));
+ vat_json_object_add_uint (node, "encap_vrf_id", ntohl (mp->encap_vrf_id));
+ vat_json_object_add_uint (node, "decap_vrf_id", ntohl (mp->decap_vrf_id));
+ vat_json_object_add_uint (node, "is_ipv6", mp->is_ipv6 ? 1 : 0);
+}
- /* Get list of vxlan-tunnel interfaces */
- M(VXLAN_GPE_TUNNEL_DUMP, vxlan_gpe_tunnel_dump);
+static int
+api_vxlan_gpe_tunnel_dump (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_vxlan_gpe_tunnel_dump_t *mp;
+ f64 timeout;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
- mp->sw_if_index = htonl(sw_if_index);
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else
+ break;
+ }
- S;
+ if (sw_if_index_set == 0)
+ {
+ sw_if_index = ~0;
+ }
- /* Use a control ping for synchronization */
+ if (!vam->json_output)
{
- vl_api_control_ping_t * mp;
- M(CONTROL_PING, control_ping);
- S;
+ fformat (vam->ofp, "%11s%24s%24s%13s%15s%14s%14s\n",
+ "sw_if_index", "local", "remote", "vni",
+ "protocol", "encap_vrf_id", "decap_vrf_id");
}
- W;
+
+ /* Get list of vxlan-tunnel interfaces */
+ M (VXLAN_GPE_TUNNEL_DUMP, vxlan_gpe_tunnel_dump);
+
+ mp->sw_if_index = htonl (sw_if_index);
+
+ S;
+
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
+ S;
+ }
+ W;
}
-u8 * format_l2_fib_mac_address (u8 * s, va_list * args)
+u8 *
+format_l2_fib_mac_address (u8 * s, va_list * args)
{
- u8 * a = va_arg (*args, u8 *);
+ u8 *a = va_arg (*args, u8 *);
return format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
- a[2], a[3], a[4], a[5], a[6], a[7]);
+ a[2], a[3], a[4], a[5], a[6], a[7]);
}
static void vl_api_l2_fib_table_entry_t_handler
-(vl_api_l2_fib_table_entry_t * mp)
+ (vl_api_l2_fib_table_entry_t * mp)
{
- vat_main_t * vam = &vat_main;
+ vat_main_t *vam = &vat_main;
- fformat(vam->ofp, "%3" PRIu32 " %U %3" PRIu32
- " %d %d %d\n",
- ntohl(mp->bd_id), format_l2_fib_mac_address, &mp->mac,
- ntohl(mp->sw_if_index), mp->static_mac, mp->filter_mac,
- mp->bvi_mac);
+ fformat (vam->ofp, "%3" PRIu32 " %U %3" PRIu32
+ " %d %d %d\n",
+ ntohl (mp->bd_id), format_l2_fib_mac_address, &mp->mac,
+ ntohl (mp->sw_if_index), mp->static_mac, mp->filter_mac,
+ mp->bvi_mac);
}
static void vl_api_l2_fib_table_entry_t_handler_json
-(vl_api_l2_fib_table_entry_t * mp)
+ (vl_api_l2_fib_table_entry_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t *node = NULL;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
- if (VAT_JSON_ARRAY != vam->json_tree.type) {
- ASSERT(VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array(&vam->json_tree);
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
}
- node = vat_json_array_add(&vam->json_tree);
+ node = vat_json_array_add (&vam->json_tree);
- vat_json_init_object(node);
- vat_json_object_add_uint(node, "bd_id", ntohl(mp->bd_id));
- vat_json_object_add_uint(node, "mac", clib_net_to_host_u64(mp->mac));
- vat_json_object_add_uint(node, "sw_if_index", ntohl(mp->sw_if_index));
- vat_json_object_add_uint(node, "static_mac", mp->static_mac);
- vat_json_object_add_uint(node, "filter_mac", mp->filter_mac);
- vat_json_object_add_uint(node, "bvi_mac", mp->bvi_mac);
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "bd_id", ntohl (mp->bd_id));
+ vat_json_object_add_uint (node, "mac", clib_net_to_host_u64 (mp->mac));
+ vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+ vat_json_object_add_uint (node, "static_mac", mp->static_mac);
+ vat_json_object_add_uint (node, "filter_mac", mp->filter_mac);
+ vat_json_object_add_uint (node, "bvi_mac", mp->bvi_mac);
}
-static int api_l2_fib_table_dump (vat_main_t * vam)
+static int
+api_l2_fib_table_dump (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_l2_fib_table_dump_t *mp;
- f64 timeout;
- u32 bd_id;
- u8 bd_id_set = 0;
+ unformat_input_t *i = vam->input;
+ vl_api_l2_fib_table_dump_t *mp;
+ f64 timeout;
+ u32 bd_id;
+ u8 bd_id_set = 0;
- /* Parse args required to build the message */
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "bd_id %d", &bd_id))
- bd_id_set = 1;
- else
- break;
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "bd_id %d", &bd_id))
+ bd_id_set = 1;
+ else
+ break;
}
- if (bd_id_set == 0) {
- errmsg ("missing bridge domain\n");
- return -99;
+ if (bd_id_set == 0)
+ {
+ errmsg ("missing bridge domain\n");
+ return -99;
}
- fformat(vam->ofp, "BD-ID Mac Address sw-ndx Static Filter BVI\n");
+ fformat (vam->ofp,
+ "BD-ID Mac Address sw-ndx Static Filter BVI\n");
- /* Get list of l2 fib entries */
- M(L2_FIB_TABLE_DUMP, l2_fib_table_dump);
+ /* Get list of l2 fib entries */
+ M (L2_FIB_TABLE_DUMP, l2_fib_table_dump);
- mp->bd_id = ntohl(bd_id);
- S;
+ mp->bd_id = ntohl (bd_id);
+ S;
- /* Use a control ping for synchronization */
- {
- vl_api_control_ping_t * mp;
- M(CONTROL_PING, control_ping);
- S;
- }
- W;
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
+ S;
+ }
+ W;
}
static int
api_interface_name_renumber (vat_main_t * vam)
{
- unformat_input_t * line_input = vam->input;
- vl_api_interface_name_renumber_t *mp;
- u32 sw_if_index = ~0;
- f64 timeout;
- u32 new_show_dev_instance = ~0;
-
- while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
- if (unformat (line_input, "%U", unformat_sw_if_index, vam,
- &sw_if_index))
- ;
- else if (unformat (line_input, "sw_if_index %d", &sw_if_index))
- ;
- else if (unformat (line_input, "new_show_dev_instance %d",
- &new_show_dev_instance))
- ;
- else
- break;
+ unformat_input_t *line_input = vam->input;
+ vl_api_interface_name_renumber_t *mp;
+ u32 sw_if_index = ~0;
+ f64 timeout;
+ u32 new_show_dev_instance = ~0;
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (line_input, "%U", unformat_sw_if_index, vam,
+ &sw_if_index))
+ ;
+ else if (unformat (line_input, "sw_if_index %d", &sw_if_index))
+ ;
+ else if (unformat (line_input, "new_show_dev_instance %d",
+ &new_show_dev_instance))
+ ;
+ else
+ break;
}
- if (sw_if_index == ~0) {
- errmsg ("missing interface name or sw_if_index\n");
- return -99;
+ if (sw_if_index == ~0)
+ {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
}
- if (new_show_dev_instance == ~0) {
- errmsg ("missing new_show_dev_instance\n");
- return -99;
+ if (new_show_dev_instance == ~0)
+ {
+ errmsg ("missing new_show_dev_instance\n");
+ return -99;
}
- M(INTERFACE_NAME_RENUMBER, interface_name_renumber);
+ M (INTERFACE_NAME_RENUMBER, interface_name_renumber);
- mp->sw_if_index = ntohl (sw_if_index);
- mp->new_show_dev_instance = ntohl (new_show_dev_instance);
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->new_show_dev_instance = ntohl (new_show_dev_instance);
- S; W;
+ S;
+ W;
}
static int
api_want_ip4_arp_events (vat_main_t * vam)
{
- unformat_input_t * line_input = vam->input;
- vl_api_want_ip4_arp_events_t * mp;
- f64 timeout;
- ip4_address_t address;
- int address_set = 0;
- u32 enable_disable = 1;
-
- while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
- if (unformat (line_input, "address %U",
- unformat_ip4_address, &address))
- address_set = 1;
- else if (unformat (line_input, "del"))
- enable_disable = 0;
- else
- break;
+ unformat_input_t *line_input = vam->input;
+ vl_api_want_ip4_arp_events_t *mp;
+ f64 timeout;
+ ip4_address_t address;
+ int address_set = 0;
+ u32 enable_disable = 1;
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (line_input, "address %U", unformat_ip4_address, &address))
+ address_set = 1;
+ else if (unformat (line_input, "del"))
+ enable_disable = 0;
+ else
+ break;
}
- if (address_set == 0) {
- errmsg ("missing addresses\n");
- return -99;
+ if (address_set == 0)
+ {
+ errmsg ("missing addresses\n");
+ return -99;
}
- M(WANT_IP4_ARP_EVENTS, want_ip4_arp_events);
- mp->enable_disable = enable_disable;
- mp->pid = getpid();
- mp->address = address.as_u32;
+ M (WANT_IP4_ARP_EVENTS, want_ip4_arp_events);
+ mp->enable_disable = enable_disable;
+ mp->pid = getpid ();
+ mp->address = address.as_u32;
- S; W;
+ S;
+ W;
}
-static int api_input_acl_set_interface (vat_main_t * vam)
+static int
+api_input_acl_set_interface (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_input_acl_set_interface_t *mp;
- f64 timeout;
- u32 sw_if_index;
- int sw_if_index_set;
- u32 ip4_table_index = ~0;
- u32 ip6_table_index = ~0;
- u32 l2_table_index = ~0;
- u8 is_add = 1;
+ unformat_input_t *i = vam->input;
+ vl_api_input_acl_set_interface_t *mp;
+ f64 timeout;
+ u32 sw_if_index;
+ int sw_if_index_set;
+ u32 ip4_table_index = ~0;
+ u32 ip6_table_index = ~0;
+ u32 l2_table_index = ~0;
+ u8 is_add = 1;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "del"))
- is_add = 0;
- else if (unformat (i, "ip4-table %d", &ip4_table_index))
- ;
- else if (unformat (i, "ip6-table %d", &ip6_table_index))
- ;
- else if (unformat (i, "l2-table %d", &l2_table_index))
- ;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "del"))
+ is_add = 0;
+ else if (unformat (i, "ip4-table %d", &ip4_table_index))
+ ;
+ else if (unformat (i, "ip6-table %d", &ip6_table_index))
+ ;
+ else if (unformat (i, "l2-table %d", &l2_table_index))
+ ;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (sw_if_index_set == 0) {
- errmsg ("missing interface name or sw_if_index\n");
- return -99;
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
}
- M(INPUT_ACL_SET_INTERFACE, input_acl_set_interface);
+ M (INPUT_ACL_SET_INTERFACE, input_acl_set_interface);
- mp->sw_if_index = ntohl(sw_if_index);
- mp->ip4_table_index = ntohl(ip4_table_index);
- mp->ip6_table_index = ntohl(ip6_table_index);
- mp->l2_table_index = ntohl(l2_table_index);
- mp->is_add = is_add;
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->ip4_table_index = ntohl (ip4_table_index);
+ mp->ip6_table_index = ntohl (ip6_table_index);
+ mp->l2_table_index = ntohl (l2_table_index);
+ mp->is_add = is_add;
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
static int
api_ip_address_dump (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_ip_address_dump_t * mp;
- u32 sw_if_index = ~0;
- u8 sw_if_index_set = 0;
- u8 ipv4_set = 0;
- u8 ipv6_set = 0;
- f64 timeout;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "ipv4"))
- ipv4_set = 1;
- else if (unformat (i, "ipv6"))
- ipv6_set = 1;
- else
- break;
+ unformat_input_t *i = vam->input;
+ vl_api_ip_address_dump_t *mp;
+ u32 sw_if_index = ~0;
+ u8 sw_if_index_set = 0;
+ u8 ipv4_set = 0;
+ u8 ipv6_set = 0;
+ f64 timeout;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "ipv4"))
+ ipv4_set = 1;
+ else if (unformat (i, "ipv6"))
+ ipv6_set = 1;
+ else
+ break;
}
- if (ipv4_set && ipv6_set) {
- errmsg ("ipv4 and ipv6 flags cannot be both set\n");
- return -99;
+ if (ipv4_set && ipv6_set)
+ {
+ errmsg ("ipv4 and ipv6 flags cannot be both set\n");
+ return -99;
}
- if ((!ipv4_set) && (!ipv6_set)) {
- errmsg ("no ipv4 nor ipv6 flag set\n");
- return -99;
+ if ((!ipv4_set) && (!ipv6_set))
+ {
+ errmsg ("no ipv4 nor ipv6 flag set\n");
+ return -99;
}
- if (sw_if_index_set == 0) {
- errmsg ("missing interface name or sw_if_index\n");
- return -99;
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
}
- vam->current_sw_if_index = sw_if_index;
- vam->is_ipv6 = ipv6_set;
+ vam->current_sw_if_index = sw_if_index;
+ vam->is_ipv6 = ipv6_set;
- M(IP_ADDRESS_DUMP, ip_address_dump);
- mp->sw_if_index = ntohl(sw_if_index);
- mp->is_ipv6 = ipv6_set;
- S;
+ M (IP_ADDRESS_DUMP, ip_address_dump);
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->is_ipv6 = ipv6_set;
+ S;
- /* Use a control ping for synchronization */
- {
- vl_api_control_ping_t * mp;
- M(CONTROL_PING, control_ping);
- S;
- }
- W;
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
+ S;
+ }
+ W;
}
static int
api_ip_dump (vat_main_t * vam)
{
- vl_api_ip_dump_t * mp;
- unformat_input_t * in = vam->input;
- int ipv4_set = 0;
- int ipv6_set = 0;
- int is_ipv6;
- f64 timeout;
- int i;
-
- while (unformat_check_input (in) != UNFORMAT_END_OF_INPUT) {
- if (unformat (in, "ipv4"))
- ipv4_set = 1;
- else if (unformat (in, "ipv6"))
- ipv6_set = 1;
- else
- break;
- }
+ vl_api_ip_dump_t *mp;
+ unformat_input_t *in = vam->input;
+ int ipv4_set = 0;
+ int ipv6_set = 0;
+ int is_ipv6;
+ f64 timeout;
+ int i;
- if (ipv4_set && ipv6_set) {
- errmsg ("ipv4 and ipv6 flags cannot be both set\n");
- return -99;
+ while (unformat_check_input (in) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (in, "ipv4"))
+ ipv4_set = 1;
+ else if (unformat (in, "ipv6"))
+ ipv6_set = 1;
+ else
+ break;
}
- if ((!ipv4_set) && (!ipv6_set)) {
- errmsg ("no ipv4 nor ipv6 flag set\n");
- return -99;
+ if (ipv4_set && ipv6_set)
+ {
+ errmsg ("ipv4 and ipv6 flags cannot be both set\n");
+ return -99;
}
- is_ipv6 = ipv6_set;
- vam->is_ipv6 = is_ipv6;
-
- /* free old data */
- for (i = 0; i < vec_len(vam->ip_details_by_sw_if_index[is_ipv6]); i++) {
- vec_free(vam->ip_details_by_sw_if_index[is_ipv6][i].addr);
+ if ((!ipv4_set) && (!ipv6_set))
+ {
+ errmsg ("no ipv4 nor ipv6 flag set\n");
+ return -99;
}
- vec_free(vam->ip_details_by_sw_if_index[is_ipv6]);
- M(IP_DUMP, ip_dump);
- mp->is_ipv6 = ipv6_set;
- S;
+ is_ipv6 = ipv6_set;
+ vam->is_ipv6 = is_ipv6;
- /* Use a control ping for synchronization */
+ /* free old data */
+ for (i = 0; i < vec_len (vam->ip_details_by_sw_if_index[is_ipv6]); i++)
{
- vl_api_control_ping_t * mp;
- M(CONTROL_PING, control_ping);
- S;
+ vec_free (vam->ip_details_by_sw_if_index[is_ipv6][i].addr);
}
- W;
+ vec_free (vam->ip_details_by_sw_if_index[is_ipv6]);
+
+ M (IP_DUMP, ip_dump);
+ mp->is_ipv6 = ipv6_set;
+ S;
+
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
+ S;
+ }
+ W;
}
static int
api_ipsec_spd_add_del (vat_main_t * vam)
{
#if DPDK > 0
- unformat_input_t * i = vam->input;
- vl_api_ipsec_spd_add_del_t *mp;
- f64 timeout;
- u32 spd_id = ~0;
- u8 is_add = 1;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "spd_id %d", &spd_id))
- ;
- else if (unformat (i, "del"))
- is_add = 0;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
- }
- if (spd_id == ~0) {
- errmsg ("spd_id must be set\n");
- return -99;
- }
-
- M(IPSEC_SPD_ADD_DEL, ipsec_spd_add_del);
-
- mp->spd_id = ntohl(spd_id);
- mp->is_add = is_add;
-
- S; W;
- /* NOTREACHED */
- return 0;
+ unformat_input_t *i = vam->input;
+ vl_api_ipsec_spd_add_del_t *mp;
+ f64 timeout;
+ u32 spd_id = ~0;
+ u8 is_add = 1;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "spd_id %d", &spd_id))
+ ;
+ else if (unformat (i, "del"))
+ is_add = 0;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
+ }
+ if (spd_id == ~0)
+ {
+ errmsg ("spd_id must be set\n");
+ return -99;
+ }
+
+ M (IPSEC_SPD_ADD_DEL, ipsec_spd_add_del);
+
+ mp->spd_id = ntohl (spd_id);
+ mp->is_add = is_add;
+
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
#else
- clib_warning ("unsupported (no dpdk)");
- return -99;
+ clib_warning ("unsupported (no dpdk)");
+ return -99;
#endif
}
@@ -9560,52 +10333,57 @@ static int
api_ipsec_interface_add_del_spd (vat_main_t * vam)
{
#if DPDK > 0
- unformat_input_t * i = vam->input;
- vl_api_ipsec_interface_add_del_spd_t *mp;
- f64 timeout;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
- u32 spd_id = (u32) ~0;
- u8 is_add = 1;
+ unformat_input_t *i = vam->input;
+ vl_api_ipsec_interface_add_del_spd_t *mp;
+ f64 timeout;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
+ u32 spd_id = (u32) ~ 0;
+ u8 is_add = 1;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "del"))
- is_add = 0;
- else if (unformat (i, "spd_id %d", &spd_id))
- ;
- else if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "del"))
+ is_add = 0;
+ else if (unformat (i, "spd_id %d", &spd_id))
+ ;
+ else if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (spd_id == (u32) ~0) {
- errmsg ("spd_id must be set\n");
- return -99;
+ if (spd_id == (u32) ~ 0)
+ {
+ errmsg ("spd_id must be set\n");
+ return -99;
}
- if (sw_if_index_set == 0) {
- errmsg ("missing interface name or sw_if_index\n");
- return -99;
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
}
- M(IPSEC_INTERFACE_ADD_DEL_SPD, ipsec_interface_add_del_spd);
+ M (IPSEC_INTERFACE_ADD_DEL_SPD, ipsec_interface_add_del_spd);
- mp->spd_id = ntohl(spd_id);
- mp->sw_if_index = ntohl (sw_if_index);
- mp->is_add = is_add;
+ mp->spd_id = ntohl (spd_id);
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->is_add = is_add;
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
#else
- clib_warning ("unsupported (no dpdk)");
- return -99;
+ clib_warning ("unsupported (no dpdk)");
+ return -99;
#endif
}
@@ -9613,134 +10391,162 @@ static int
api_ipsec_spd_add_del_entry (vat_main_t * vam)
{
#if DPDK > 0
- unformat_input_t * i = vam->input;
- vl_api_ipsec_spd_add_del_entry_t *mp;
- f64 timeout;
- u8 is_add = 1, is_outbound = 0, is_ipv6 = 0, is_ip_any = 1;
- u32 spd_id, sa_id, protocol = 0, policy = 0;
- i32 priority;
- u32 rport_start = 0, rport_stop = (u32) ~0;
- u32 lport_start = 0, lport_stop = (u32) ~0;
- ip4_address_t laddr4_start, laddr4_stop, raddr4_start, raddr4_stop;
- ip6_address_t laddr6_start, laddr6_stop, raddr6_start, raddr6_stop;
-
- laddr4_start.as_u32 = raddr4_start.as_u32 = 0;
- laddr4_stop.as_u32 = raddr4_stop.as_u32 = (u32) ~0;
- laddr6_start.as_u64[0] = raddr6_start.as_u64[0] = 0;
- laddr6_start.as_u64[1] = raddr6_start.as_u64[1] = 0;
- laddr6_stop.as_u64[0] = raddr6_stop.as_u64[0] = (u64) ~0;
- laddr6_stop.as_u64[1] = raddr6_stop.as_u64[1] = (u64) ~0;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "del"))
- is_add = 0;
- if (unformat (i, "outbound"))
- is_outbound = 1;
- if (unformat (i, "inbound"))
- is_outbound = 0;
- else if (unformat (i, "spd_id %d", &spd_id))
- ;
- else if (unformat (i, "sa_id %d", &sa_id))
- ;
- else if (unformat (i, "priority %d", &priority))
- ;
- else if (unformat (i, "protocol %d", &protocol))
- ;
- else if (unformat (i, "lport_start %d", &lport_start))
- ;
- else if (unformat (i, "lport_stop %d", &lport_stop))
- ;
- else if (unformat (i, "rport_start %d", &rport_start))
- ;
- else if (unformat (i, "rport_stop %d", &rport_stop))
- ;
- else if (unformat (i, "laddr_start %U", unformat_ip4_address, &laddr4_start))
- {
- is_ipv6 = 0;
- is_ip_any =0;
- }
- else if (unformat (i, "laddr_stop %U", unformat_ip4_address, &laddr4_stop))
- {
- is_ipv6 = 0;
- is_ip_any = 0;
- }
- else if (unformat (i, "raddr_start %U", unformat_ip4_address, &raddr4_start))
- {
- is_ipv6 = 0;
- is_ip_any = 0;
- }
- else if (unformat (i, "raddr_stop %U", unformat_ip4_address, &raddr4_stop))
- {
- is_ipv6 = 0;
- is_ip_any = 0;
- }
- else if (unformat (i, "laddr_start %U", unformat_ip6_address, &laddr6_start))
- {
- is_ipv6 = 1;
- is_ip_any = 0;
- }
- else if (unformat (i, "laddr_stop %U", unformat_ip6_address, &laddr6_stop))
- {
- is_ipv6 = 1;
- is_ip_any = 0;
- }
- else if (unformat (i, "raddr_start %U", unformat_ip6_address, &raddr6_start))
- {
- is_ipv6 = 1;
- is_ip_any = 0;
- }
- else if (unformat (i, "raddr_stop %U", unformat_ip6_address, &raddr6_stop))
- {
- is_ipv6 = 1;
- is_ip_any = 0;
- }
- else if (unformat (i, "action %U", unformat_ipsec_policy_action, &policy))
- {
- if (policy == IPSEC_POLICY_ACTION_RESOLVE) {
- clib_warning ("unsupported action: 'resolve'");
- return -99;
- }
- }
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
-
- }
-
- M(IPSEC_SPD_ADD_DEL_ENTRY, ipsec_spd_add_del_entry);
-
- mp->spd_id = ntohl(spd_id);
- mp->priority = ntohl(priority);
- mp->is_outbound = is_outbound;
-
- mp->is_ipv6 = is_ipv6;
- if (is_ipv6 || is_ip_any) {
- clib_memcpy (mp->remote_address_start, &raddr6_start, sizeof(ip6_address_t));
- clib_memcpy (mp->remote_address_stop, &raddr6_stop, sizeof(ip6_address_t));
- clib_memcpy (mp->local_address_start, &laddr6_start, sizeof(ip6_address_t));
- clib_memcpy (mp->local_address_stop, &laddr6_stop, sizeof(ip6_address_t));
- } else {
- clib_memcpy (mp->remote_address_start, &raddr4_start, sizeof(ip4_address_t));
- clib_memcpy (mp->remote_address_stop, &raddr4_stop, sizeof(ip4_address_t));
- clib_memcpy (mp->local_address_start, &laddr4_start, sizeof(ip4_address_t));
- clib_memcpy (mp->local_address_stop, &laddr4_stop, sizeof(ip4_address_t));
- }
- mp->protocol = (u8) protocol;
- mp->local_port_start = ntohs((u16) lport_start);
- mp->local_port_stop = ntohs((u16) lport_stop);
- mp->remote_port_start = ntohs((u16) rport_start);
- mp->remote_port_stop = ntohs((u16) rport_stop);
- mp->policy = (u8) policy;
- mp->sa_id = ntohl(sa_id);
- mp->is_add = is_add;
- mp->is_ip_any = is_ip_any;
- S; W;
- /* NOTREACHED */
- return 0;
+ unformat_input_t *i = vam->input;
+ vl_api_ipsec_spd_add_del_entry_t *mp;
+ f64 timeout;
+ u8 is_add = 1, is_outbound = 0, is_ipv6 = 0, is_ip_any = 1;
+ u32 spd_id, sa_id, protocol = 0, policy = 0;
+ i32 priority;
+ u32 rport_start = 0, rport_stop = (u32) ~ 0;
+ u32 lport_start = 0, lport_stop = (u32) ~ 0;
+ ip4_address_t laddr4_start, laddr4_stop, raddr4_start, raddr4_stop;
+ ip6_address_t laddr6_start, laddr6_stop, raddr6_start, raddr6_stop;
+
+ laddr4_start.as_u32 = raddr4_start.as_u32 = 0;
+ laddr4_stop.as_u32 = raddr4_stop.as_u32 = (u32) ~ 0;
+ laddr6_start.as_u64[0] = raddr6_start.as_u64[0] = 0;
+ laddr6_start.as_u64[1] = raddr6_start.as_u64[1] = 0;
+ laddr6_stop.as_u64[0] = raddr6_stop.as_u64[0] = (u64) ~ 0;
+ laddr6_stop.as_u64[1] = raddr6_stop.as_u64[1] = (u64) ~ 0;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "del"))
+ is_add = 0;
+ if (unformat (i, "outbound"))
+ is_outbound = 1;
+ if (unformat (i, "inbound"))
+ is_outbound = 0;
+ else if (unformat (i, "spd_id %d", &spd_id))
+ ;
+ else if (unformat (i, "sa_id %d", &sa_id))
+ ;
+ else if (unformat (i, "priority %d", &priority))
+ ;
+ else if (unformat (i, "protocol %d", &protocol))
+ ;
+ else if (unformat (i, "lport_start %d", &lport_start))
+ ;
+ else if (unformat (i, "lport_stop %d", &lport_stop))
+ ;
+ else if (unformat (i, "rport_start %d", &rport_start))
+ ;
+ else if (unformat (i, "rport_stop %d", &rport_stop))
+ ;
+ else
+ if (unformat
+ (i, "laddr_start %U", unformat_ip4_address, &laddr4_start))
+ {
+ is_ipv6 = 0;
+ is_ip_any = 0;
+ }
+ else
+ if (unformat (i, "laddr_stop %U", unformat_ip4_address, &laddr4_stop))
+ {
+ is_ipv6 = 0;
+ is_ip_any = 0;
+ }
+ else
+ if (unformat
+ (i, "raddr_start %U", unformat_ip4_address, &raddr4_start))
+ {
+ is_ipv6 = 0;
+ is_ip_any = 0;
+ }
+ else
+ if (unformat (i, "raddr_stop %U", unformat_ip4_address, &raddr4_stop))
+ {
+ is_ipv6 = 0;
+ is_ip_any = 0;
+ }
+ else
+ if (unformat
+ (i, "laddr_start %U", unformat_ip6_address, &laddr6_start))
+ {
+ is_ipv6 = 1;
+ is_ip_any = 0;
+ }
+ else
+ if (unformat (i, "laddr_stop %U", unformat_ip6_address, &laddr6_stop))
+ {
+ is_ipv6 = 1;
+ is_ip_any = 0;
+ }
+ else
+ if (unformat
+ (i, "raddr_start %U", unformat_ip6_address, &raddr6_start))
+ {
+ is_ipv6 = 1;
+ is_ip_any = 0;
+ }
+ else
+ if (unformat (i, "raddr_stop %U", unformat_ip6_address, &raddr6_stop))
+ {
+ is_ipv6 = 1;
+ is_ip_any = 0;
+ }
+ else
+ if (unformat (i, "action %U", unformat_ipsec_policy_action, &policy))
+ {
+ if (policy == IPSEC_POLICY_ACTION_RESOLVE)
+ {
+ clib_warning ("unsupported action: 'resolve'");
+ return -99;
+ }
+ }
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
+
+ }
+
+ M (IPSEC_SPD_ADD_DEL_ENTRY, ipsec_spd_add_del_entry);
+
+ mp->spd_id = ntohl (spd_id);
+ mp->priority = ntohl (priority);
+ mp->is_outbound = is_outbound;
+
+ mp->is_ipv6 = is_ipv6;
+ if (is_ipv6 || is_ip_any)
+ {
+ clib_memcpy (mp->remote_address_start, &raddr6_start,
+ sizeof (ip6_address_t));
+ clib_memcpy (mp->remote_address_stop, &raddr6_stop,
+ sizeof (ip6_address_t));
+ clib_memcpy (mp->local_address_start, &laddr6_start,
+ sizeof (ip6_address_t));
+ clib_memcpy (mp->local_address_stop, &laddr6_stop,
+ sizeof (ip6_address_t));
+ }
+ else
+ {
+ clib_memcpy (mp->remote_address_start, &raddr4_start,
+ sizeof (ip4_address_t));
+ clib_memcpy (mp->remote_address_stop, &raddr4_stop,
+ sizeof (ip4_address_t));
+ clib_memcpy (mp->local_address_start, &laddr4_start,
+ sizeof (ip4_address_t));
+ clib_memcpy (mp->local_address_stop, &laddr4_stop,
+ sizeof (ip4_address_t));
+ }
+ mp->protocol = (u8) protocol;
+ mp->local_port_start = ntohs ((u16) lport_start);
+ mp->local_port_stop = ntohs ((u16) lport_stop);
+ mp->remote_port_start = ntohs ((u16) rport_start);
+ mp->remote_port_stop = ntohs ((u16) rport_stop);
+ mp->policy = (u8) policy;
+ mp->sa_id = ntohl (sa_id);
+ mp->is_add = is_add;
+ mp->is_ip_any = is_ip_any;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
#else
- clib_warning ("unsupported (no dpdk)");
- return -99;
+ clib_warning ("unsupported (no dpdk)");
+ return -99;
#endif
}
@@ -9748,111 +10554,134 @@ static int
api_ipsec_sad_add_del_entry (vat_main_t * vam)
{
#if DPDK > 0
- unformat_input_t * i = vam->input;
- vl_api_ipsec_sad_add_del_entry_t *mp;
- f64 timeout;
- u32 sad_id, spi;
- u8 * ck = 0, * ik = 0;
- u8 is_add = 1;
-
- u8 protocol = IPSEC_PROTOCOL_AH;
- u8 is_tunnel = 0, is_tunnel_ipv6 = 0;
- u32 crypto_alg = 0, integ_alg = 0;
- ip4_address_t tun_src4;
- ip4_address_t tun_dst4;
- ip6_address_t tun_src6;
- ip6_address_t tun_dst6;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "del"))
- is_add = 0;
- else if (unformat (i, "sad_id %d", &sad_id))
- ;
- else if (unformat (i, "spi %d", &spi))
- ;
- else if (unformat (i, "esp"))
- protocol = IPSEC_PROTOCOL_ESP;
- else if (unformat (i, "tunnel_src %U", unformat_ip4_address, &tun_src4)) {
- is_tunnel = 1;
- is_tunnel_ipv6 = 0;
- }
- else if (unformat (i, "tunnel_dst %U", unformat_ip4_address, &tun_dst4)) {
- is_tunnel = 1;
- is_tunnel_ipv6 = 0;
- }
- else if (unformat (i, "tunnel_src %U", unformat_ip6_address, &tun_src6)) {
- is_tunnel = 1;
- is_tunnel_ipv6 = 1;
- }
- else if (unformat (i, "tunnel_dst %U", unformat_ip6_address, &tun_dst6)) {
- is_tunnel = 1;
- is_tunnel_ipv6 = 1;
- }
- else if (unformat (i, "crypto_alg %U", unformat_ipsec_crypto_alg, &crypto_alg)) {
- if (crypto_alg < IPSEC_CRYPTO_ALG_AES_CBC_128 ||
- crypto_alg > IPSEC_INTEG_ALG_SHA_512_256) {
- clib_warning ("unsupported crypto-alg: '%U'",
- format_ipsec_crypto_alg, crypto_alg);
- return -99;
- }
- }
- else if (unformat (i, "crypto_key %U", unformat_hex_string, &ck))
- ;
- else if (unformat (i, "integ_alg %U", unformat_ipsec_integ_alg, &integ_alg)) {
- if (integ_alg < IPSEC_INTEG_ALG_SHA1_96 ||
- integ_alg > IPSEC_INTEG_ALG_SHA_512_256) {
- clib_warning ("unsupported integ-alg: '%U'",
- format_ipsec_integ_alg, integ_alg);
- return -99;
- }
- }
- else if (unformat (i, "integ_key %U", unformat_hex_string, &ik))
- ;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
-
- }
-
- M(IPSEC_SAD_ADD_DEL_ENTRY, ipsec_sad_add_del_entry);
-
- mp->sad_id = ntohl(sad_id);
- mp->is_add = is_add;
- mp->protocol = protocol;
- mp->spi = ntohl(spi);
- mp->is_tunnel = is_tunnel;
- mp->is_tunnel_ipv6 = is_tunnel_ipv6;
- mp->crypto_algorithm = crypto_alg;
- mp->integrity_algorithm = integ_alg;
- mp->crypto_key_length = vec_len(ck);
- mp->integrity_key_length = vec_len(ik);
-
- if (mp->crypto_key_length > sizeof(mp->crypto_key))
- mp->crypto_key_length = sizeof(mp->crypto_key);
-
- if (mp->integrity_key_length > sizeof(mp->integrity_key))
- mp->integrity_key_length = sizeof(mp->integrity_key);
-
- clib_memcpy (mp->crypto_key, ck, mp->crypto_key_length);
- clib_memcpy (mp->integrity_key, ik, mp->integrity_key_length);
-
- if (is_tunnel) {
- if (is_tunnel_ipv6) {
- clib_memcpy (mp->tunnel_src_address, &tun_src6, sizeof(ip6_address_t));
- clib_memcpy (mp->tunnel_dst_address, &tun_dst6, sizeof(ip6_address_t));
- } else {
- clib_memcpy (mp->tunnel_src_address, &tun_src4, sizeof(ip4_address_t));
- clib_memcpy (mp->tunnel_dst_address, &tun_dst4, sizeof(ip4_address_t));
- }
+ unformat_input_t *i = vam->input;
+ vl_api_ipsec_sad_add_del_entry_t *mp;
+ f64 timeout;
+ u32 sad_id, spi;
+ u8 *ck = 0, *ik = 0;
+ u8 is_add = 1;
+
+ u8 protocol = IPSEC_PROTOCOL_AH;
+ u8 is_tunnel = 0, is_tunnel_ipv6 = 0;
+ u32 crypto_alg = 0, integ_alg = 0;
+ ip4_address_t tun_src4;
+ ip4_address_t tun_dst4;
+ ip6_address_t tun_src6;
+ ip6_address_t tun_dst6;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "del"))
+ is_add = 0;
+ else if (unformat (i, "sad_id %d", &sad_id))
+ ;
+ else if (unformat (i, "spi %d", &spi))
+ ;
+ else if (unformat (i, "esp"))
+ protocol = IPSEC_PROTOCOL_ESP;
+ else if (unformat (i, "tunnel_src %U", unformat_ip4_address, &tun_src4))
+ {
+ is_tunnel = 1;
+ is_tunnel_ipv6 = 0;
+ }
+ else if (unformat (i, "tunnel_dst %U", unformat_ip4_address, &tun_dst4))
+ {
+ is_tunnel = 1;
+ is_tunnel_ipv6 = 0;
+ }
+ else if (unformat (i, "tunnel_src %U", unformat_ip6_address, &tun_src6))
+ {
+ is_tunnel = 1;
+ is_tunnel_ipv6 = 1;
+ }
+ else if (unformat (i, "tunnel_dst %U", unformat_ip6_address, &tun_dst6))
+ {
+ is_tunnel = 1;
+ is_tunnel_ipv6 = 1;
+ }
+ else
+ if (unformat
+ (i, "crypto_alg %U", unformat_ipsec_crypto_alg, &crypto_alg))
+ {
+ if (crypto_alg < IPSEC_CRYPTO_ALG_AES_CBC_128 ||
+ crypto_alg > IPSEC_INTEG_ALG_SHA_512_256)
+ {
+ clib_warning ("unsupported crypto-alg: '%U'",
+ format_ipsec_crypto_alg, crypto_alg);
+ return -99;
+ }
+ }
+ else if (unformat (i, "crypto_key %U", unformat_hex_string, &ck))
+ ;
+ else
+ if (unformat
+ (i, "integ_alg %U", unformat_ipsec_integ_alg, &integ_alg))
+ {
+ if (integ_alg < IPSEC_INTEG_ALG_SHA1_96 ||
+ integ_alg > IPSEC_INTEG_ALG_SHA_512_256)
+ {
+ clib_warning ("unsupported integ-alg: '%U'",
+ format_ipsec_integ_alg, integ_alg);
+ return -99;
+ }
+ }
+ else if (unformat (i, "integ_key %U", unformat_hex_string, &ik))
+ ;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
+
}
- S; W;
- /* NOTREACHED */
- return 0;
+ M (IPSEC_SAD_ADD_DEL_ENTRY, ipsec_sad_add_del_entry);
+
+ mp->sad_id = ntohl (sad_id);
+ mp->is_add = is_add;
+ mp->protocol = protocol;
+ mp->spi = ntohl (spi);
+ mp->is_tunnel = is_tunnel;
+ mp->is_tunnel_ipv6 = is_tunnel_ipv6;
+ mp->crypto_algorithm = crypto_alg;
+ mp->integrity_algorithm = integ_alg;
+ mp->crypto_key_length = vec_len (ck);
+ mp->integrity_key_length = vec_len (ik);
+
+ if (mp->crypto_key_length > sizeof (mp->crypto_key))
+ mp->crypto_key_length = sizeof (mp->crypto_key);
+
+ if (mp->integrity_key_length > sizeof (mp->integrity_key))
+ mp->integrity_key_length = sizeof (mp->integrity_key);
+
+ clib_memcpy (mp->crypto_key, ck, mp->crypto_key_length);
+ clib_memcpy (mp->integrity_key, ik, mp->integrity_key_length);
+
+ if (is_tunnel)
+ {
+ if (is_tunnel_ipv6)
+ {
+ clib_memcpy (mp->tunnel_src_address, &tun_src6,
+ sizeof (ip6_address_t));
+ clib_memcpy (mp->tunnel_dst_address, &tun_dst6,
+ sizeof (ip6_address_t));
+ }
+ else
+ {
+ clib_memcpy (mp->tunnel_src_address, &tun_src4,
+ sizeof (ip4_address_t));
+ clib_memcpy (mp->tunnel_dst_address, &tun_dst4,
+ sizeof (ip4_address_t));
+ }
+ }
+
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
#else
- clib_warning ("unsupported (no dpdk)");
- return -99;
+ clib_warning ("unsupported (no dpdk)");
+ return -99;
#endif
}
@@ -9860,46 +10689,49 @@ static int
api_ipsec_sa_set_key (vat_main_t * vam)
{
#if DPDK > 0
- unformat_input_t * i = vam->input;
- vl_api_ipsec_sa_set_key_t *mp;
- f64 timeout;
- u32 sa_id;
- u8 * ck = 0, * ik = 0;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "sa_id %d", &sa_id))
- ;
- else if (unformat (i, "crypto_key %U", unformat_hex_string, &ck))
- ;
- else if (unformat (i, "integ_key %U", unformat_hex_string, &ik))
- ;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
- }
-
- M(IPSEC_SA_SET_KEY, ipsec_set_sa_key);
-
- mp->sa_id = ntohl(sa_id);
- mp->crypto_key_length = vec_len(ck);
- mp->integrity_key_length = vec_len(ik);
-
- if (mp->crypto_key_length > sizeof(mp->crypto_key))
- mp->crypto_key_length = sizeof(mp->crypto_key);
-
- if (mp->integrity_key_length > sizeof(mp->integrity_key))
- mp->integrity_key_length = sizeof(mp->integrity_key);
-
- clib_memcpy (mp->crypto_key, ck, mp->crypto_key_length);
- clib_memcpy (mp->integrity_key, ik, mp->integrity_key_length);
-
- S; W;
- /* NOTREACHED */
- return 0;
+ unformat_input_t *i = vam->input;
+ vl_api_ipsec_sa_set_key_t *mp;
+ f64 timeout;
+ u32 sa_id;
+ u8 *ck = 0, *ik = 0;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "sa_id %d", &sa_id))
+ ;
+ else if (unformat (i, "crypto_key %U", unformat_hex_string, &ck))
+ ;
+ else if (unformat (i, "integ_key %U", unformat_hex_string, &ik))
+ ;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
+ }
+
+ M (IPSEC_SA_SET_KEY, ipsec_set_sa_key);
+
+ mp->sa_id = ntohl (sa_id);
+ mp->crypto_key_length = vec_len (ck);
+ mp->integrity_key_length = vec_len (ik);
+
+ if (mp->crypto_key_length > sizeof (mp->crypto_key))
+ mp->crypto_key_length = sizeof (mp->crypto_key);
+
+ if (mp->integrity_key_length > sizeof (mp->integrity_key))
+ mp->integrity_key_length = sizeof (mp->integrity_key);
+
+ clib_memcpy (mp->crypto_key, ck, mp->crypto_key_length);
+ clib_memcpy (mp->integrity_key, ik, mp->integrity_key_length);
+
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
#else
- clib_warning ("unsupported (no dpdk)");
- return -99;
+ clib_warning ("unsupported (no dpdk)");
+ return -99;
#endif
}
@@ -9907,47 +10739,52 @@ static int
api_ikev2_profile_add_del (vat_main_t * vam)
{
#if DPDK > 0
- unformat_input_t * i = vam->input;
- vl_api_ikev2_profile_add_del_t * mp;
- f64 timeout;
- u8 is_add = 1;
- u8 * name = 0;
+ unformat_input_t *i = vam->input;
+ vl_api_ikev2_profile_add_del_t *mp;
+ f64 timeout;
+ u8 is_add = 1;
+ u8 *name = 0;
- const char * valid_chars = "a-zA-Z0-9_";
+ const char *valid_chars = "a-zA-Z0-9_";
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "del"))
- is_add = 0;
- else if (unformat (i, "name %U", unformat_token, valid_chars, &name))
- vec_add1 (name, 0);
- else {
- errmsg ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "del"))
+ is_add = 0;
+ else if (unformat (i, "name %U", unformat_token, valid_chars, &name))
+ vec_add1 (name, 0);
+ else
+ {
+ errmsg ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (!vec_len (name)) {
- errmsg ("profile name must be specified");
- return -99;
+ if (!vec_len (name))
+ {
+ errmsg ("profile name must be specified");
+ return -99;
}
- if (vec_len (name) > 64) {
- errmsg ("profile name too long");
- return -99;
+ if (vec_len (name) > 64)
+ {
+ errmsg ("profile name too long");
+ return -99;
}
- M(IKEV2_PROFILE_ADD_DEL, ikev2_profile_add_del);
+ M (IKEV2_PROFILE_ADD_DEL, ikev2_profile_add_del);
- clib_memcpy(mp->name, name, vec_len (name));
- mp->is_add = is_add;
- vec_free (name);
+ clib_memcpy (mp->name, name, vec_len (name));
+ mp->is_add = is_add;
+ vec_free (name);
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
#else
- clib_warning ("unsupported (no dpdk)");
- return -99;
+ clib_warning ("unsupported (no dpdk)");
+ return -99;
#endif
}
@@ -9955,68 +10792,75 @@ static int
api_ikev2_profile_set_auth (vat_main_t * vam)
{
#if DPDK > 0
- unformat_input_t * i = vam->input;
- vl_api_ikev2_profile_set_auth_t * mp;
- f64 timeout;
- u8 * name = 0;
- u8 * data = 0;
- u32 auth_method = 0;
- u8 is_hex = 0;
+ unformat_input_t *i = vam->input;
+ vl_api_ikev2_profile_set_auth_t *mp;
+ f64 timeout;
+ u8 *name = 0;
+ u8 *data = 0;
+ u32 auth_method = 0;
+ u8 is_hex = 0;
- const char * valid_chars = "a-zA-Z0-9_";
+ const char *valid_chars = "a-zA-Z0-9_";
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "name %U", unformat_token, valid_chars, &name))
- vec_add1 (name, 0);
- else if (unformat (i, "auth_method %U",
- unformat_ikev2_auth_method, &auth_method))
- ;
- else if (unformat (i, "auth_data 0x%U", unformat_hex_string, &data))
- is_hex = 1;
- else if (unformat (i, "auth_data %v", &data))
- ;
- else {
- errmsg ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "name %U", unformat_token, valid_chars, &name))
+ vec_add1 (name, 0);
+ else if (unformat (i, "auth_method %U",
+ unformat_ikev2_auth_method, &auth_method))
+ ;
+ else if (unformat (i, "auth_data 0x%U", unformat_hex_string, &data))
+ is_hex = 1;
+ else if (unformat (i, "auth_data %v", &data))
+ ;
+ else
+ {
+ errmsg ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (!vec_len (name)) {
- errmsg ("profile name must be specified");
- return -99;
+ if (!vec_len (name))
+ {
+ errmsg ("profile name must be specified");
+ return -99;
}
- if (vec_len (name) > 64) {
- errmsg ("profile name too long");
- return -99;
+ if (vec_len (name) > 64)
+ {
+ errmsg ("profile name too long");
+ return -99;
}
- if (!vec_len(data)) {
- errmsg ("auth_data must be specified");
- return -99;
+ if (!vec_len (data))
+ {
+ errmsg ("auth_data must be specified");
+ return -99;
}
- if (!auth_method) {
- errmsg ("auth_method must be specified");
- return -99;
+ if (!auth_method)
+ {
+ errmsg ("auth_method must be specified");
+ return -99;
}
- M(IKEV2_PROFILE_SET_AUTH, ikev2_profile_set_auth);
+ M (IKEV2_PROFILE_SET_AUTH, ikev2_profile_set_auth);
- mp->is_hex = is_hex;
- mp->auth_method = (u8) auth_method;
- mp->data_len = vec_len (data);
- clib_memcpy (mp->name, name, vec_len (name));
- clib_memcpy (mp->data, data, vec_len (data));
- vec_free (name);
- vec_free (data);
+ mp->is_hex = is_hex;
+ mp->auth_method = (u8) auth_method;
+ mp->data_len = vec_len (data);
+ clib_memcpy (mp->name, name, vec_len (name));
+ clib_memcpy (mp->data, data, vec_len (data));
+ vec_free (name);
+ vec_free (data);
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
#else
- clib_warning ("unsupported (no dpdk)");
- return -99;
+ clib_warning ("unsupported (no dpdk)");
+ return -99;
#endif
}
@@ -10024,78 +10868,84 @@ static int
api_ikev2_profile_set_id (vat_main_t * vam)
{
#if DPDK > 0
- unformat_input_t * i = vam->input;
- vl_api_ikev2_profile_set_id_t * mp;
- f64 timeout;
- u8 * name = 0;
- u8 * data = 0;
- u8 is_local = 0;
- u32 id_type = 0;
- ip4_address_t ip4;
-
- const char * valid_chars = "a-zA-Z0-9_";
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "name %U", unformat_token, valid_chars, &name))
- vec_add1 (name, 0);
- else if (unformat (i, "id_type %U",
- unformat_ikev2_id_type, &id_type))
- ;
- else if (unformat (i, "id_data %U", unformat_ip4_address, &ip4))
- {
- data = vec_new(u8, 4);
- clib_memcpy(data, ip4.as_u8, 4);
- }
- else if (unformat (i, "id_data 0x%U", unformat_hex_string, &data))
- ;
- else if (unformat (i, "id_data %v", &data))
- ;
- else if (unformat (i, "local"))
- is_local = 1;
- else if (unformat (i, "remote"))
- is_local = 0;
- else {
- errmsg ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ unformat_input_t *i = vam->input;
+ vl_api_ikev2_profile_set_id_t *mp;
+ f64 timeout;
+ u8 *name = 0;
+ u8 *data = 0;
+ u8 is_local = 0;
+ u32 id_type = 0;
+ ip4_address_t ip4;
+
+ const char *valid_chars = "a-zA-Z0-9_";
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "name %U", unformat_token, valid_chars, &name))
+ vec_add1 (name, 0);
+ else if (unformat (i, "id_type %U", unformat_ikev2_id_type, &id_type))
+ ;
+ else if (unformat (i, "id_data %U", unformat_ip4_address, &ip4))
+ {
+ data = vec_new (u8, 4);
+ clib_memcpy (data, ip4.as_u8, 4);
+ }
+ else if (unformat (i, "id_data 0x%U", unformat_hex_string, &data))
+ ;
+ else if (unformat (i, "id_data %v", &data))
+ ;
+ else if (unformat (i, "local"))
+ is_local = 1;
+ else if (unformat (i, "remote"))
+ is_local = 0;
+ else
+ {
+ errmsg ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (!vec_len (name)) {
- errmsg ("profile name must be specified");
- return -99;
+ if (!vec_len (name))
+ {
+ errmsg ("profile name must be specified");
+ return -99;
}
- if (vec_len (name) > 64) {
- errmsg ("profile name too long");
- return -99;
+ if (vec_len (name) > 64)
+ {
+ errmsg ("profile name too long");
+ return -99;
}
- if (!vec_len(data)) {
- errmsg ("id_data must be specified");
- return -99;
+ if (!vec_len (data))
+ {
+ errmsg ("id_data must be specified");
+ return -99;
}
- if (!id_type) {
- errmsg ("id_type must be specified");
- return -99;
+ if (!id_type)
+ {
+ errmsg ("id_type must be specified");
+ return -99;
}
- M(IKEV2_PROFILE_SET_ID, ikev2_profile_set_id);
+ M (IKEV2_PROFILE_SET_ID, ikev2_profile_set_id);
- mp->is_local = is_local;
- mp->id_type = (u8) id_type;
- mp->data_len = vec_len (data);
- clib_memcpy (mp->name, name, vec_len (name));
- clib_memcpy (mp->data, data, vec_len (data));
- vec_free (name);
- vec_free (data);
+ mp->is_local = is_local;
+ mp->id_type = (u8) id_type;
+ mp->data_len = vec_len (data);
+ clib_memcpy (mp->name, name, vec_len (name));
+ clib_memcpy (mp->data, data, vec_len (data));
+ vec_free (name);
+ vec_free (data);
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
#else
- clib_warning ("unsupported (no dpdk)");
- return -99;
+ clib_warning ("unsupported (no dpdk)");
+ return -99;
#endif
}
@@ -10103,69 +10953,75 @@ static int
api_ikev2_profile_set_ts (vat_main_t * vam)
{
#if DPDK > 0
- unformat_input_t * i = vam->input;
- vl_api_ikev2_profile_set_ts_t * mp;
- f64 timeout;
- u8 * name = 0;
- u8 is_local = 0;
- u32 proto = 0, start_port = 0, end_port = (u32) ~0;
- ip4_address_t start_addr, end_addr;
-
- const char * valid_chars = "a-zA-Z0-9_";
-
- start_addr.as_u32 = 0;
- end_addr.as_u32 = (u32) ~0;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "name %U", unformat_token, valid_chars, &name))
- vec_add1 (name, 0);
- else if (unformat (i, "protocol %d", &proto))
- ;
- else if (unformat (i, "start_port %d", &start_port))
- ;
- else if (unformat (i, "end_port %d", &end_port))
- ;
- else if (unformat (i, "start_addr %U", unformat_ip4_address, &start_addr))
- ;
- else if (unformat (i, "end_addr %U", unformat_ip4_address, &end_addr))
- ;
- else if (unformat (i, "local"))
- is_local = 1;
- else if (unformat (i, "remote"))
- is_local = 0;
- else {
- errmsg ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
- }
-
- if (!vec_len (name)) {
- errmsg ("profile name must be specified");
- return -99;
- }
-
- if (vec_len (name) > 64) {
- errmsg ("profile name too long");
- return -99;
- }
-
- M(IKEV2_PROFILE_SET_TS, ikev2_profile_set_ts);
-
- mp->is_local = is_local;
- mp->proto = (u8) proto;
- mp->start_port = (u16) start_port;
- mp->end_port = (u16) end_port;
- mp->start_addr = start_addr.as_u32;
- mp->end_addr = end_addr.as_u32;
- clib_memcpy (mp->name, name, vec_len (name));
- vec_free (name);
-
- S; W;
- /* NOTREACHED */
- return 0;
+ unformat_input_t *i = vam->input;
+ vl_api_ikev2_profile_set_ts_t *mp;
+ f64 timeout;
+ u8 *name = 0;
+ u8 is_local = 0;
+ u32 proto = 0, start_port = 0, end_port = (u32) ~ 0;
+ ip4_address_t start_addr, end_addr;
+
+ const char *valid_chars = "a-zA-Z0-9_";
+
+ start_addr.as_u32 = 0;
+ end_addr.as_u32 = (u32) ~ 0;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "name %U", unformat_token, valid_chars, &name))
+ vec_add1 (name, 0);
+ else if (unformat (i, "protocol %d", &proto))
+ ;
+ else if (unformat (i, "start_port %d", &start_port))
+ ;
+ else if (unformat (i, "end_port %d", &end_port))
+ ;
+ else
+ if (unformat (i, "start_addr %U", unformat_ip4_address, &start_addr))
+ ;
+ else if (unformat (i, "end_addr %U", unformat_ip4_address, &end_addr))
+ ;
+ else if (unformat (i, "local"))
+ is_local = 1;
+ else if (unformat (i, "remote"))
+ is_local = 0;
+ else
+ {
+ errmsg ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
+ }
+
+ if (!vec_len (name))
+ {
+ errmsg ("profile name must be specified");
+ return -99;
+ }
+
+ if (vec_len (name) > 64)
+ {
+ errmsg ("profile name too long");
+ return -99;
+ }
+
+ M (IKEV2_PROFILE_SET_TS, ikev2_profile_set_ts);
+
+ mp->is_local = is_local;
+ mp->proto = (u8) proto;
+ mp->start_port = (u16) start_port;
+ mp->end_port = (u16) end_port;
+ mp->start_addr = start_addr.as_u32;
+ mp->end_addr = end_addr.as_u32;
+ clib_memcpy (mp->name, name, vec_len (name));
+ vec_free (name);
+
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
#else
- clib_warning ("unsupported (no dpdk)");
- return -99;
+ clib_warning ("unsupported (no dpdk)");
+ return -99;
#endif
}
@@ -10173,48 +11029,54 @@ static int
api_ikev2_set_local_key (vat_main_t * vam)
{
#if DPDK > 0
- unformat_input_t * i = vam->input;
- vl_api_ikev2_set_local_key_t * mp;
- f64 timeout;
- u8 * file = 0;
+ unformat_input_t *i = vam->input;
+ vl_api_ikev2_set_local_key_t *mp;
+ f64 timeout;
+ u8 *file = 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "file %v", &file))
- vec_add1 (file, 0);
- else {
- errmsg ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "file %v", &file))
+ vec_add1 (file, 0);
+ else
+ {
+ errmsg ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (!vec_len (file)) {
- errmsg ("RSA key file must be specified");
- return -99;
+ if (!vec_len (file))
+ {
+ errmsg ("RSA key file must be specified");
+ return -99;
}
- if (vec_len (file) > 256) {
- errmsg ("file name too long");
- return -99;
+ if (vec_len (file) > 256)
+ {
+ errmsg ("file name too long");
+ return -99;
}
- M(IKEV2_SET_LOCAL_KEY, ikev2_set_local_key);
+ M (IKEV2_SET_LOCAL_KEY, ikev2_set_local_key);
- clib_memcpy (mp->key_file, file, vec_len (file));
- vec_free (file);
+ clib_memcpy (mp->key_file, file, vec_len (file));
+ vec_free (file);
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
#else
- clib_warning ("unsupported (no dpdk)");
- return -99;
+ clib_warning ("unsupported (no dpdk)");
+ return -99;
#endif
}
/*
* MAP
*/
-static int api_map_add_domain (vat_main_t * vam)
+static int
+api_map_add_domain (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
vl_api_map_add_domain_t *mp;
@@ -10224,61 +11086,66 @@ static int api_map_add_domain (vat_main_t * vam)
ip6_address_t ip6_prefix;
ip6_address_t ip6_src;
u32 num_m_args = 0;
- u32 ip6_prefix_len, ip4_prefix_len, ea_bits_len, psid_offset,
- psid_length;
+ u32 ip6_prefix_len, ip4_prefix_len, ea_bits_len, psid_offset, psid_length;
u8 is_translation = 0;
u32 mtu = 0;
u8 ip6_src_len = 128;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "ip4-pfx %U/%d", unformat_ip4_address,
- &ip4_prefix, &ip4_prefix_len))
- num_m_args++;
- else if (unformat (i, "ip6-pfx %U/%d", unformat_ip6_address,
- &ip6_prefix, &ip6_prefix_len))
- num_m_args++;
- else if (unformat (i, "ip6-src %U/%d", unformat_ip6_address, &ip6_src, &ip6_src_len))
- num_m_args++;
- else if (unformat (i, "ip6-src %U", unformat_ip6_address, &ip6_src))
- num_m_args++;
- else if (unformat (i, "ea-bits-len %d", &ea_bits_len))
- num_m_args++;
- else if (unformat (i, "psid-offset %d", &psid_offset))
- num_m_args++;
- else if (unformat (i, "psid-len %d", &psid_length))
- num_m_args++;
- else if (unformat (i, "mtu %d", &mtu))
- num_m_args++;
- else if (unformat (i, "map-t"))
- is_translation = 1;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "ip4-pfx %U/%d", unformat_ip4_address,
+ &ip4_prefix, &ip4_prefix_len))
+ num_m_args++;
+ else if (unformat (i, "ip6-pfx %U/%d", unformat_ip6_address,
+ &ip6_prefix, &ip6_prefix_len))
+ num_m_args++;
+ else
+ if (unformat
+ (i, "ip6-src %U/%d", unformat_ip6_address, &ip6_src,
+ &ip6_src_len))
+ num_m_args++;
+ else if (unformat (i, "ip6-src %U", unformat_ip6_address, &ip6_src))
+ num_m_args++;
+ else if (unformat (i, "ea-bits-len %d", &ea_bits_len))
+ num_m_args++;
+ else if (unformat (i, "psid-offset %d", &psid_offset))
+ num_m_args++;
+ else if (unformat (i, "psid-len %d", &psid_length))
+ num_m_args++;
+ else if (unformat (i, "mtu %d", &mtu))
+ num_m_args++;
+ else if (unformat (i, "map-t"))
+ is_translation = 1;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- }
- if (num_m_args != 6) {
- errmsg("mandatory argument(s) missing\n");
- return -99;
- }
+ if (num_m_args != 6)
+ {
+ errmsg ("mandatory argument(s) missing\n");
+ return -99;
+ }
/* Construct the API message */
- M(MAP_ADD_DOMAIN, map_add_domain);
+ M (MAP_ADD_DOMAIN, map_add_domain);
- clib_memcpy(mp->ip4_prefix, &ip4_prefix, sizeof(ip4_prefix));
+ clib_memcpy (mp->ip4_prefix, &ip4_prefix, sizeof (ip4_prefix));
mp->ip4_prefix_len = ip4_prefix_len;
- clib_memcpy(mp->ip6_prefix, &ip6_prefix, sizeof(ip6_prefix));
+ clib_memcpy (mp->ip6_prefix, &ip6_prefix, sizeof (ip6_prefix));
mp->ip6_prefix_len = ip6_prefix_len;
- clib_memcpy(mp->ip6_src, &ip6_src, sizeof(ip6_src));
+ clib_memcpy (mp->ip6_src, &ip6_src, sizeof (ip6_src));
mp->ip6_src_prefix_len = ip6_src_len;
mp->ea_bits_len = ea_bits_len;
mp->psid_offset = psid_offset;
mp->psid_length = psid_length;
mp->is_translation = is_translation;
- mp->mtu = htons(mtu);
+ mp->mtu = htons (mtu);
/* send it... */
S;
@@ -10287,7 +11154,8 @@ static int api_map_add_domain (vat_main_t * vam)
W;
}
-static int api_map_del_domain (vat_main_t * vam)
+static int
+api_map_del_domain (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
vl_api_map_del_domain_t *mp;
@@ -10296,24 +11164,27 @@ static int api_map_del_domain (vat_main_t * vam)
u32 num_m_args = 0;
u32 index;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "index %d", &index))
- num_m_args++;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "index %d", &index))
+ num_m_args++;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- }
- if (num_m_args != 1) {
- errmsg("mandatory argument(s) missing\n");
- return -99;
- }
+ if (num_m_args != 1)
+ {
+ errmsg ("mandatory argument(s) missing\n");
+ return -99;
+ }
/* Construct the API message */
- M(MAP_DEL_DOMAIN, map_del_domain);
+ M (MAP_DEL_DOMAIN, map_del_domain);
- mp->index = ntohl(index);
+ mp->index = ntohl (index);
/* send it... */
S;
@@ -10322,7 +11193,8 @@ static int api_map_del_domain (vat_main_t * vam)
W;
}
-static int api_map_add_del_rule (vat_main_t * vam)
+static int
+api_map_add_del_rule (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
vl_api_map_add_del_rule_t *mp;
@@ -10331,28 +11203,32 @@ static int api_map_add_del_rule (vat_main_t * vam)
ip6_address_t ip6_dst;
u32 num_m_args = 0, index, psid;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "index %d", &index))
- num_m_args++;
- else if (unformat (i, "psid %d", &psid))
- num_m_args++;
- else if (unformat (i, "dst %U", unformat_ip6_address, &ip6_dst))
- num_m_args++;
- else if (unformat (i, "del")) {
- is_add = 0;
- } else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "index %d", &index))
+ num_m_args++;
+ else if (unformat (i, "psid %d", &psid))
+ num_m_args++;
+ else if (unformat (i, "dst %U", unformat_ip6_address, &ip6_dst))
+ num_m_args++;
+ else if (unformat (i, "del"))
+ {
+ is_add = 0;
+ }
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- }
/* Construct the API message */
- M(MAP_ADD_DEL_RULE, map_add_del_rule);
+ M (MAP_ADD_DEL_RULE, map_add_del_rule);
- mp->index = ntohl(index);
+ mp->index = ntohl (index);
mp->is_add = is_add;
- clib_memcpy(mp->ip6_dst, &ip6_dst, sizeof(ip6_dst));
- mp->psid = ntohs(psid);
+ clib_memcpy (mp->ip6_dst, &ip6_dst, sizeof (ip6_dst));
+ mp->psid = ntohs (psid);
/* send it... */
S;
@@ -10361,252 +11237,279 @@ static int api_map_add_del_rule (vat_main_t * vam)
W;
}
-static int api_map_domain_dump (vat_main_t * vam)
+static int
+api_map_domain_dump (vat_main_t * vam)
{
- vl_api_map_domain_dump_t *mp;
- f64 timeout;
+ vl_api_map_domain_dump_t *mp;
+ f64 timeout;
- /* Construct the API message */
- M(MAP_DOMAIN_DUMP, map_domain_dump);
+ /* Construct the API message */
+ M (MAP_DOMAIN_DUMP, map_domain_dump);
- /* send it... */
- S;
+ /* send it... */
+ S;
- /* Use a control ping for synchronization */
- {
- vl_api_control_ping_t * mp;
- M(CONTROL_PING, control_ping);
- S;
- }
- W;
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
+ S;
+ }
+ W;
}
-static int api_map_rule_dump (vat_main_t * vam)
+static int
+api_map_rule_dump (vat_main_t * vam)
{
- unformat_input_t *i = vam->input;
- vl_api_map_rule_dump_t *mp;
- f64 timeout;
- u32 domain_index = ~0;
+ unformat_input_t *i = vam->input;
+ vl_api_map_rule_dump_t *mp;
+ f64 timeout;
+ u32 domain_index = ~0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "index %u", &domain_index))
- ;
- else
- break;
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "index %u", &domain_index))
+ ;
+ else
+ break;
}
- if (domain_index == ~0) {
- clib_warning("parse error: domain index expected");
- return -99;
+ if (domain_index == ~0)
+ {
+ clib_warning ("parse error: domain index expected");
+ return -99;
}
- /* Construct the API message */
- M(MAP_RULE_DUMP, map_rule_dump);
+ /* Construct the API message */
+ M (MAP_RULE_DUMP, map_rule_dump);
- mp->domain_index = htonl(domain_index);
+ mp->domain_index = htonl (domain_index);
- /* send it... */
- S;
+ /* send it... */
+ S;
- /* Use a control ping for synchronization */
- {
- vl_api_control_ping_t * mp;
- M(CONTROL_PING, control_ping);
- S;
- }
- W;
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
+ S;
+ }
+ W;
}
static void vl_api_map_add_domain_reply_t_handler
-(vl_api_map_add_domain_reply_t * mp)
+ (vl_api_map_add_domain_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
- i32 retval = ntohl(mp->retval);
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
- if (vam->async_mode) {
+ if (vam->async_mode)
+ {
vam->async_errors += (retval < 0);
- } else {
+ }
+ else
+ {
vam->retval = retval;
vam->result_ready = 1;
- }
+ }
}
static void vl_api_map_add_domain_reply_t_handler_json
-(vl_api_map_add_domain_reply_t * mp)
+ (vl_api_map_add_domain_reply_t * mp)
{
- vat_main_t * vam = &vat_main;
+ vat_main_t *vam = &vat_main;
vat_json_node_t node;
- vat_json_init_object(&node);
- vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
- vat_json_object_add_uint(&node, "index", ntohl(mp->index));
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+ vat_json_object_add_uint (&node, "index", ntohl (mp->index));
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
- vam->retval = ntohl(mp->retval);
+ vam->retval = ntohl (mp->retval);
vam->result_ready = 1;
}
static int
api_get_first_msg_id (vat_main_t * vam)
{
- vl_api_get_first_msg_id_t * mp;
- f64 timeout;
- unformat_input_t * i = vam->input;
- u8 * name;
- u8 name_set = 0;
+ vl_api_get_first_msg_id_t *mp;
+ f64 timeout;
+ unformat_input_t *i = vam->input;
+ u8 *name;
+ u8 name_set = 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "client %s", &name))
- name_set = 1;
- else
- break;
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "client %s", &name))
+ name_set = 1;
+ else
+ break;
}
- if (name_set == 0) {
- errmsg ("missing client name\n");
- return -99;
+ if (name_set == 0)
+ {
+ errmsg ("missing client name\n");
+ return -99;
}
- vec_add1 (name, 0);
+ vec_add1 (name, 0);
- if (vec_len (name) > 63) {
- errmsg ("client name too long\n");
- return -99;
+ if (vec_len (name) > 63)
+ {
+ errmsg ("client name too long\n");
+ return -99;
}
- M(GET_FIRST_MSG_ID, get_first_msg_id);
- clib_memcpy (mp->name, name, vec_len(name));
- S; W;
- /* NOTREACHED */
- return 0;
+ M (GET_FIRST_MSG_ID, get_first_msg_id);
+ clib_memcpy (mp->name, name, vec_len (name));
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_cop_interface_enable_disable (vat_main_t * vam)
-{
- unformat_input_t * line_input = vam->input;
- vl_api_cop_interface_enable_disable_t * mp;
- f64 timeout;
- u32 sw_if_index = ~0;
- u8 enable_disable = 1;
-
- while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
- if (unformat (line_input, "disable"))
- enable_disable = 0;
- if (unformat (line_input, "enable"))
- enable_disable = 1;
- else if (unformat (line_input, "%U", unformat_sw_if_index,
- vam, &sw_if_index))
- ;
- else if (unformat (line_input, "sw_if_index %d", &sw_if_index))
- ;
- else
- break;
+static int
+api_cop_interface_enable_disable (vat_main_t * vam)
+{
+ unformat_input_t *line_input = vam->input;
+ vl_api_cop_interface_enable_disable_t *mp;
+ f64 timeout;
+ u32 sw_if_index = ~0;
+ u8 enable_disable = 1;
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (line_input, "disable"))
+ enable_disable = 0;
+ if (unformat (line_input, "enable"))
+ enable_disable = 1;
+ else if (unformat (line_input, "%U", unformat_sw_if_index,
+ vam, &sw_if_index))
+ ;
+ else if (unformat (line_input, "sw_if_index %d", &sw_if_index))
+ ;
+ else
+ break;
}
- if (sw_if_index == ~0) {
- errmsg ("missing interface name or sw_if_index\n");
- return -99;
+ if (sw_if_index == ~0)
+ {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
}
- /* Construct the API message */
- M(COP_INTERFACE_ENABLE_DISABLE, cop_interface_enable_disable);
- mp->sw_if_index = ntohl(sw_if_index);
- mp->enable_disable = enable_disable;
+ /* Construct the API message */
+ M (COP_INTERFACE_ENABLE_DISABLE, cop_interface_enable_disable);
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->enable_disable = enable_disable;
- /* send it... */
- S;
- /* Wait for the reply */
- W;
-}
-
-static int api_cop_whitelist_enable_disable (vat_main_t * vam)
-{
- unformat_input_t * line_input = vam->input;
- vl_api_cop_whitelist_enable_disable_t * mp;
- f64 timeout;
- u32 sw_if_index = ~0;
- u8 ip4=0, ip6=0, default_cop=0;
- u32 fib_id;
-
- while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
- if (unformat (line_input, "ip4"))
- ip4 = 1;
- else if (unformat (line_input, "ip6"))
- ip6 = 1;
- else if (unformat (line_input, "default"))
- default_cop = 1;
- else if (unformat (line_input, "%U", unformat_sw_if_index,
- vam, &sw_if_index))
- ;
- else if (unformat (line_input, "sw_if_index %d", &sw_if_index))
- ;
- else if (unformat (line_input, "fib-id %d", &fib_id))
- ;
- else
- break;
+ /* send it... */
+ S;
+ /* Wait for the reply */
+ W;
+}
+
+static int
+api_cop_whitelist_enable_disable (vat_main_t * vam)
+{
+ unformat_input_t *line_input = vam->input;
+ vl_api_cop_whitelist_enable_disable_t *mp;
+ f64 timeout;
+ u32 sw_if_index = ~0;
+ u8 ip4 = 0, ip6 = 0, default_cop = 0;
+ u32 fib_id;
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (line_input, "ip4"))
+ ip4 = 1;
+ else if (unformat (line_input, "ip6"))
+ ip6 = 1;
+ else if (unformat (line_input, "default"))
+ default_cop = 1;
+ else if (unformat (line_input, "%U", unformat_sw_if_index,
+ vam, &sw_if_index))
+ ;
+ else if (unformat (line_input, "sw_if_index %d", &sw_if_index))
+ ;
+ else if (unformat (line_input, "fib-id %d", &fib_id))
+ ;
+ else
+ break;
}
- if (sw_if_index == ~0) {
- errmsg ("missing interface name or sw_if_index\n");
- return -99;
+ if (sw_if_index == ~0)
+ {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
}
- /* Construct the API message */
- M(COP_WHITELIST_ENABLE_DISABLE, cop_whitelist_enable_disable);
- mp->sw_if_index = ntohl(sw_if_index);
- mp->fib_id = ntohl(fib_id);
- mp->ip4 = ip4;
- mp->ip6 = ip6;
- mp->default_cop = default_cop;
+ /* Construct the API message */
+ M (COP_WHITELIST_ENABLE_DISABLE, cop_whitelist_enable_disable);
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->fib_id = ntohl (fib_id);
+ mp->ip4 = ip4;
+ mp->ip6 = ip6;
+ mp->default_cop = default_cop;
- /* send it... */
- S;
- /* Wait for the reply */
- W;
+ /* send it... */
+ S;
+ /* Wait for the reply */
+ W;
}
-static int api_get_node_graph (vat_main_t * vam)
+static int
+api_get_node_graph (vat_main_t * vam)
{
- vl_api_get_node_graph_t * mp;
- f64 timeout;
+ vl_api_get_node_graph_t *mp;
+ f64 timeout;
- M(GET_NODE_GRAPH, get_node_graph);
+ M (GET_NODE_GRAPH, get_node_graph);
- /* send it... */
- S;
- /* Wait for the reply */
- W;
+ /* send it... */
+ S;
+ /* Wait for the reply */
+ W;
}
+/* *INDENT-OFF* */
/** Used for parsing LISP eids */
typedef CLIB_PACKED(struct{
u8 addr[16]; /**< eid address */
u32 len; /**< prefix length if IP */
u8 type; /**< type of eid */
}) lisp_eid_vat_t;
+/* *INDENT-ON* */
static uword
unformat_lisp_eid_vat (unformat_input_t * input, va_list * args)
{
- lisp_eid_vat_t * a = va_arg(*args, lisp_eid_vat_t *);
+ lisp_eid_vat_t *a = va_arg (*args, lisp_eid_vat_t *);
- memset(a, 0, sizeof(a[0]));
+ memset (a, 0, sizeof (a[0]));
- if (unformat (input, "%U/%d", unformat_ip4_address, a->addr, &a->len)) {
- a->type = 0; /* ipv4 type */
- } else if (unformat (input, "%U/%d", unformat_ip6_address, a->addr,
- &a->len)) {
- a->type = 1; /* ipv6 type */
- } else if (unformat (input, "%U", unformat_ethernet_address, a->addr)) {
- a->type = 2; /* mac type */
- } else {
+ if (unformat (input, "%U/%d", unformat_ip4_address, a->addr, &a->len))
+ {
+ a->type = 0; /* ipv4 type */
+ }
+ else if (unformat (input, "%U/%d", unformat_ip6_address, a->addr, &a->len))
+ {
+ a->type = 1; /* ipv6 type */
+ }
+ else if (unformat (input, "%U", unformat_ethernet_address, a->addr))
+ {
+ a->type = 2; /* mac type */
+ }
+ else
+ {
return 0;
- }
+ }
- if ((a->type == 0 && a->len > 32) || (a->type == 1 && a->len > 128)) {
+ if ((a->type == 0 && a->len > 32) || (a->type == 1 && a->len > 128))
+ {
return 0;
- }
+ }
return 1;
}
@@ -10614,454 +11517,536 @@ unformat_lisp_eid_vat (unformat_input_t * input, va_list * args)
static int
lisp_eid_size_vat (u8 type)
{
- switch (type) {
+ switch (type)
+ {
case 0:
return 4;
case 1:
return 16;
case 2:
return 6;
- }
+ }
return 0;
}
static void
lisp_eid_put_vat (u8 * dst, u8 eid[16], u8 type)
{
- clib_memcpy(dst, eid, lisp_eid_size_vat(type));
+ clib_memcpy (dst, eid, lisp_eid_size_vat (type));
}
+/* *INDENT-OFF* */
/** Used for transferring locators via VPP API */
typedef CLIB_PACKED(struct
{
- u32 sw_if_index; /**< locator sw_if_index */
- u8 priority; /**< locator priority */
- u8 weight; /**< locator weight */
+ u32 sw_if_index; /**< locator sw_if_index */
+ u8 priority; /**< locator priority */
+ u8 weight; /**< locator weight */
}) ls_locator_t;
+/* *INDENT-ON* */
static int
-api_lisp_add_del_locator_set(vat_main_t * vam)
-{
- unformat_input_t * input = vam->input;
- vl_api_lisp_add_del_locator_set_t *mp;
- f64 timeout = ~0;
- u8 is_add = 1;
- u8 *locator_set_name = NULL;
- u8 locator_set_name_set = 0;
- ls_locator_t locator, * locators = 0;
- u32 sw_if_index, priority, weight;
-
- /* Parse args required to build the message */
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
- if (unformat(input, "del")) {
- is_add = 0;
- } else if (unformat(input, "locator-set %s", &locator_set_name)) {
- locator_set_name_set = 1;
- } else if (unformat(input, "sw_if_index %u p %u w %u",
- &sw_if_index, &priority, &weight)) {
- locator.sw_if_index = htonl(sw_if_index);
- locator.priority = priority;
- locator.weight = weight;
- vec_add1(locators, locator);
- } else if (unformat(input, "iface %U p %u w %u", unformat_sw_if_index,
- vam, &sw_if_index, &priority, &weight)) {
- locator.sw_if_index = htonl(sw_if_index);
- locator.priority = priority;
- locator.weight = weight;
- vec_add1(locators, locator);
- } else
- break;
- }
-
- if (locator_set_name_set == 0) {
- errmsg ("missing locator-set name");
- vec_free(locators);
- return -99;
- }
-
- if (vec_len(locator_set_name) > 64) {
- errmsg ("locator-set name too long\n");
- vec_free(locator_set_name);
- vec_free(locators);
- return -99;
- }
- vec_add1(locator_set_name, 0);
-
- /* Construct the API message */
- M(LISP_ADD_DEL_LOCATOR_SET, lisp_add_del_locator_set);
-
- mp->is_add = is_add;
- clib_memcpy(mp->locator_set_name, locator_set_name,
- vec_len(locator_set_name));
- vec_free(locator_set_name);
-
- mp->locator_num = vec_len (locators);
- clib_memcpy (mp->locators, locators,
- (sizeof (ls_locator_t) * vec_len (locators)));
- vec_free (locators);
-
- /* send it... */
- S;
+api_lisp_add_del_locator_set (vat_main_t * vam)
+{
+ unformat_input_t *input = vam->input;
+ vl_api_lisp_add_del_locator_set_t *mp;
+ f64 timeout = ~0;
+ u8 is_add = 1;
+ u8 *locator_set_name = NULL;
+ u8 locator_set_name_set = 0;
+ ls_locator_t locator, *locators = 0;
+ u32 sw_if_index, priority, weight;
- /* Wait for a reply... */
- W;
+ /* Parse args required to build the message */
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "del"))
+ {
+ is_add = 0;
+ }
+ else if (unformat (input, "locator-set %s", &locator_set_name))
+ {
+ locator_set_name_set = 1;
+ }
+ else if (unformat (input, "sw_if_index %u p %u w %u",
+ &sw_if_index, &priority, &weight))
+ {
+ locator.sw_if_index = htonl (sw_if_index);
+ locator.priority = priority;
+ locator.weight = weight;
+ vec_add1 (locators, locator);
+ }
+ else if (unformat (input, "iface %U p %u w %u", unformat_sw_if_index,
+ vam, &sw_if_index, &priority, &weight))
+ {
+ locator.sw_if_index = htonl (sw_if_index);
+ locator.priority = priority;
+ locator.weight = weight;
+ vec_add1 (locators, locator);
+ }
+ else
+ break;
+ }
- /* NOTREACHED */
- return 0;
+ if (locator_set_name_set == 0)
+ {
+ errmsg ("missing locator-set name");
+ vec_free (locators);
+ return -99;
+ }
+
+ if (vec_len (locator_set_name) > 64)
+ {
+ errmsg ("locator-set name too long\n");
+ vec_free (locator_set_name);
+ vec_free (locators);
+ return -99;
+ }
+ vec_add1 (locator_set_name, 0);
+
+ /* Construct the API message */
+ M (LISP_ADD_DEL_LOCATOR_SET, lisp_add_del_locator_set);
+
+ mp->is_add = is_add;
+ clib_memcpy (mp->locator_set_name, locator_set_name,
+ vec_len (locator_set_name));
+ vec_free (locator_set_name);
+
+ mp->locator_num = vec_len (locators);
+ clib_memcpy (mp->locators, locators,
+ (sizeof (ls_locator_t) * vec_len (locators)));
+ vec_free (locators);
+
+ /* send it... */
+ S;
+
+ /* Wait for a reply... */
+ W;
+
+ /* NOTREACHED */
+ return 0;
}
static int
-api_lisp_add_del_locator(vat_main_t * vam)
-{
- unformat_input_t * input = vam->input;
- vl_api_lisp_add_del_locator_t *mp;
- f64 timeout = ~0;
- u32 tmp_if_index = ~0;
- u32 sw_if_index = ~0;
- u8 sw_if_index_set = 0;
- u8 sw_if_index_if_name_set = 0;
- u32 priority = ~0;
- u8 priority_set = 0;
- u32 weight = ~0;
- u8 weight_set = 0;
- u8 is_add = 1;
- u8 *locator_set_name = NULL;
- u8 locator_set_name_set = 0;
-
- /* Parse args required to build the message */
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
- if (unformat(input, "del")) {
- is_add = 0;
- } else if (unformat(input, "locator-set %s", &locator_set_name)) {
- locator_set_name_set = 1;
- } else if (unformat(input, "iface %U", unformat_sw_if_index, vam,
- &tmp_if_index)) {
- sw_if_index_if_name_set = 1;
- sw_if_index = tmp_if_index;
- } else if (unformat(input,"sw_if_index %d", &tmp_if_index)) {
- sw_if_index_set = 1;
- sw_if_index = tmp_if_index;
- } else if (unformat(input, "p %d", &priority)) {
- priority_set = 1;
- } else if (unformat(input, "w %d", &weight)) {
- weight_set = 1;
- } else
- break;
- }
-
- if (locator_set_name_set == 0) {
- errmsg ("missing locator-set name");
- return -99;
- }
-
- if (sw_if_index_set == 0 && sw_if_index_if_name_set == 0) {
- errmsg ("missing sw_if_index");
- vec_free(locator_set_name);
- return -99;
- }
-
- if (sw_if_index_set != 0 && sw_if_index_if_name_set != 0) {
- errmsg ("cannot use both params interface name and sw_if_index");
- vec_free(locator_set_name);
- return -99;
- }
-
- if (priority_set == 0) {
- errmsg ("missing locator-set priority\n");
- vec_free(locator_set_name);
- return -99;
- }
-
- if (weight_set == 0) {
- errmsg ("missing locator-set weight\n");
- vec_free(locator_set_name);
- return -99;
- }
-
- if (vec_len(locator_set_name) > 64) {
- errmsg ("locator-set name too long\n");
- vec_free(locator_set_name);
- return -99;
- }
- vec_add1(locator_set_name, 0);
-
- /* Construct the API message */
- M(LISP_ADD_DEL_LOCATOR, lisp_add_del_locator);
-
- mp->is_add = is_add;
- mp->sw_if_index = ntohl(sw_if_index);
- mp->priority = priority;
- mp->weight = weight;
- clib_memcpy(mp->locator_set_name, locator_set_name,
- vec_len(locator_set_name));
- vec_free(locator_set_name);
-
- /* send it... */
- S;
+api_lisp_add_del_locator (vat_main_t * vam)
+{
+ unformat_input_t *input = vam->input;
+ vl_api_lisp_add_del_locator_t *mp;
+ f64 timeout = ~0;
+ u32 tmp_if_index = ~0;
+ u32 sw_if_index = ~0;
+ u8 sw_if_index_set = 0;
+ u8 sw_if_index_if_name_set = 0;
+ u32 priority = ~0;
+ u8 priority_set = 0;
+ u32 weight = ~0;
+ u8 weight_set = 0;
+ u8 is_add = 1;
+ u8 *locator_set_name = NULL;
+ u8 locator_set_name_set = 0;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "del"))
+ {
+ is_add = 0;
+ }
+ else if (unformat (input, "locator-set %s", &locator_set_name))
+ {
+ locator_set_name_set = 1;
+ }
+ else if (unformat (input, "iface %U", unformat_sw_if_index, vam,
+ &tmp_if_index))
+ {
+ sw_if_index_if_name_set = 1;
+ sw_if_index = tmp_if_index;
+ }
+ else if (unformat (input, "sw_if_index %d", &tmp_if_index))
+ {
+ sw_if_index_set = 1;
+ sw_if_index = tmp_if_index;
+ }
+ else if (unformat (input, "p %d", &priority))
+ {
+ priority_set = 1;
+ }
+ else if (unformat (input, "w %d", &weight))
+ {
+ weight_set = 1;
+ }
+ else
+ break;
+ }
- /* Wait for a reply... */
- W;
+ if (locator_set_name_set == 0)
+ {
+ errmsg ("missing locator-set name");
+ return -99;
+ }
- /* NOTREACHED */
- return 0;
+ if (sw_if_index_set == 0 && sw_if_index_if_name_set == 0)
+ {
+ errmsg ("missing sw_if_index");
+ vec_free (locator_set_name);
+ return -99;
+ }
+
+ if (sw_if_index_set != 0 && sw_if_index_if_name_set != 0)
+ {
+ errmsg ("cannot use both params interface name and sw_if_index");
+ vec_free (locator_set_name);
+ return -99;
+ }
+
+ if (priority_set == 0)
+ {
+ errmsg ("missing locator-set priority\n");
+ vec_free (locator_set_name);
+ return -99;
+ }
+
+ if (weight_set == 0)
+ {
+ errmsg ("missing locator-set weight\n");
+ vec_free (locator_set_name);
+ return -99;
+ }
+
+ if (vec_len (locator_set_name) > 64)
+ {
+ errmsg ("locator-set name too long\n");
+ vec_free (locator_set_name);
+ return -99;
+ }
+ vec_add1 (locator_set_name, 0);
+
+ /* Construct the API message */
+ M (LISP_ADD_DEL_LOCATOR, lisp_add_del_locator);
+
+ mp->is_add = is_add;
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->priority = priority;
+ mp->weight = weight;
+ clib_memcpy (mp->locator_set_name, locator_set_name,
+ vec_len (locator_set_name));
+ vec_free (locator_set_name);
+
+ /* send it... */
+ S;
+
+ /* Wait for a reply... */
+ W;
+
+ /* NOTREACHED */
+ return 0;
}
static int
-api_lisp_add_del_local_eid(vat_main_t * vam)
+api_lisp_add_del_local_eid (vat_main_t * vam)
{
- unformat_input_t * input = vam->input;
- vl_api_lisp_add_del_local_eid_t *mp;
- f64 timeout = ~0;
- u8 is_add = 1;
- u8 eid_set = 0;
- lisp_eid_vat_t _eid, *eid = &_eid;
- u8 *locator_set_name = 0;
- u8 locator_set_name_set = 0;
- u32 vni = 0;
+ unformat_input_t *input = vam->input;
+ vl_api_lisp_add_del_local_eid_t *mp;
+ f64 timeout = ~0;
+ u8 is_add = 1;
+ u8 eid_set = 0;
+ lisp_eid_vat_t _eid, *eid = &_eid;
+ u8 *locator_set_name = 0;
+ u8 locator_set_name_set = 0;
+ u32 vni = 0;
- /* Parse args required to build the message */
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
- if (unformat(input, "del")) {
- is_add = 0;
- } else if (unformat(input, "vni %d", &vni)) {
- ;
- } else if (unformat(input, "eid %U", unformat_lisp_eid_vat, eid)) {
- eid_set = 1;
- } else if (unformat(input, "locator-set %s", &locator_set_name)) {
- locator_set_name_set = 1;
- } else
- break;
+ /* Parse args required to build the message */
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "del"))
+ {
+ is_add = 0;
+ }
+ else if (unformat (input, "vni %d", &vni))
+ {
+ ;
+ }
+ else if (unformat (input, "eid %U", unformat_lisp_eid_vat, eid))
+ {
+ eid_set = 1;
+ }
+ else if (unformat (input, "locator-set %s", &locator_set_name))
+ {
+ locator_set_name_set = 1;
+ }
+ else
+ break;
}
- if (locator_set_name_set == 0) {
- errmsg ("missing locator-set name\n");
- return -99;
+ if (locator_set_name_set == 0)
+ {
+ errmsg ("missing locator-set name\n");
+ return -99;
}
- if (0 == eid_set) {
- errmsg ("EID address not set!");
- vec_free(locator_set_name);
- return -99;
+ if (0 == eid_set)
+ {
+ errmsg ("EID address not set!");
+ vec_free (locator_set_name);
+ return -99;
}
- if (vec_len(locator_set_name) > 64) {
- errmsg ("locator-set name too long\n");
- vec_free(locator_set_name);
- return -99;
+ if (vec_len (locator_set_name) > 64)
+ {
+ errmsg ("locator-set name too long\n");
+ vec_free (locator_set_name);
+ return -99;
}
- vec_add1(locator_set_name, 0);
+ vec_add1 (locator_set_name, 0);
- /* Construct the API message */
- M(LISP_ADD_DEL_LOCAL_EID, lisp_add_del_local_eid);
+ /* Construct the API message */
+ M (LISP_ADD_DEL_LOCAL_EID, lisp_add_del_local_eid);
- mp->is_add = is_add;
- lisp_eid_put_vat (mp->eid, eid->addr, eid->type);
- mp->eid_type = eid->type;
- mp->prefix_len = eid->len;
- mp->vni = clib_host_to_net_u32(vni);
- clib_memcpy(mp->locator_set_name, locator_set_name,
- vec_len(locator_set_name));
+ mp->is_add = is_add;
+ lisp_eid_put_vat (mp->eid, eid->addr, eid->type);
+ mp->eid_type = eid->type;
+ mp->prefix_len = eid->len;
+ mp->vni = clib_host_to_net_u32 (vni);
+ clib_memcpy (mp->locator_set_name, locator_set_name,
+ vec_len (locator_set_name));
- vec_free(locator_set_name);
+ vec_free (locator_set_name);
- /* send it... */
- S;
+ /* send it... */
+ S;
- /* Wait for a reply... */
- W;
+ /* Wait for a reply... */
+ W;
- /* NOTREACHED */
- return 0;
+ /* NOTREACHED */
+ return 0;
}
+/* *INDENT-OFF* */
/** Used for transferring locators via VPP API */
typedef CLIB_PACKED(struct
{
- u8 is_ip4; /**< is locator an IPv4 address? */
- u8 priority; /**< locator priority */
- u8 weight; /**< locator weight */
- u8 addr[16]; /**< IPv4/IPv6 address */
+ u8 is_ip4; /**< is locator an IPv4 address? */
+ u8 priority; /**< locator priority */
+ u8 weight; /**< locator weight */
+ u8 addr[16]; /**< IPv4/IPv6 address */
}) rloc_t;
+/* *INDENT-ON* */
static int
-api_lisp_gpe_add_del_fwd_entry(vat_main_t * vam)
-{
- unformat_input_t * input = vam->input;
- vl_api_lisp_gpe_add_del_fwd_entry_t *mp;
- f64 timeout = ~0;
- u8 is_add = 1;
- lisp_eid_vat_t _rmt_eid, * rmt_eid = &_rmt_eid;
- lisp_eid_vat_t _lcl_eid, * lcl_eid = &_lcl_eid;
- u8 rmt_eid_set = 0, lcl_eid_set = 0;
- u32 action = ~0, p, w;
- ip4_address_t rmt_rloc4, lcl_rloc4;
- ip6_address_t rmt_rloc6, lcl_rloc6;
- rloc_t * rmt_locs = 0, * lcl_locs = 0, rloc, * curr_rloc = 0;
-
- /* Parse args required to build the message */
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
- if (unformat(input, "del")) {
- is_add = 0;
- } else if (unformat(input, "rmt_eid %U", unformat_lisp_eid_vat,
- rmt_eid)) {
- rmt_eid_set = 1;
- } else if (unformat(input, "lcl_eid %U", unformat_lisp_eid_vat,
- lcl_eid)) {
- lcl_eid_set = 1;
- } else if (unformat(input, "p %d w %d", &p, &w)) {
- if (!curr_rloc) {
- errmsg ("No RLOC configured for setting priority/weight!");
- return -99;
- }
- curr_rloc->priority = p;
- curr_rloc->weight = w;
- } else if (unformat(input, "loc-pair %U %U", unformat_ip4_address,
- &lcl_rloc4, unformat_ip4_address, &rmt_rloc4)) {
- rloc.is_ip4 = 1;
- clib_memcpy (&rloc.addr, &lcl_rloc4, sizeof (lcl_rloc4));
- vec_add1 (lcl_locs, rloc);
- clib_memcpy (&rloc.addr, &rmt_rloc4, sizeof (rmt_rloc4));
- vec_add1 (rmt_locs, rloc);
- curr_rloc = &rmt_locs[vec_len (rmt_locs) - 1];
- } else if (unformat(input, "loc-pair %U", unformat_ip6_address,
- &lcl_rloc6, unformat_ip6_address, &rmt_rloc6)) {
- rloc.is_ip4 = 0;
- clib_memcpy (&rloc.addr, &lcl_rloc6, sizeof (lcl_rloc6));
- vec_add1 (lcl_locs, rloc);
- clib_memcpy (&rloc.addr, &rmt_rloc6, sizeof (rmt_rloc6));
- vec_add1 (rmt_locs, rloc);
- curr_rloc = &rmt_locs[vec_len (rmt_locs) - 1];
- } else if (unformat(input, "action %d", &action)) {
- ;
- } else {
- clib_warning ("parse error '%U'", format_unformat_error, input);
- return -99;
- }
- }
-
- if (!rmt_eid_set) {
- errmsg ("remote eid addresses not set\n");
- return -99;
- }
-
- if (lcl_eid_set && rmt_eid->type != lcl_eid->type) {
- errmsg ("eid types don't match\n");
- return -99;
- }
-
- /* Construct the API message */
- M(LISP_GPE_ADD_DEL_FWD_ENTRY, lisp_gpe_add_del_fwd_entry);
-
- mp->is_add = is_add;
- lisp_eid_put_vat (mp->rmt_eid, rmt_eid->addr, rmt_eid->type);
- lisp_eid_put_vat (mp->lcl_eid, lcl_eid->addr, lcl_eid->type);
- mp->eid_type = rmt_eid->type;
- mp->rmt_len = rmt_eid->len;
- mp->lcl_len = lcl_eid->len;
- mp->action = action;
-
- mp->loc_num = vec_len (rmt_locs);
- clib_memcpy (mp->lcl_locs, lcl_locs,
- (sizeof(rloc_t) * vec_len(lcl_locs)));
- clib_memcpy (mp->rmt_locs, rmt_locs,
- (sizeof(rloc_t) * vec_len(rmt_locs)));
- vec_free(lcl_locs);
- vec_free(rmt_locs);
-
- /* send it... */
- S;
+api_lisp_gpe_add_del_fwd_entry (vat_main_t * vam)
+{
+ unformat_input_t *input = vam->input;
+ vl_api_lisp_gpe_add_del_fwd_entry_t *mp;
+ f64 timeout = ~0;
+ u8 is_add = 1;
+ lisp_eid_vat_t _rmt_eid, *rmt_eid = &_rmt_eid;
+ lisp_eid_vat_t _lcl_eid, *lcl_eid = &_lcl_eid;
+ u8 rmt_eid_set = 0, lcl_eid_set = 0;
+ u32 action = ~0, p, w;
+ ip4_address_t rmt_rloc4, lcl_rloc4;
+ ip6_address_t rmt_rloc6, lcl_rloc6;
+ rloc_t *rmt_locs = 0, *lcl_locs = 0, rloc, *curr_rloc = 0;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "del"))
+ {
+ is_add = 0;
+ }
+ else if (unformat (input, "rmt_eid %U", unformat_lisp_eid_vat, rmt_eid))
+ {
+ rmt_eid_set = 1;
+ }
+ else if (unformat (input, "lcl_eid %U", unformat_lisp_eid_vat, lcl_eid))
+ {
+ lcl_eid_set = 1;
+ }
+ else if (unformat (input, "p %d w %d", &p, &w))
+ {
+ if (!curr_rloc)
+ {
+ errmsg ("No RLOC configured for setting priority/weight!");
+ return -99;
+ }
+ curr_rloc->priority = p;
+ curr_rloc->weight = w;
+ }
+ else if (unformat (input, "loc-pair %U %U", unformat_ip4_address,
+ &lcl_rloc4, unformat_ip4_address, &rmt_rloc4))
+ {
+ rloc.is_ip4 = 1;
+ clib_memcpy (&rloc.addr, &lcl_rloc4, sizeof (lcl_rloc4));
+ vec_add1 (lcl_locs, rloc);
+ clib_memcpy (&rloc.addr, &rmt_rloc4, sizeof (rmt_rloc4));
+ vec_add1 (rmt_locs, rloc);
+ curr_rloc = &rmt_locs[vec_len (rmt_locs) - 1];
+ }
+ else if (unformat (input, "loc-pair %U", unformat_ip6_address,
+ &lcl_rloc6, unformat_ip6_address, &rmt_rloc6))
+ {
+ rloc.is_ip4 = 0;
+ clib_memcpy (&rloc.addr, &lcl_rloc6, sizeof (lcl_rloc6));
+ vec_add1 (lcl_locs, rloc);
+ clib_memcpy (&rloc.addr, &rmt_rloc6, sizeof (rmt_rloc6));
+ vec_add1 (rmt_locs, rloc);
+ curr_rloc = &rmt_locs[vec_len (rmt_locs) - 1];
+ }
+ else if (unformat (input, "action %d", &action))
+ {
+ ;
+ }
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, input);
+ return -99;
+ }
+ }
- /* Wait for a reply... */
- W;
+ if (!rmt_eid_set)
+ {
+ errmsg ("remote eid addresses not set\n");
+ return -99;
+ }
- /* NOTREACHED */
- return 0;
+ if (lcl_eid_set && rmt_eid->type != lcl_eid->type)
+ {
+ errmsg ("eid types don't match\n");
+ return -99;
+ }
+
+ /* Construct the API message */
+ M (LISP_GPE_ADD_DEL_FWD_ENTRY, lisp_gpe_add_del_fwd_entry);
+
+ mp->is_add = is_add;
+ lisp_eid_put_vat (mp->rmt_eid, rmt_eid->addr, rmt_eid->type);
+ lisp_eid_put_vat (mp->lcl_eid, lcl_eid->addr, lcl_eid->type);
+ mp->eid_type = rmt_eid->type;
+ mp->rmt_len = rmt_eid->len;
+ mp->lcl_len = lcl_eid->len;
+ mp->action = action;
+
+ mp->loc_num = vec_len (rmt_locs);
+ clib_memcpy (mp->lcl_locs, lcl_locs,
+ (sizeof (rloc_t) * vec_len (lcl_locs)));
+ clib_memcpy (mp->rmt_locs, rmt_locs,
+ (sizeof (rloc_t) * vec_len (rmt_locs)));
+ vec_free (lcl_locs);
+ vec_free (rmt_locs);
+
+ /* send it... */
+ S;
+
+ /* Wait for a reply... */
+ W;
+
+ /* NOTREACHED */
+ return 0;
}
static int
-api_lisp_add_del_map_resolver(vat_main_t * vam)
+api_lisp_add_del_map_resolver (vat_main_t * vam)
{
- unformat_input_t * input = vam->input;
- vl_api_lisp_add_del_map_resolver_t *mp;
- f64 timeout = ~0;
- u8 is_add = 1;
- u8 ipv4_set = 0;
- u8 ipv6_set = 0;
- ip4_address_t ipv4;
- ip6_address_t ipv6;
+ unformat_input_t *input = vam->input;
+ vl_api_lisp_add_del_map_resolver_t *mp;
+ f64 timeout = ~0;
+ u8 is_add = 1;
+ u8 ipv4_set = 0;
+ u8 ipv6_set = 0;
+ ip4_address_t ipv4;
+ ip6_address_t ipv6;
- /* Parse args required to build the message */
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
- if (unformat(input, "del")) {
- is_add = 0;
- } else if (unformat(input, "%U", unformat_ip4_address, &ipv4)) {
- ipv4_set = 1;
- } else if (unformat(input, "%U", unformat_ip6_address, &ipv6)) {
- ipv6_set = 1;
- } else
- break;
+ /* Parse args required to build the message */
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "del"))
+ {
+ is_add = 0;
+ }
+ else if (unformat (input, "%U", unformat_ip4_address, &ipv4))
+ {
+ ipv4_set = 1;
+ }
+ else if (unformat (input, "%U", unformat_ip6_address, &ipv6))
+ {
+ ipv6_set = 1;
+ }
+ else
+ break;
}
- if (ipv4_set && ipv6_set) {
- errmsg ("both eid v4 and v6 addresses set\n");
- return -99;
+ if (ipv4_set && ipv6_set)
+ {
+ errmsg ("both eid v4 and v6 addresses set\n");
+ return -99;
}
- if (!ipv4_set && !ipv6_set) {
- errmsg ("eid addresses not set\n");
- return -99;
+ if (!ipv4_set && !ipv6_set)
+ {
+ errmsg ("eid addresses not set\n");
+ return -99;
}
- /* Construct the API message */
- M(LISP_ADD_DEL_MAP_RESOLVER, lisp_add_del_map_resolver);
+ /* Construct the API message */
+ M (LISP_ADD_DEL_MAP_RESOLVER, lisp_add_del_map_resolver);
- mp->is_add = is_add;
- if (ipv6_set) {
- mp->is_ipv6 = 1;
- clib_memcpy(mp->ip_address, &ipv6, sizeof(ipv6));
- } else {
- mp->is_ipv6 = 0;
- clib_memcpy(mp->ip_address, &ipv4, sizeof(ipv4));
+ mp->is_add = is_add;
+ if (ipv6_set)
+ {
+ mp->is_ipv6 = 1;
+ clib_memcpy (mp->ip_address, &ipv6, sizeof (ipv6));
+ }
+ else
+ {
+ mp->is_ipv6 = 0;
+ clib_memcpy (mp->ip_address, &ipv4, sizeof (ipv4));
}
- /* send it... */
- S;
+ /* send it... */
+ S;
- /* Wait for a reply... */
- W;
+ /* Wait for a reply... */
+ W;
- /* NOTREACHED */
- return 0;
+ /* NOTREACHED */
+ return 0;
}
static int
api_lisp_gpe_enable_disable (vat_main_t * vam)
{
- unformat_input_t * input = vam->input;
+ unformat_input_t *input = vam->input;
vl_api_lisp_gpe_enable_disable_t *mp;
f64 timeout = ~0;
u8 is_set = 0;
u8 is_en = 1;
/* Parse args required to build the message */
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
- if (unformat(input, "enable")) {
- is_set = 1;
- is_en = 1;
- } else if (unformat(input, "disable")) {
- is_set = 1;
- is_en = 0;
- } else
- break;
- }
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "enable"))
+ {
+ is_set = 1;
+ is_en = 1;
+ }
+ else if (unformat (input, "disable"))
+ {
+ is_set = 1;
+ is_en = 0;
+ }
+ else
+ break;
+ }
- if (is_set == 0) {
- errmsg("Value not set\n");
+ if (is_set == 0)
+ {
+ errmsg ("Value not set\n");
return -99;
- }
+ }
/* Construct the API message */
- M(LISP_GPE_ENABLE_DISABLE, lisp_gpe_enable_disable);
+ M (LISP_GPE_ENABLE_DISABLE, lisp_gpe_enable_disable);
mp->is_en = is_en;
@@ -11078,7 +12063,7 @@ api_lisp_gpe_enable_disable (vat_main_t * vam)
static int
api_lisp_enable_disable (vat_main_t * vam)
{
- unformat_input_t * input = vam->input;
+ unformat_input_t *input = vam->input;
vl_api_lisp_enable_disable_t *mp;
f64 timeout = ~0;
u8 is_set = 0;
@@ -11088,16 +12073,16 @@ api_lisp_enable_disable (vat_main_t * vam)
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
if (unformat (input, "enable"))
- {
- is_set = 1;
- is_en = 1;
- }
+ {
+ is_set = 1;
+ is_en = 1;
+ }
else if (unformat (input, "disable"))
- {
- is_set = 1;
- }
+ {
+ is_set = 1;
+ }
else
- break;
+ break;
}
if (!is_set)
@@ -11107,7 +12092,7 @@ api_lisp_enable_disable (vat_main_t * vam)
}
/* Construct the API message */
- M(LISP_ENABLE_DISABLE, lisp_enable_disable);
+ M (LISP_ENABLE_DISABLE, lisp_enable_disable);
mp->is_en = is_en;
@@ -11132,23 +12117,23 @@ api_lisp_pitr_set_locator_set (vat_main_t * vam)
{
f64 timeout = ~0;
u8 ls_name_set = 0;
- unformat_input_t * input = vam->input;
- vl_api_lisp_pitr_set_locator_set_t * mp;
+ unformat_input_t *input = vam->input;
+ vl_api_lisp_pitr_set_locator_set_t *mp;
u8 is_add = 1;
- u8 * ls_name = 0;
+ u8 *ls_name = 0;
/* Parse args required to build the message */
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
if (unformat (input, "del"))
- is_add = 0;
+ is_add = 0;
else if (unformat (input, "locator-set %s", &ls_name))
- ls_name_set = 1;
+ ls_name_set = 1;
else
- {
- errmsg ("parse error '%U'", format_unformat_error, input);
- return -99;
- }
+ {
+ errmsg ("parse error '%U'", format_unformat_error, input);
+ return -99;
+ }
}
if (!ls_name_set)
@@ -11157,7 +12142,7 @@ api_lisp_pitr_set_locator_set (vat_main_t * vam)
return -99;
}
- M(LISP_PITR_SET_LOCATOR_SET, lisp_pitr_set_locator_set);
+ M (LISP_PITR_SET_LOCATOR_SET, lisp_pitr_set_locator_set);
mp->is_add = is_add;
clib_memcpy (mp->ls_name, ls_name, vec_len (ls_name));
@@ -11169,30 +12154,30 @@ api_lisp_pitr_set_locator_set (vat_main_t * vam)
/* wait for reply */
W;
- /* notreached*/
+ /* notreached */
return 0;
}
static int
api_show_lisp_pitr (vat_main_t * vam)
{
- vl_api_show_lisp_pitr_t *mp;
- f64 timeout = ~0;
+ vl_api_show_lisp_pitr_t *mp;
+ f64 timeout = ~0;
- if (!vam->json_output) {
- fformat(vam->ofp, "%=20s\n",
- "lisp status:");
+ if (!vam->json_output)
+ {
+ fformat (vam->ofp, "%=20s\n", "lisp status:");
}
- M(SHOW_LISP_PITR, show_lisp_pitr);
- /* send it... */
- S;
+ M (SHOW_LISP_PITR, show_lisp_pitr);
+ /* send it... */
+ S;
- /* Wait for a reply... */
- W;
+ /* Wait for a reply... */
+ W;
- /* NOTREACHED */
- return 0;
+ /* NOTREACHED */
+ return 0;
}
/**
@@ -11202,7 +12187,7 @@ static int
api_lisp_eid_table_add_del_map (vat_main_t * vam)
{
f64 timeout = ~0;
- unformat_input_t * input = vam->input;
+ unformat_input_t *input = vam->input;
vl_api_lisp_eid_table_add_del_map_t *mp;
u8 is_add = 1, vni_set = 0, vrf_set = 0, bd_index_set = 0;
u32 vni, vrf, bd_index;
@@ -11211,15 +12196,15 @@ api_lisp_eid_table_add_del_map (vat_main_t * vam)
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
if (unformat (input, "del"))
- is_add = 0;
- else if (unformat(input, "vrf %d", &vrf))
- vrf_set = 1;
- else if (unformat(input, "bd_index %d", &bd_index))
- bd_index_set = 1;
- else if (unformat(input, "vni %d", &vni))
- vni_set = 1;
+ is_add = 0;
+ else if (unformat (input, "vrf %d", &vrf))
+ vrf_set = 1;
+ else if (unformat (input, "bd_index %d", &bd_index))
+ bd_index_set = 1;
+ else if (unformat (input, "vni %d", &vni))
+ vni_set = 1;
else
- break;
+ break;
}
if (!vni_set || (!vrf_set && !bd_index_set))
@@ -11228,7 +12213,7 @@ api_lisp_eid_table_add_del_map (vat_main_t * vam)
return -99;
}
- M(LISP_EID_TABLE_ADD_DEL_MAP, lisp_eid_table_add_del_map);
+ M (LISP_EID_TABLE_ADD_DEL_MAP, lisp_eid_table_add_del_map);
mp->is_add = is_add;
mp->vni = htonl (vni);
@@ -11241,7 +12226,7 @@ api_lisp_eid_table_add_del_map (vat_main_t * vam)
/* wait for reply */
W;
- /* notreached*/
+ /* notreached */
return 0;
}
@@ -11254,90 +12239,114 @@ api_lisp_eid_table_add_del_map (vat_main_t * vam)
static int
api_lisp_add_del_remote_mapping (vat_main_t * vam)
{
- unformat_input_t * input = vam->input;
- vl_api_lisp_add_del_remote_mapping_t *mp;
- f64 timeout = ~0;
- u32 vni = 0;
- //TODO: seid need remove
- lisp_eid_vat_t _eid, * eid = &_eid;
- lisp_eid_vat_t _seid, * seid = &_seid;
- u8 is_add = 1, del_all = 0, eid_set = 0;
- u32 action = ~0, p, w;
- ip4_address_t rloc4;
- ip6_address_t rloc6;
- rloc_t * rlocs = 0, rloc, * curr_rloc = 0;
-
- /* Parse args required to build the message */
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
- if (unformat(input, "del-all")) {
- del_all = 1;
- } else if (unformat(input, "del")) {
- is_add = 0;
- } else if (unformat(input, "add")) {
- is_add = 1;
- } else if (unformat(input, "deid %U", unformat_lisp_eid_vat, eid)) {
- eid_set = 1;
- } else if (unformat(input, "seid %U", unformat_lisp_eid_vat, &seid)) {
- //TODO: Need remove, but first must be remove from CSIT test
- } else if (unformat(input, "vni %d", &vni)) {
- ;
- } else if (unformat(input, "p %d w %d", &p, &w)) {
- if (!curr_rloc) {
- errmsg ("No RLOC configured for setting priority/weight!");
- return -99;
- }
- curr_rloc->priority = p;
- curr_rloc->weight = w;
- } else if (unformat(input, "rloc %U", unformat_ip4_address, &rloc4)) {
- rloc.is_ip4 = 1;
- clib_memcpy (&rloc.addr, &rloc4, sizeof (rloc4));
- vec_add1 (rlocs, rloc);
- curr_rloc = &rlocs[vec_len (rlocs) - 1];
- } else if (unformat(input, "rloc %U", unformat_ip6_address, &rloc6)) {
- rloc.is_ip4 = 0;
- clib_memcpy (&rloc.addr, &rloc6, sizeof (rloc6));
- vec_add1 (rlocs, rloc);
- curr_rloc = &rlocs[vec_len (rlocs) - 1];
- } else if (unformat(input, "action %d", &action)) {
- ;
- } else {
- clib_warning ("parse error '%U'", format_unformat_error, input);
- return -99;
- }
- }
-
- if (0 == eid_set) {
- errmsg ("missing params!");
- return -99;
- }
-
- if (is_add && (~0 == action)
- && 0 == vec_len (rlocs)) {
- errmsg ("no action set for negative map-reply!");
- return -99;
- }
-
- M(LISP_ADD_DEL_REMOTE_MAPPING, lisp_add_del_remote_mapping);
- mp->is_add = is_add;
- mp->vni = htonl (vni);
- mp->action = (u8) action;
- mp->eid_len = eid->len;
- mp->del_all = del_all;
- mp->eid_type = eid->type;
- lisp_eid_put_vat(mp->eid, eid->addr, eid->type);
-
- mp->rloc_num = vec_len (rlocs);
- clib_memcpy (mp->rlocs, rlocs, (sizeof (rloc_t) * vec_len (rlocs)));
- vec_free (rlocs);
-
- /* send it... */
- S;
+ unformat_input_t *input = vam->input;
+ vl_api_lisp_add_del_remote_mapping_t *mp;
+ f64 timeout = ~0;
+ u32 vni = 0;
+ //TODO: seid need remove
+ lisp_eid_vat_t _eid, *eid = &_eid;
+ lisp_eid_vat_t _seid, *seid = &_seid;
+ u8 is_add = 1, del_all = 0, eid_set = 0;
+ u32 action = ~0, p, w;
+ ip4_address_t rloc4;
+ ip6_address_t rloc6;
+ rloc_t *rlocs = 0, rloc, *curr_rloc = 0;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "del-all"))
+ {
+ del_all = 1;
+ }
+ else if (unformat (input, "del"))
+ {
+ is_add = 0;
+ }
+ else if (unformat (input, "add"))
+ {
+ is_add = 1;
+ }
+ else if (unformat (input, "deid %U", unformat_lisp_eid_vat, eid))
+ {
+ eid_set = 1;
+ }
+ else if (unformat (input, "seid %U", unformat_lisp_eid_vat, &seid))
+ {
+ //TODO: Need remove, but first must be remove from CSIT test
+ }
+ else if (unformat (input, "vni %d", &vni))
+ {
+ ;
+ }
+ else if (unformat (input, "p %d w %d", &p, &w))
+ {
+ if (!curr_rloc)
+ {
+ errmsg ("No RLOC configured for setting priority/weight!");
+ return -99;
+ }
+ curr_rloc->priority = p;
+ curr_rloc->weight = w;
+ }
+ else if (unformat (input, "rloc %U", unformat_ip4_address, &rloc4))
+ {
+ rloc.is_ip4 = 1;
+ clib_memcpy (&rloc.addr, &rloc4, sizeof (rloc4));
+ vec_add1 (rlocs, rloc);
+ curr_rloc = &rlocs[vec_len (rlocs) - 1];
+ }
+ else if (unformat (input, "rloc %U", unformat_ip6_address, &rloc6))
+ {
+ rloc.is_ip4 = 0;
+ clib_memcpy (&rloc.addr, &rloc6, sizeof (rloc6));
+ vec_add1 (rlocs, rloc);
+ curr_rloc = &rlocs[vec_len (rlocs) - 1];
+ }
+ else if (unformat (input, "action %d", &action))
+ {
+ ;
+ }
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, input);
+ return -99;
+ }
+ }
- /* Wait for a reply... */
- W;
+ if (0 == eid_set)
+ {
+ errmsg ("missing params!");
+ return -99;
+ }
- /* NOTREACHED */
- return 0;
+ if (is_add && (~0 == action) && 0 == vec_len (rlocs))
+ {
+ errmsg ("no action set for negative map-reply!");
+ return -99;
+ }
+
+ M (LISP_ADD_DEL_REMOTE_MAPPING, lisp_add_del_remote_mapping);
+ mp->is_add = is_add;
+ mp->vni = htonl (vni);
+ mp->action = (u8) action;
+ mp->eid_len = eid->len;
+ mp->del_all = del_all;
+ mp->eid_type = eid->type;
+ lisp_eid_put_vat (mp->eid, eid->addr, eid->type);
+
+ mp->rloc_num = vec_len (rlocs);
+ clib_memcpy (mp->rlocs, rlocs, (sizeof (rloc_t) * vec_len (rlocs)));
+ vec_free (rlocs);
+
+ /* send it... */
+ S;
+
+ /* Wait for a reply... */
+ W;
+
+ /* NOTREACHED */
+ return 0;
}
/**
@@ -11350,149 +12359,184 @@ api_lisp_add_del_remote_mapping (vat_main_t * vam)
static int
api_lisp_add_del_adjacency (vat_main_t * vam)
{
- unformat_input_t * input = vam->input;
- vl_api_lisp_add_del_adjacency_t *mp;
- f64 timeout = ~0;
- u32 vni = 0;
- ip4_address_t seid4, deid4;
- ip6_address_t seid6, deid6;
- u8 deid_mac[6] = {0};
- u8 seid_mac[6] = {0};
- u8 deid_type, seid_type;
- u32 seid_len = 0, deid_len = 0, len;
- u8 is_add = 1;
-
- seid_type = deid_type = (u8)~0;
-
- /* Parse args required to build the message */
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
- if (unformat(input, "del")) {
- is_add = 0;
- } else if (unformat(input, "add")) {
- is_add = 1;
- } else if (unformat(input, "deid %U/%d", unformat_ip4_address,
- &deid4, &len)) {
- deid_type = 0; /* ipv4 */
- deid_len = len;
- } else if (unformat(input, "deid %U/%d", unformat_ip6_address,
- &deid6, &len)) {
- deid_type = 1; /* ipv6 */
- deid_len = len;
- } else if (unformat(input, "deid %U", unformat_ethernet_address,
- deid_mac)) {
- deid_type = 2; /* mac */
- } else if (unformat(input, "seid %U/%d", unformat_ip4_address,
- &seid4, &len)) {
- seid_type = 0; /* ipv4 */
- seid_len = len;
- } else if (unformat(input, "seid %U/%d", unformat_ip6_address,
- &seid6, &len)) {
- seid_type = 1; /* ipv6 */
- seid_len = len;
- } else if (unformat(input, "seid %U", unformat_ethernet_address,
- seid_mac)) {
- seid_type = 2; /* mac */
- } else if (unformat(input, "vni %d", &vni)) {
- ;
- } else {
- errmsg ("parse error '%U'", format_unformat_error, input);
- return -99;
- }
- }
-
- if ((u8)~0 == deid_type) {
- errmsg ("missing params!");
- return -99;
- }
-
- if (seid_type != deid_type) {
- errmsg ("source and destination EIDs are of different types!");
- return -99;
- }
-
- M(LISP_ADD_DEL_ADJACENCY, lisp_add_del_adjacency);
- mp->is_add = is_add;
- mp->vni = htonl (vni);
- mp->seid_len = seid_len;
- mp->deid_len = deid_len;
- mp->eid_type = deid_type;
-
- switch (mp->eid_type) {
+ unformat_input_t *input = vam->input;
+ vl_api_lisp_add_del_adjacency_t *mp;
+ f64 timeout = ~0;
+ u32 vni = 0;
+ ip4_address_t seid4, deid4;
+ ip6_address_t seid6, deid6;
+ u8 deid_mac[6] = { 0 };
+ u8 seid_mac[6] = { 0 };
+ u8 deid_type, seid_type;
+ u32 seid_len = 0, deid_len = 0, len;
+ u8 is_add = 1;
+
+ seid_type = deid_type = (u8) ~ 0;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "del"))
+ {
+ is_add = 0;
+ }
+ else if (unformat (input, "add"))
+ {
+ is_add = 1;
+ }
+ else if (unformat (input, "deid %U/%d", unformat_ip4_address,
+ &deid4, &len))
+ {
+ deid_type = 0; /* ipv4 */
+ deid_len = len;
+ }
+ else if (unformat (input, "deid %U/%d", unformat_ip6_address,
+ &deid6, &len))
+ {
+ deid_type = 1; /* ipv6 */
+ deid_len = len;
+ }
+ else if (unformat (input, "deid %U", unformat_ethernet_address,
+ deid_mac))
+ {
+ deid_type = 2; /* mac */
+ }
+ else if (unformat (input, "seid %U/%d", unformat_ip4_address,
+ &seid4, &len))
+ {
+ seid_type = 0; /* ipv4 */
+ seid_len = len;
+ }
+ else if (unformat (input, "seid %U/%d", unformat_ip6_address,
+ &seid6, &len))
+ {
+ seid_type = 1; /* ipv6 */
+ seid_len = len;
+ }
+ else if (unformat (input, "seid %U", unformat_ethernet_address,
+ seid_mac))
+ {
+ seid_type = 2; /* mac */
+ }
+ else if (unformat (input, "vni %d", &vni))
+ {
+ ;
+ }
+ else
+ {
+ errmsg ("parse error '%U'", format_unformat_error, input);
+ return -99;
+ }
+ }
+
+ if ((u8) ~ 0 == deid_type)
+ {
+ errmsg ("missing params!");
+ return -99;
+ }
+
+ if (seid_type != deid_type)
+ {
+ errmsg ("source and destination EIDs are of different types!");
+ return -99;
+ }
+
+ M (LISP_ADD_DEL_ADJACENCY, lisp_add_del_adjacency);
+ mp->is_add = is_add;
+ mp->vni = htonl (vni);
+ mp->seid_len = seid_len;
+ mp->deid_len = deid_len;
+ mp->eid_type = deid_type;
+
+ switch (mp->eid_type)
+ {
case 0:
- clib_memcpy (mp->seid, &seid4, sizeof (seid4));
- clib_memcpy (mp->deid, &deid4, sizeof (deid4));
- break;
+ clib_memcpy (mp->seid, &seid4, sizeof (seid4));
+ clib_memcpy (mp->deid, &deid4, sizeof (deid4));
+ break;
case 1:
- clib_memcpy (mp->seid, &seid6, sizeof (seid6));
- clib_memcpy (mp->deid, &deid6, sizeof (deid6));
- break;
+ clib_memcpy (mp->seid, &seid6, sizeof (seid6));
+ clib_memcpy (mp->deid, &deid6, sizeof (deid6));
+ break;
case 2:
- clib_memcpy (mp->seid, seid_mac, 6);
- clib_memcpy (mp->deid, deid_mac, 6);
- break;
+ clib_memcpy (mp->seid, seid_mac, 6);
+ clib_memcpy (mp->deid, deid_mac, 6);
+ break;
default:
- errmsg ("unknown EID type %d!", mp->eid_type);
- return 0;
+ errmsg ("unknown EID type %d!", mp->eid_type);
+ return 0;
}
- /* send it... */
- S;
+ /* send it... */
+ S;
- /* Wait for a reply... */
- W;
+ /* Wait for a reply... */
+ W;
- /* NOTREACHED */
- return 0;
+ /* NOTREACHED */
+ return 0;
}
static int
-api_lisp_gpe_add_del_iface(vat_main_t * vam)
+api_lisp_gpe_add_del_iface (vat_main_t * vam)
{
- unformat_input_t * input = vam->input;
- vl_api_lisp_gpe_add_del_iface_t *mp;
- f64 timeout = ~0;
- u8 is_set = 0, is_add = 1, is_l2 = 0;
- u32 dp_table, vni;
+ unformat_input_t *input = vam->input;
+ vl_api_lisp_gpe_add_del_iface_t *mp;
+ f64 timeout = ~0;
+ u8 is_set = 0, is_add = 1, is_l2 = 0;
+ u32 dp_table, vni;
- /* Parse args required to build the message */
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
- if (unformat(input, "up")) {
- is_set = 1;
- is_add = 1;
- } else if (unformat(input, "down")) {
- is_set = 1;
- is_add = 0;
- } else if (unformat(input, "table_id %d", &dp_table)) {
- ;
- } else if (unformat(input, "bd_id %d", &dp_table)) {
- is_l2 = 1;
- } else if (unformat(input, "vni %d", &vni)) {
- ;
- } else
- break;
+ /* Parse args required to build the message */
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "up"))
+ {
+ is_set = 1;
+ is_add = 1;
+ }
+ else if (unformat (input, "down"))
+ {
+ is_set = 1;
+ is_add = 0;
+ }
+ else if (unformat (input, "table_id %d", &dp_table))
+ {
+ ;
+ }
+ else if (unformat (input, "bd_id %d", &dp_table))
+ {
+ is_l2 = 1;
+ }
+ else if (unformat (input, "vni %d", &vni))
+ {
+ ;
+ }
+ else
+ break;
}
- if (is_set == 0) {
- errmsg("Value not set\n");
- return -99;
+ if (is_set == 0)
+ {
+ errmsg ("Value not set\n");
+ return -99;
}
- /* Construct the API message */
- M(LISP_GPE_ADD_DEL_IFACE, lisp_gpe_add_del_iface);
+ /* Construct the API message */
+ M (LISP_GPE_ADD_DEL_IFACE, lisp_gpe_add_del_iface);
- mp->is_add = is_add;
- mp->dp_table = dp_table;
- mp->is_l2 = is_l2;
- mp->vni = vni;
+ mp->is_add = is_add;
+ mp->dp_table = dp_table;
+ mp->is_l2 = is_l2;
+ mp->vni = vni;
- /* send it... */
- S;
+ /* send it... */
+ S;
- /* Wait for a reply... */
- W;
+ /* Wait for a reply... */
+ W;
- /* NOTREACHED */
- return 0;
+ /* NOTREACHED */
+ return 0;
}
/**
@@ -11502,2373 +12546,2631 @@ api_lisp_gpe_add_del_iface(vat_main_t * vam)
* @return return code
*/
static int
-api_lisp_add_del_map_request_itr_rlocs(vat_main_t * vam)
+api_lisp_add_del_map_request_itr_rlocs (vat_main_t * vam)
{
- unformat_input_t * input = vam->input;
- vl_api_lisp_add_del_map_request_itr_rlocs_t *mp;
- f64 timeout = ~0;
- u8 *locator_set_name = 0;
- u8 locator_set_name_set = 0;
- u8 is_add = 1;
+ unformat_input_t *input = vam->input;
+ vl_api_lisp_add_del_map_request_itr_rlocs_t *mp;
+ f64 timeout = ~0;
+ u8 *locator_set_name = 0;
+ u8 locator_set_name_set = 0;
+ u8 is_add = 1;
- /* Parse args required to build the message */
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
- if (unformat(input, "del")) {
- is_add = 0;
- } else if (unformat(input, "%_%v%_", &locator_set_name)) {
- locator_set_name_set = 1;
- } else {
- clib_warning ("parse error '%U'", format_unformat_error, input);
- return -99;
- }
+ /* Parse args required to build the message */
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "del"))
+ {
+ is_add = 0;
+ }
+ else if (unformat (input, "%_%v%_", &locator_set_name))
+ {
+ locator_set_name_set = 1;
+ }
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, input);
+ return -99;
+ }
}
- if (is_add && !locator_set_name_set) {
- errmsg ("itr-rloc is not set!");
- return -99;
+ if (is_add && !locator_set_name_set)
+ {
+ errmsg ("itr-rloc is not set!");
+ return -99;
}
- if (is_add && vec_len(locator_set_name) > 64) {
- errmsg ("itr-rloc locator-set name too long\n");
- vec_free(locator_set_name);
- return -99;
+ if (is_add && vec_len (locator_set_name) > 64)
+ {
+ errmsg ("itr-rloc locator-set name too long\n");
+ vec_free (locator_set_name);
+ return -99;
}
- M(LISP_ADD_DEL_MAP_REQUEST_ITR_RLOCS, lisp_add_del_map_request_itr_rlocs);
- mp->is_add = is_add;
- if (is_add) {
- clib_memcpy (mp->locator_set_name , locator_set_name,
- vec_len(locator_set_name));
- } else {
- memset(mp->locator_set_name, 0, sizeof(mp->locator_set_name));
+ M (LISP_ADD_DEL_MAP_REQUEST_ITR_RLOCS, lisp_add_del_map_request_itr_rlocs);
+ mp->is_add = is_add;
+ if (is_add)
+ {
+ clib_memcpy (mp->locator_set_name, locator_set_name,
+ vec_len (locator_set_name));
}
- vec_free (locator_set_name);
+ else
+ {
+ memset (mp->locator_set_name, 0, sizeof (mp->locator_set_name));
+ }
+ vec_free (locator_set_name);
- /* send it... */
- S;
+ /* send it... */
+ S;
- /* Wait for a reply... */
- W;
+ /* Wait for a reply... */
+ W;
- /* NOTREACHED */
- return 0;
+ /* NOTREACHED */
+ return 0;
}
static int
-lisp_locator_dump_send_msg(vat_main_t * vam, u32 locator_set_index, u8 filter)
+lisp_locator_dump_send_msg (vat_main_t * vam, u32 locator_set_index,
+ u8 filter)
{
- vl_api_lisp_locator_dump_t *mp;
- f64 timeout = ~0;
+ vl_api_lisp_locator_dump_t *mp;
+ f64 timeout = ~0;
- M(LISP_LOCATOR_DUMP, lisp_locator_dump);
+ M (LISP_LOCATOR_DUMP, lisp_locator_dump);
- mp->locator_set_index = htonl(locator_set_index);
- mp->filter = filter;
+ mp->locator_set_index = htonl (locator_set_index);
+ mp->filter = filter;
- /* send it... */
- S;
+ /* send it... */
+ S;
- /* Use a control ping for synchronization */
- {
- vl_api_noprint_control_ping_t * mp;
- M(NOPRINT_CONTROL_PING, noprint_control_ping);
- S;
- }
- /* Wait for a reply... */
- W;
+ /* Use a control ping for synchronization */
+ {
+ vl_api_noprint_control_ping_t *mp;
+ M (NOPRINT_CONTROL_PING, noprint_control_ping);
+ S;
+ }
+ /* Wait for a reply... */
+ W;
}
static inline void
-clean_locator_set_message(vat_main_t * vam)
+clean_locator_set_message (vat_main_t * vam)
+{
+ locator_set_msg_t *ls = 0;
+
+ vec_foreach (ls, vam->locator_set_msg)
+ {
+ vec_free (ls->locator_set_name);
+ }
+
+ vec_free (vam->locator_set_msg);
+}
+
+static int
+print_locator_in_locator_set (vat_main_t * vam, u8 filter)
{
- locator_set_msg_t * ls = 0;
-
- vec_foreach (ls, vam->locator_set_msg) {
- vec_free(ls->locator_set_name);
- }
-
- vec_free(vam->locator_set_msg);
-}
-
-static int
-print_locator_in_locator_set(vat_main_t * vam, u8 filter)
-{
- locator_set_msg_t * ls;
- locator_msg_t * loc;
- u8 * tmp_str = 0;
- int i = 0, ret = 0;
-
- vec_foreach(ls, vam->locator_set_msg) {
- ret = lisp_locator_dump_send_msg(vam, ls->locator_set_index, filter);
- if (ret) {
- vec_free(vam->locator_msg);
- clean_locator_set_message(vam);
- return ret;
- }
-
- tmp_str = format(0, "%=20s%=16d%s", ls->locator_set_name,
- ls->locator_set_index,
- vec_len(vam->locator_msg) ? "" : "\n");
- i = 0;
- vec_foreach(loc, vam->locator_msg) {
- if (i) {
- tmp_str = format(tmp_str, "%=37s", " ");
- }
- if (loc->local) {
- tmp_str = format(tmp_str, "%=16d%=16d%=16d\n",
- loc->sw_if_index,
- loc->priority,
- loc->weight);
- } else {
- tmp_str = format(tmp_str, "%=16U%=16d%=16d\n",
- loc->is_ipv6 ? format_ip6_address :
- format_ip4_address,
- loc->ip_address,
- loc->priority,
- loc->weight);
- }
- i++;
- }
+ locator_set_msg_t *ls;
+ locator_msg_t *loc;
+ u8 *tmp_str = 0;
+ int i = 0, ret = 0;
+
+ vec_foreach (ls, vam->locator_set_msg)
+ {
+ ret = lisp_locator_dump_send_msg (vam, ls->locator_set_index, filter);
+ if (ret)
+ {
+ vec_free (vam->locator_msg);
+ clean_locator_set_message (vam);
+ return ret;
+ }
- fformat(vam->ofp, "%s", tmp_str);
- vec_free(tmp_str);
- vec_free(vam->locator_msg);
+ tmp_str = format (0, "%=20s%=16d%s", ls->locator_set_name,
+ ls->locator_set_index,
+ vec_len (vam->locator_msg) ? "" : "\n");
+ i = 0;
+ vec_foreach (loc, vam->locator_msg)
+ {
+ if (i)
+ {
+ tmp_str = format (tmp_str, "%=37s", " ");
+ }
+ if (loc->local)
+ {
+ tmp_str = format (tmp_str, "%=16d%=16d%=16d\n",
+ loc->sw_if_index, loc->priority, loc->weight);
+ }
+ else
+ {
+ tmp_str = format (tmp_str, "%=16U%=16d%=16d\n",
+ loc->is_ipv6 ? format_ip6_address :
+ format_ip4_address,
+ loc->ip_address, loc->priority, loc->weight);
+ }
+ i++;
}
- clean_locator_set_message(vam);
+ fformat (vam->ofp, "%s", tmp_str);
+ vec_free (tmp_str);
+ vec_free (vam->locator_msg);
+ }
+
+ clean_locator_set_message (vam);
- return ret;
+ return ret;
}
static int
-json_locator_in_locator_set(vat_main_t * vam, u8 filter)
-{
- locator_set_msg_t * ls;
- locator_msg_t * loc;
- vat_json_node_t * node = NULL;
- vat_json_node_t * locator_array;
- vat_json_node_t * locator;
- struct in6_addr ip6;
- struct in_addr ip4;
- int ret = 0;
+json_locator_in_locator_set (vat_main_t * vam, u8 filter)
+{
+ locator_set_msg_t *ls;
+ locator_msg_t *loc;
+ vat_json_node_t *node = NULL;
+ vat_json_node_t *locator_array;
+ vat_json_node_t *locator;
+ struct in6_addr ip6;
+ struct in_addr ip4;
+ int ret = 0;
+
+ if (!vec_len (vam->locator_set_msg))
+ {
+ /* just print [] */
+ vat_json_init_array (&vam->json_tree);
+ vat_json_print (vam->ofp, &vam->json_tree);
+ vam->json_tree.type = VAT_JSON_NONE;
+ return ret;
+ }
- if (!vec_len(vam->locator_set_msg)) {
- /* just print [] */
- vat_json_init_array(&vam->json_tree);
- vat_json_print(vam->ofp, &vam->json_tree);
- vam->json_tree.type = VAT_JSON_NONE;
- return ret;
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
}
- if (VAT_JSON_ARRAY != vam->json_tree.type) {
- ASSERT(VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array(&vam->json_tree);
+ vec_foreach (ls, vam->locator_set_msg)
+ {
+ ret = lisp_locator_dump_send_msg (vam, ls->locator_set_index, filter);
+ if (ret)
+ {
+ vec_free (ls->locator_set_name);
+ vec_free (vam->locator_msg);
+ vec_free (vam->locator_set_msg);
+ vat_json_free (&vam->json_tree);
+ vam->json_tree.type = VAT_JSON_NONE;
+ return ret;
+ }
+
+ node = vat_json_array_add (&vam->json_tree);
+ vat_json_init_object (node);
+
+ vat_json_object_add_uint (node, "locator-set-index",
+ ls->locator_set_index);
+ vat_json_object_add_string_copy (node, "locator-set",
+ ls->locator_set_name);
+ locator_array = vat_json_object_add_list (node, "locator");
+ vec_foreach (loc, vam->locator_msg)
+ {
+ locator = vat_json_array_add (locator_array);
+ vat_json_init_object (locator);
+ if (loc->local)
+ {
+ vat_json_object_add_uint (locator, "locator-index",
+ loc->sw_if_index);
+ }
+ else
+ {
+ if (loc->is_ipv6)
+ {
+ clib_memcpy (&ip6, loc->ip_address, sizeof (ip6));
+ vat_json_object_add_ip6 (locator, "locator", ip6);
+ }
+ else
+ {
+ clib_memcpy (&ip4, loc->ip_address, sizeof (ip4));
+ vat_json_object_add_ip4 (locator, "locator", ip4);
+ }
+ }
+ vat_json_object_add_uint (locator, "priority", loc->priority);
+ vat_json_object_add_uint (locator, "weight", loc->weight);
}
- vec_foreach(ls, vam->locator_set_msg) {
- ret = lisp_locator_dump_send_msg(vam, ls->locator_set_index, filter);
- if (ret) {
- vec_free(ls->locator_set_name);
- vec_free(vam->locator_msg);
- vec_free(vam->locator_set_msg);
- vat_json_free(&vam->json_tree);
- vam->json_tree.type = VAT_JSON_NONE;
- return ret;
- }
+ vec_free (ls->locator_set_name);
+ vec_free (vam->locator_msg);
+ }
- node = vat_json_array_add(&vam->json_tree);
- vat_json_init_object(node);
+ vat_json_print (vam->ofp, &vam->json_tree);
+ vat_json_free (&vam->json_tree);
+ vam->json_tree.type = VAT_JSON_NONE;
- vat_json_object_add_uint(node, "locator-set-index",
- ls->locator_set_index);
- vat_json_object_add_string_copy(node, "locator-set",
- ls->locator_set_name);
- locator_array = vat_json_object_add_list(node, "locator");
- vec_foreach(loc, vam->locator_msg) {
- locator = vat_json_array_add(locator_array);
- vat_json_init_object(locator);
- if (loc->local) {
- vat_json_object_add_uint(locator, "locator-index",
- loc->sw_if_index);
- } else {
- if (loc->is_ipv6) {
- clib_memcpy(&ip6, loc->ip_address, sizeof(ip6));
- vat_json_object_add_ip6(locator, "locator", ip6);
- } else {
- clib_memcpy(&ip4, loc->ip_address, sizeof(ip4));
- vat_json_object_add_ip4(locator, "locator", ip4);
- }
- }
- vat_json_object_add_uint(locator, "priority", loc->priority);
- vat_json_object_add_uint(locator, "weight", loc->weight);
- }
-
- vec_free(ls->locator_set_name);
- vec_free(vam->locator_msg);
- }
-
- vat_json_print(vam->ofp, &vam->json_tree);
- vat_json_free(&vam->json_tree);
- vam->json_tree.type = VAT_JSON_NONE;
-
- vec_free(vam->locator_set_msg);
-
- return ret;
-}
-
-static int
-get_locator_set_index_from_msg(vat_main_t * vam, u8 * locator_set,
- u32 * locator_set_index)
+ vec_free (vam->locator_set_msg);
+
+ return ret;
+}
+
+static int
+get_locator_set_index_from_msg (vat_main_t * vam, u8 * locator_set,
+ u32 * locator_set_index)
{
- locator_set_msg_t * ls;
- int ret = 0;
+ locator_set_msg_t *ls;
+ int ret = 0;
- * locator_set_index = ~0;
+ *locator_set_index = ~0;
- if (!vec_len(vam->locator_set_msg)) {
+ if (!vec_len (vam->locator_set_msg))
+ {
return ret;
}
- vec_foreach(ls, vam->locator_set_msg) {
- if (!strcmp((char *) locator_set, (char *) ls->locator_set_name)) {
- * locator_set_index = ls->locator_set_index;
- vec_free(vam->locator_set_msg);
- return ret;
- }
- }
+ vec_foreach (ls, vam->locator_set_msg)
+ {
+ if (!strcmp ((char *) locator_set, (char *) ls->locator_set_name))
+ {
+ *locator_set_index = ls->locator_set_index;
+ vec_free (vam->locator_set_msg);
+ return ret;
+ }
+ }
- vec_free(vam->locator_set_msg);
+ vec_free (vam->locator_set_msg);
- return ret;
+ return ret;
}
static int
-get_locator_set_index(vat_main_t * vam, u8 * locator_set,
- u32 * locator_set_index)
+get_locator_set_index (vat_main_t * vam, u8 * locator_set,
+ u32 * locator_set_index)
{
- vl_api_lisp_locator_set_dump_t *mp;
- f64 timeout = ~0;
+ vl_api_lisp_locator_set_dump_t *mp;
+ f64 timeout = ~0;
+
+ M (LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump);
+ /* send it... */
+ S;
- M(LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump);
- /* send it... */
+ /* Use a control ping for synchronization */
+ {
+ vl_api_noprint_control_ping_t *mp;
+ M (NOPRINT_CONTROL_PING, noprint_control_ping);
S;
+ }
- /* Use a control ping for synchronization */
- {
- vl_api_noprint_control_ping_t * mp;
- M(NOPRINT_CONTROL_PING, noprint_control_ping);
- S;
- }
-
- vam->noprint_msg = 1;
- /* Wait for a reply... */
- W_L({
- get_locator_set_index_from_msg(vam, locator_set, locator_set_index);
- vam->noprint_msg = 0;
- })
-
- /* NOTREACHED */
- return 0;
+ vam->noprint_msg = 1;
+ /* Wait for a reply... */
+ /* *INDENT-OFF* */
+ W_L
+ ({
+ get_locator_set_index_from_msg (vam, locator_set, locator_set_index);
+ vam->noprint_msg = 0;
+ });
+ /* *INDENT-ON* */
+
+ /* NOTREACHED */
+ return 0;
}
static inline int
-lisp_locator_dump(vat_main_t * vam, u32 locator_set_index, u8 * locator_set,
- u8 filter)
+lisp_locator_dump (vat_main_t * vam, u32 locator_set_index, u8 * locator_set,
+ u8 filter)
{
- int ret = 0;
+ int ret = 0;
- ASSERT(vam);
+ ASSERT (vam);
- if (!vam->json_output) {
- fformat(vam->ofp, "%=20s%=16s%=16s\n",
- "locator", "priority", "weight");
+ if (!vam->json_output)
+ {
+ fformat (vam->ofp, "%=20s%=16s%=16s\n",
+ "locator", "priority", "weight");
}
- if (locator_set) {
- ret = get_locator_set_index(vam, locator_set, &locator_set_index);
+ if (locator_set)
+ {
+ ret = get_locator_set_index (vam, locator_set, &locator_set_index);
}
- if (!ret && ~0 == locator_set_index) {
+ if (!ret && ~0 == locator_set_index)
+ {
return -99;
}
- ret = lisp_locator_dump_send_msg(vam, locator_set_index, filter);
+ ret = lisp_locator_dump_send_msg (vam, locator_set_index, filter);
- return ret;
+ return ret;
}
static int
-lisp_locator_set_dump(vat_main_t * vam, u8 filter)
+lisp_locator_set_dump (vat_main_t * vam, u8 filter)
{
- vl_api_lisp_locator_set_dump_t *mp;
- f64 timeout = ~0;
+ vl_api_lisp_locator_set_dump_t *mp;
+ f64 timeout = ~0;
- if (!vam->json_output) {
- fformat(vam->ofp, "%=20s%=16s%=16s%=16s%=16s\n",
- "locator-set", "locator-set-index", "locator", "priority",
- "weight");
+ if (!vam->json_output)
+ {
+ fformat (vam->ofp, "%=20s%=16s%=16s%=16s%=16s\n",
+ "locator-set", "locator-set-index", "locator", "priority",
+ "weight");
}
- vam->noprint_msg = 1;
+ vam->noprint_msg = 1;
+
+ M (LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump);
- M(LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump);
+ mp->filter = filter;
- mp->filter = filter;
+ /* send it... */
+ S;
- /* send it... */
+ /* Use a control ping for synchronization */
+ {
+ vl_api_noprint_control_ping_t *mp;
+ M (NOPRINT_CONTROL_PING, noprint_control_ping);
S;
+ }
- /* Use a control ping for synchronization */
- {
- vl_api_noprint_control_ping_t * mp;
- M(NOPRINT_CONTROL_PING, noprint_control_ping);
- S;
- }
-
- /* Wait for a reply... */
- W_L({
- if (vam->noprint_msg) {
- if (!vam->json_output) {
- print_locator_in_locator_set(vam, filter);
- } else {
- json_locator_in_locator_set(vam, filter);
+ /* Wait for a reply... */
+ /* *INDENT-OFF* */
+ W_L
+ ({
+ if (vam->noprint_msg)
+ {
+ if (!vam->json_output)
+ {
+ print_locator_in_locator_set(vam, filter);
+ }
+ else
+ {
+ json_locator_in_locator_set(vam, filter);
}
}
+ vam->noprint_msg = 0;
+ });
+ /* *INDENT-ON* */
- vam->noprint_msg = 0;
- });
-
- /* NOTREACHED */
- return 0;
+ /* NOTREACHED */
+ return 0;
}
static int
-api_lisp_locator_set_dump(vat_main_t *vam)
+api_lisp_locator_set_dump (vat_main_t * vam)
{
- unformat_input_t * input = vam->input;
- vam->noprint_msg = 0;
- u32 locator_set_index = ~0;
- u8 locator_set_index_set = 0;
- u8 * locator_set = 0;
- u8 locator_set_set = 0;
- u8 filter = 0;
- int ret = 0;
+ unformat_input_t *input = vam->input;
+ vam->noprint_msg = 0;
+ u32 locator_set_index = ~0;
+ u8 locator_set_index_set = 0;
+ u8 *locator_set = 0;
+ u8 locator_set_set = 0;
+ u8 filter = 0;
+ int ret = 0;
- /* Parse args required to build the message */
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
- if (unformat(input, "locator-set-index %u", &locator_set_index)) {
- locator_set_index_set = 1;
- } else if (unformat(input, "locator-set %s", &locator_set)) {
- locator_set_set = 1;
- } else if (unformat(input, "local")) {
- filter = 1;
- } else if (unformat(input, "remote")) {
- filter = 2;
- } else {
- break;
- }
+ /* Parse args required to build the message */
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "locator-set-index %u", &locator_set_index))
+ {
+ locator_set_index_set = 1;
+ }
+ else if (unformat (input, "locator-set %s", &locator_set))
+ {
+ locator_set_set = 1;
+ }
+ else if (unformat (input, "local"))
+ {
+ filter = 1;
+ }
+ else if (unformat (input, "remote"))
+ {
+ filter = 2;
+ }
+ else
+ {
+ break;
+ }
}
- if (locator_set_index_set && locator_set_set) {
- errmsg ("use only input parameter!\n");
- return -99;
+ if (locator_set_index_set && locator_set_set)
+ {
+ errmsg ("use only input parameter!\n");
+ return -99;
}
- if (locator_set_index_set || locator_set_set) {
- ret = lisp_locator_dump(vam, locator_set_index, locator_set, filter);
- } else {
- ret = lisp_locator_set_dump(vam, filter);
+ if (locator_set_index_set || locator_set_set)
+ {
+ ret = lisp_locator_dump (vam, locator_set_index, locator_set, filter);
+ }
+ else
+ {
+ ret = lisp_locator_set_dump (vam, filter);
}
- vec_free(locator_set);
+ vec_free (locator_set);
- return ret;
+ return ret;
}
static int
-api_lisp_eid_table_map_dump(vat_main_t *vam)
+api_lisp_eid_table_map_dump (vat_main_t * vam)
{
- vl_api_lisp_eid_table_map_dump_t *mp;
- f64 timeout = ~0;
+ vl_api_lisp_eid_table_map_dump_t *mp;
+ f64 timeout = ~0;
- if (!vam->json_output) {
- fformat (vam->ofp, "%=10s%=10s\n", "VNI", "VRF");
+ if (!vam->json_output)
+ {
+ fformat (vam->ofp, "%=10s%=10s\n", "VNI", "VRF");
}
- M(LISP_EID_TABLE_MAP_DUMP, lisp_eid_table_map_dump);
+ M (LISP_EID_TABLE_MAP_DUMP, lisp_eid_table_map_dump);
- /* send it... */
- S;
+ /* send it... */
+ S;
- /* Use a control ping for synchronization */
- {
- vl_api_control_ping_t * mp;
- M(CONTROL_PING, control_ping);
- S;
- }
- /* Wait for a reply... */
- W;
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
+ S;
+ }
+ /* Wait for a reply... */
+ W;
- /* NOTREACHED */
- return 0;
+ /* NOTREACHED */
+ return 0;
}
static int
-get_locator_set(vat_main_t * vam)
+get_locator_set (vat_main_t * vam)
{
- vl_api_lisp_locator_set_dump_t *mp;
- f64 timeout = ~0;
+ vl_api_lisp_locator_set_dump_t *mp;
+ f64 timeout = ~0;
- M(LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump);
- /* send it... */
- S;
+ M (LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump);
+ /* send it... */
+ S;
- /* Use a control ping for synchronization */
- {
- vl_api_noprint_control_ping_t * mp;
- M(NOPRINT_CONTROL_PING, noprint_control_ping);
- S;
- }
+ /* Use a control ping for synchronization */
+ {
+ vl_api_noprint_control_ping_t *mp;
+ M (NOPRINT_CONTROL_PING, noprint_control_ping);
+ S;
+ }
- /* Wait for a reply... */
- W;
+ /* Wait for a reply... */
+ W;
- /* NOTREACHED */
- return 0;
+ /* NOTREACHED */
+ return 0;
}
static inline u8 *
-format_eid_for_eid_table(vat_main_t *vam, u8 * str, eid_table_t * eid_table,
- int *ret)
+format_eid_for_eid_table (vat_main_t * vam, u8 * str, eid_table_t * eid_table,
+ int *ret)
{
- u8 * (*format_eid)(u8 *, va_list *) = 0;
+ u8 *(*format_eid) (u8 *, va_list *) = 0;
- ASSERT(vam != NULL);
- ASSERT(eid_table != NULL);
+ ASSERT (vam != NULL);
+ ASSERT (eid_table != NULL);
- if (ret) {
- *ret = 0;
+ if (ret)
+ {
+ *ret = 0;
}
- switch (eid_table->eid_type)
+ switch (eid_table->eid_type)
{
- case 0:
- case 1:
- format_eid = (eid_table->eid_type ? format_ip6_address :
- format_ip4_address);
- str = format(0, "[%d] %U/%d",
- clib_net_to_host_u32 (eid_table->vni),
- format_eid, eid_table->eid, eid_table->eid_prefix_len);
- break;
- case 2:
- str = format(0, "[%d] %U",
- clib_net_to_host_u32 (eid_table->vni),
- format_ethernet_address, eid_table->eid);
- break;
- default:
- errmsg ("unknown EID type %d!", eid_table->eid_type);
- if (ret) {
- *ret = -99;
- }
- return 0;
+ case 0:
+ case 1:
+ format_eid = (eid_table->eid_type ? format_ip6_address :
+ format_ip4_address);
+ str = format (0, "[%d] %U/%d",
+ clib_net_to_host_u32 (eid_table->vni),
+ format_eid, eid_table->eid, eid_table->eid_prefix_len);
+ break;
+ case 2:
+ str = format (0, "[%d] %U",
+ clib_net_to_host_u32 (eid_table->vni),
+ format_ethernet_address, eid_table->eid);
+ break;
+ default:
+ errmsg ("unknown EID type %d!", eid_table->eid_type);
+ if (ret)
+ {
+ *ret = -99;
+ }
+ return 0;
}
- return str;
+ return str;
}
static inline u8 *
-format_locator_set_for_eid_table(vat_main_t * vam, u8 * str,
- eid_table_t * eid_table)
+format_locator_set_for_eid_table (vat_main_t * vam, u8 * str,
+ eid_table_t * eid_table)
{
- locator_set_msg_t * ls = 0;
+ locator_set_msg_t *ls = 0;
- ASSERT(vam != NULL);
- ASSERT(eid_table != NULL);
+ ASSERT (vam != NULL);
+ ASSERT (eid_table != NULL);
- if (eid_table->is_local) {
- vec_foreach (ls, vam->locator_set_msg) {
- if (ls->locator_set_index == eid_table->locator_set_index) {
- str = format(0, "local(%s)", ls->locator_set_name);
- return str;
- }
- }
+ if (eid_table->is_local)
+ {
+ vec_foreach (ls, vam->locator_set_msg)
+ {
+ if (ls->locator_set_index == eid_table->locator_set_index)
+ {
+ str = format (0, "local(%s)", ls->locator_set_name);
+ return str;
+ }
+ }
- str = format(0, "local(N/A)");
- } else {
- str = format(0, "remote");
+ str = format (0, "local(N/A)");
+ }
+ else
+ {
+ str = format (0, "remote");
}
- return str;
+ return str;
}
static inline u8 *
-format_locator_for_eid_table(vat_main_t * vam, u8 * str,
- eid_table_t * eid_table)
+format_locator_for_eid_table (vat_main_t * vam, u8 * str,
+ eid_table_t * eid_table)
{
- locator_msg_t * loc = 0;
- int first_line = 1;
+ locator_msg_t *loc = 0;
+ int first_line = 1;
- ASSERT(vam != NULL);
- ASSERT(eid_table != NULL);
+ ASSERT (vam != NULL);
+ ASSERT (eid_table != NULL);
- vec_foreach(loc, vam->locator_msg) {
- if (!first_line) {
- if (loc->local) {
- str = format(str, "%-55s%-d\n", " ", loc->sw_if_index);
- } else {
- str = format(str, "%=55s%-U\n", " ",
- loc->is_ipv6 ? format_ip6_address :
- format_ip4_address,
- loc->ip_address);
- }
+ vec_foreach (loc, vam->locator_msg)
+ {
+ if (!first_line)
+ {
+ if (loc->local)
+ {
+ str = format (str, "%-55s%-d\n", " ", loc->sw_if_index);
+ }
+ else
+ {
+ str = format (str, "%=55s%-U\n", " ",
+ loc->is_ipv6 ? format_ip6_address :
+ format_ip4_address, loc->ip_address);
+ }
- continue;
- }
+ continue;
+ }
- if (loc->local) {
- str = format(str, "%-30d%-20u%-u\n", loc->sw_if_index,
- eid_table->ttl, eid_table->authoritative);
- } else {
- str = format(str, "%-30U%-20u%-u\n",
- loc->is_ipv6 ? format_ip6_address :
- format_ip4_address,
- loc->ip_address, eid_table->ttl,
- eid_table->authoritative);
- }
- first_line = 0;
- }
+ if (loc->local)
+ {
+ str = format (str, "%-30d%-20u%-u\n", loc->sw_if_index,
+ eid_table->ttl, eid_table->authoritative);
+ }
+ else
+ {
+ str = format (str, "%-30U%-20u%-u\n",
+ loc->is_ipv6 ? format_ip6_address :
+ format_ip4_address,
+ loc->ip_address, eid_table->ttl,
+ eid_table->authoritative);
+ }
+ first_line = 0;
+ }
- return str;
+ return str;
}
static int
-print_lisp_eid_table_dump(vat_main_t * vam)
+print_lisp_eid_table_dump (vat_main_t * vam)
{
- eid_table_t * eid_table = 0;
- u8 * tmp_str = 0, * tmp_str2 = 0;
- int ret = 0;
+ eid_table_t *eid_table = 0;
+ u8 *tmp_str = 0, *tmp_str2 = 0;
+ int ret = 0;
- ASSERT(vam != NULL);
+ ASSERT (vam != NULL);
- ret = get_locator_set(vam);
- if (ret) {
- vec_free(vam->eid_tables);
- return ret;
+ ret = get_locator_set (vam);
+ if (ret)
+ {
+ vec_free (vam->eid_tables);
+ return ret;
}
- fformat(vam->ofp, "%-35s%-20s%-30s%-20s%-s\n", "EID", "type", "locators",
- "ttl", "authoritative");
+ fformat (vam->ofp, "%-35s%-20s%-30s%-20s%-s\n", "EID", "type", "locators",
+ "ttl", "authoritative");
- vec_foreach(eid_table, vam->eid_tables) {
- ret = lisp_locator_dump_send_msg(vam, eid_table->locator_set_index, 0);
- if (ret) {
- vec_free(vam->locator_msg);
- clean_locator_set_message(vam);
- vec_free(vam->eid_tables);
- return ret;
- }
+ vec_foreach (eid_table, vam->eid_tables)
+ {
+ ret = lisp_locator_dump_send_msg (vam, eid_table->locator_set_index, 0);
+ if (ret)
+ {
+ vec_free (vam->locator_msg);
+ clean_locator_set_message (vam);
+ vec_free (vam->eid_tables);
+ return ret;
+ }
- tmp_str2 = format_eid_for_eid_table(vam, tmp_str2, eid_table, &ret);
- if (ret) {
- vec_free(vam->locator_msg);
- clean_locator_set_message(vam);
- vec_free(vam->eid_tables);
- return ret;
- }
+ tmp_str2 = format_eid_for_eid_table (vam, tmp_str2, eid_table, &ret);
+ if (ret)
+ {
+ vec_free (vam->locator_msg);
+ clean_locator_set_message (vam);
+ vec_free (vam->eid_tables);
+ return ret;
+ }
- tmp_str = format(0, "%-35s", tmp_str2);
- vec_free(tmp_str2);
+ tmp_str = format (0, "%-35s", tmp_str2);
+ vec_free (tmp_str2);
- tmp_str2 = format_locator_set_for_eid_table(vam, tmp_str2, eid_table);
- tmp_str = format(tmp_str, "%-20s", tmp_str2);
- vec_free(tmp_str2);
+ tmp_str2 = format_locator_set_for_eid_table (vam, tmp_str2, eid_table);
+ tmp_str = format (tmp_str, "%-20s", tmp_str2);
+ vec_free (tmp_str2);
- tmp_str2 = format_locator_for_eid_table(vam, tmp_str2, eid_table);
- tmp_str = format(tmp_str, "%-s", tmp_str2);
- vec_free(tmp_str2);
+ tmp_str2 = format_locator_for_eid_table (vam, tmp_str2, eid_table);
+ tmp_str = format (tmp_str, "%-s", tmp_str2);
+ vec_free (tmp_str2);
- fformat(vam->ofp, "%s", tmp_str);
- vec_free(tmp_str);
- vec_free(vam->locator_msg);
- }
+ fformat (vam->ofp, "%s", tmp_str);
+ vec_free (tmp_str);
+ vec_free (vam->locator_msg);
+ }
- clean_locator_set_message(vam);
- vec_free(vam->eid_tables);
+ clean_locator_set_message (vam);
+ vec_free (vam->eid_tables);
- return ret;
+ return ret;
}
static inline void
-json_locator_set_for_eid_table(vat_main_t * vam, vat_json_node_t * node,
- eid_table_t * eid_table)
+json_locator_set_for_eid_table (vat_main_t * vam, vat_json_node_t * node,
+ eid_table_t * eid_table)
{
- locator_set_msg_t * ls = 0;
- u8 * s = 0;
+ locator_set_msg_t *ls = 0;
+ u8 *s = 0;
- ASSERT(vam != NULL);
- ASSERT(node != NULL);
- ASSERT(eid_table != NULL);
+ ASSERT (vam != NULL);
+ ASSERT (node != NULL);
+ ASSERT (eid_table != NULL);
- if (eid_table->is_local) {
- vec_foreach (ls, vam->locator_set_msg) {
- if (ls->locator_set_index == eid_table->locator_set_index) {
- vat_json_object_add_string_copy(node, "locator-set",
- ls->locator_set_name);
- return;
- }
- }
+ if (eid_table->is_local)
+ {
+ vec_foreach (ls, vam->locator_set_msg)
+ {
+ if (ls->locator_set_index == eid_table->locator_set_index)
+ {
+ vat_json_object_add_string_copy (node, "locator-set",
+ ls->locator_set_name);
+ return;
+ }
+ }
- s = format(0, "N/A");
- vec_add1(s, 0);
- vat_json_object_add_string_copy(node, "locator-set", s);
- vec_free(s);
- } else {
- s = format(0, "remote");
- vec_add1(s, 0);
- vat_json_object_add_string_copy(node, "locator-set", s);
- vec_free(s);
+ s = format (0, "N/A");
+ vec_add1 (s, 0);
+ vat_json_object_add_string_copy (node, "locator-set", s);
+ vec_free (s);
+ }
+ else
+ {
+ s = format (0, "remote");
+ vec_add1 (s, 0);
+ vat_json_object_add_string_copy (node, "locator-set", s);
+ vec_free (s);
}
}
static inline int
-json_eid_for_eid_table(vat_main_t * vam, vat_json_node_t * node,
- eid_table_t * eid_table)
+json_eid_for_eid_table (vat_main_t * vam, vat_json_node_t * node,
+ eid_table_t * eid_table)
{
- u8 * s = 0;
- struct in6_addr ip6;
- struct in_addr ip4;
+ u8 *s = 0;
+ struct in6_addr ip6;
+ struct in_addr ip4;
- ASSERT(vam != NULL);
- ASSERT(node != NULL);
- ASSERT(eid_table != NULL);
+ ASSERT (vam != NULL);
+ ASSERT (node != NULL);
+ ASSERT (eid_table != NULL);
- switch (eid_table->eid_type)
+ switch (eid_table->eid_type)
{
- case 0:
- clib_memcpy(&ip4, eid_table->eid, sizeof(ip4));
- vat_json_object_add_ip4(node, "eid", ip4);
- vat_json_object_add_uint(node, "eid-prefix-len",
- eid_table->eid_prefix_len);
- break;
- case 1:
- clib_memcpy(&ip6, eid_table->eid, sizeof(ip6));
- vat_json_object_add_ip6(node, "eid", ip6);
- vat_json_object_add_uint(node, "eid-prefix-len",
- eid_table->eid_prefix_len);
- break;
- case 2:
- s = format (0, "%U", format_ethernet_address, eid_table->eid);
- vec_add1(s, 0);
- vat_json_object_add_string_copy(node, "eid", s);
- vec_free(s);
- break;
- default:
- errmsg ("unknown EID type %d!", eid_table->eid_type);
- return -99;
+ case 0:
+ clib_memcpy (&ip4, eid_table->eid, sizeof (ip4));
+ vat_json_object_add_ip4 (node, "eid", ip4);
+ vat_json_object_add_uint (node, "eid-prefix-len",
+ eid_table->eid_prefix_len);
+ break;
+ case 1:
+ clib_memcpy (&ip6, eid_table->eid, sizeof (ip6));
+ vat_json_object_add_ip6 (node, "eid", ip6);
+ vat_json_object_add_uint (node, "eid-prefix-len",
+ eid_table->eid_prefix_len);
+ break;
+ case 2:
+ s = format (0, "%U", format_ethernet_address, eid_table->eid);
+ vec_add1 (s, 0);
+ vat_json_object_add_string_copy (node, "eid", s);
+ vec_free (s);
+ break;
+ default:
+ errmsg ("unknown EID type %d!", eid_table->eid_type);
+ return -99;
}
- return 0;
+ return 0;
}
static inline void
-json_locator_for_eid_table(vat_main_t * vam, vat_json_node_t * node,
- eid_table_t * eid_table)
+json_locator_for_eid_table (vat_main_t * vam, vat_json_node_t * node,
+ eid_table_t * eid_table)
{
- locator_msg_t * loc = 0;
- vat_json_node_t * locator_array = 0;
- vat_json_node_t * locator = 0;
- struct in6_addr ip6;
- struct in_addr ip4;
+ locator_msg_t *loc = 0;
+ vat_json_node_t *locator_array = 0;
+ vat_json_node_t *locator = 0;
+ struct in6_addr ip6;
+ struct in_addr ip4;
- ASSERT(vam != NULL);
- ASSERT(node != NULL);
- ASSERT(eid_table != NULL);
+ ASSERT (vam != NULL);
+ ASSERT (node != NULL);
+ ASSERT (eid_table != NULL);
- locator_array = vat_json_object_add_list(node, "locator");
- vec_foreach(loc, vam->locator_msg) {
- locator = vat_json_array_add(locator_array);
- vat_json_init_object(locator);
- if (loc->local) {
- vat_json_object_add_uint(locator, "locator-index",
- loc->sw_if_index);
- } else {
- if (loc->is_ipv6) {
- clib_memcpy(&ip6, loc->ip_address, sizeof(ip6));
- vat_json_object_add_ip6(locator, "locator", ip6);
- } else {
- clib_memcpy(&ip4, loc->ip_address, sizeof(ip4));
- vat_json_object_add_ip4(locator, "locator", ip4);
- }
- }
- }
-}
-
-static int
-json_lisp_eid_table_dump(vat_main_t * vam)
-{
- eid_table_t * eid_table;
- vat_json_node_t * node = 0;
- int ret = 0;
-
- ASSERT(vam != NULL);
-
- ret = get_locator_set(vam);
- if (ret) {
- vec_free(vam->eid_tables);
- return ret;
- }
-
- if (!vec_len(vam->eid_tables)) {
- /* just print [] */
- vat_json_init_array(&vam->json_tree);
- vat_json_print(vam->ofp, &vam->json_tree);
- vam->json_tree.type = VAT_JSON_NONE;
- return ret;
- }
-
- if (VAT_JSON_ARRAY != vam->json_tree.type) {
- ASSERT(VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array(&vam->json_tree);
- }
-
- vec_foreach(eid_table, vam->eid_tables) {
- ret = lisp_locator_dump_send_msg(vam, eid_table->locator_set_index, 0);
- if (ret) {
- vec_free(vam->locator_msg);
- vec_free(vam->eid_tables);
- clean_locator_set_message(vam);
- vat_json_free(&vam->json_tree);
- vam->json_tree.type = VAT_JSON_NONE;
- return ret;
- }
-
- node = vat_json_array_add(&vam->json_tree);
- vat_json_init_object(node);
-
- vat_json_object_add_uint(node, "vni", eid_table->vni);
-
- json_locator_set_for_eid_table(vam, node, eid_table);
- ret = json_eid_for_eid_table(vam, node, eid_table);
- if (ret) {
- vec_free(vam->locator_msg);
- vec_free(vam->eid_tables);
- clean_locator_set_message(vam);
- vat_json_free(&vam->json_tree);
- vam->json_tree.type = VAT_JSON_NONE;
- return ret;
- }
-
- json_locator_for_eid_table(vam, node, eid_table);
-
- vat_json_object_add_uint(node, "ttl", eid_table->ttl);
- vat_json_object_add_uint(node, "authoritative",
- eid_table->authoritative);
-
- vec_free(vam->locator_msg);
- }
-
- vat_json_print(vam->ofp, &vam->json_tree);
- vat_json_free(&vam->json_tree);
- vam->json_tree.type = VAT_JSON_NONE;
-
- clean_locator_set_message(vam);
- vec_free(vam->eid_tables);
-
- return ret;
-}
-
-static int
-api_lisp_eid_table_dump(vat_main_t *vam)
-{
- unformat_input_t * i = vam->input;
- vl_api_lisp_eid_table_dump_t *mp;
- f64 timeout = ~0;
- struct in_addr ip4;
- struct in6_addr ip6;
- u8 mac[6];
- u8 eid_type = ~0, eid_set = 0;
- u32 prefix_length = ~0, t, vni = 0;
- u8 filter = 0;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "eid %U/%d", unformat_ip4_address, &ip4, &t)) {
- eid_set = 1;
- eid_type = 0;
- prefix_length = t;
- } else if (unformat (i, "eid %U/%d", unformat_ip6_address, &ip6, &t)) {
- eid_set = 1;
- eid_type = 1;
- prefix_length = t;
- } else if (unformat (i, "eid %U", unformat_ethernet_address, mac)) {
- eid_set = 1;
- eid_type = 2;
- } else if (unformat (i, "vni %d", &t)) {
- vni = t;
- } else if (unformat (i, "local")) {
- filter = 1;
- } else if (unformat (i, "remote")) {
- filter = 2;
- } else {
- errmsg ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
- }
-
- M(LISP_EID_TABLE_DUMP, lisp_eid_table_dump);
-
- mp->filter = filter;
- if (eid_set) {
- mp->eid_set = 1;
- mp->vni = htonl (vni);
- mp->eid_type = eid_type;
- switch (eid_type) {
- case 0:
- mp->prefix_length = prefix_length;
- clib_memcpy (mp->eid, &ip4, sizeof (ip4));
- break;
- case 1:
- mp->prefix_length = prefix_length;
- clib_memcpy (mp->eid, &ip6, sizeof (ip6));
- break;
- case 2:
- clib_memcpy (mp->eid, mac, sizeof (mac));
- break;
- default:
- errmsg ("unknown EID type %d!", eid_type);
- return -99;
- }
- }
-
- vam->noprint_msg = 1;
-
- /* send it... */
- S;
+ locator_array = vat_json_object_add_list (node, "locator");
+ vec_foreach (loc, vam->locator_msg)
+ {
+ locator = vat_json_array_add (locator_array);
+ vat_json_init_object (locator);
+ if (loc->local)
+ {
+ vat_json_object_add_uint (locator, "locator-index", loc->sw_if_index);
+ }
+ else
+ {
+ if (loc->is_ipv6)
+ {
+ clib_memcpy (&ip6, loc->ip_address, sizeof (ip6));
+ vat_json_object_add_ip6 (locator, "locator", ip6);
+ }
+ else
+ {
+ clib_memcpy (&ip4, loc->ip_address, sizeof (ip4));
+ vat_json_object_add_ip4 (locator, "locator", ip4);
+ }
+ }
+ }
+}
+
+static int
+json_lisp_eid_table_dump (vat_main_t * vam)
+{
+ eid_table_t *eid_table;
+ vat_json_node_t *node = 0;
+ int ret = 0;
+
+ ASSERT (vam != NULL);
- /* Use a control ping for synchronization */
+ ret = get_locator_set (vam);
+ if (ret)
{
- vl_api_noprint_control_ping_t * mp;
- M(NOPRINT_CONTROL_PING, noprint_control_ping);
- S;
+ vec_free (vam->eid_tables);
+ return ret;
}
- /* Wait for a reply... */
- W_L({
- if (vam->noprint_msg) {
- if (!vam->json_output) {
- vam->retval = print_lisp_eid_table_dump(vam);
- } else {
- vam->retval = json_lisp_eid_table_dump(vam);
- }
+ if (!vec_len (vam->eid_tables))
+ {
+ /* just print [] */
+ vat_json_init_array (&vam->json_tree);
+ vat_json_print (vam->ofp, &vam->json_tree);
+ vam->json_tree.type = VAT_JSON_NONE;
+ return ret;
+ }
+
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
+ }
+
+ vec_foreach (eid_table, vam->eid_tables)
+ {
+ ret = lisp_locator_dump_send_msg (vam, eid_table->locator_set_index, 0);
+ if (ret)
+ {
+ vec_free (vam->locator_msg);
+ vec_free (vam->eid_tables);
+ clean_locator_set_message (vam);
+ vat_json_free (&vam->json_tree);
+ vam->json_tree.type = VAT_JSON_NONE;
+ return ret;
}
- vam->noprint_msg = 0;
- });
+ node = vat_json_array_add (&vam->json_tree);
+ vat_json_init_object (node);
- /* NOTREACHED */
- return 0;
+ vat_json_object_add_uint (node, "vni", eid_table->vni);
+
+ json_locator_set_for_eid_table (vam, node, eid_table);
+ ret = json_eid_for_eid_table (vam, node, eid_table);
+ if (ret)
+ {
+ vec_free (vam->locator_msg);
+ vec_free (vam->eid_tables);
+ clean_locator_set_message (vam);
+ vat_json_free (&vam->json_tree);
+ vam->json_tree.type = VAT_JSON_NONE;
+ return ret;
+ }
+
+ json_locator_for_eid_table (vam, node, eid_table);
+
+ vat_json_object_add_uint (node, "ttl", eid_table->ttl);
+ vat_json_object_add_uint (node, "authoritative",
+ eid_table->authoritative);
+
+ vec_free (vam->locator_msg);
+ }
+
+ vat_json_print (vam->ofp, &vam->json_tree);
+ vat_json_free (&vam->json_tree);
+ vam->json_tree.type = VAT_JSON_NONE;
+
+ clean_locator_set_message (vam);
+ vec_free (vam->eid_tables);
+
+ return ret;
}
static int
-api_lisp_gpe_tunnel_dump(vat_main_t *vam)
+api_lisp_eid_table_dump (vat_main_t * vam)
{
- vl_api_lisp_gpe_tunnel_dump_t *mp;
- f64 timeout = ~0;
+ unformat_input_t *i = vam->input;
+ vl_api_lisp_eid_table_dump_t *mp;
+ f64 timeout = ~0;
+ struct in_addr ip4;
+ struct in6_addr ip6;
+ u8 mac[6];
+ u8 eid_type = ~0, eid_set = 0;
+ u32 prefix_length = ~0, t, vni = 0;
+ u8 filter = 0;
- if (!vam->json_output) {
- fformat(vam->ofp, "%=20s%=30s%=16s%=16s%=16s%=16s"
- "%=16s%=16s%=16s%=16s%=16s\n",
- "Tunel", "Source", "Destination", "Fib encap", "Fib decap",
- "Decap next", "Lisp version", "Flags", "Next protocol",
- "ver_res", "res", "iid");
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "eid %U/%d", unformat_ip4_address, &ip4, &t))
+ {
+ eid_set = 1;
+ eid_type = 0;
+ prefix_length = t;
+ }
+ else if (unformat (i, "eid %U/%d", unformat_ip6_address, &ip6, &t))
+ {
+ eid_set = 1;
+ eid_type = 1;
+ prefix_length = t;
+ }
+ else if (unformat (i, "eid %U", unformat_ethernet_address, mac))
+ {
+ eid_set = 1;
+ eid_type = 2;
+ }
+ else if (unformat (i, "vni %d", &t))
+ {
+ vni = t;
+ }
+ else if (unformat (i, "local"))
+ {
+ filter = 1;
+ }
+ else if (unformat (i, "remote"))
+ {
+ filter = 2;
+ }
+ else
+ {
+ errmsg ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- M(LISP_GPE_TUNNEL_DUMP, lisp_gpe_tunnel_dump);
- /* send it... */
- S;
+ M (LISP_EID_TABLE_DUMP, lisp_eid_table_dump);
- /* Use a control ping for synchronization */
+ mp->filter = filter;
+ if (eid_set)
{
- vl_api_control_ping_t * mp;
- M(CONTROL_PING, control_ping);
- S;
+ mp->eid_set = 1;
+ mp->vni = htonl (vni);
+ mp->eid_type = eid_type;
+ switch (eid_type)
+ {
+ case 0:
+ mp->prefix_length = prefix_length;
+ clib_memcpy (mp->eid, &ip4, sizeof (ip4));
+ break;
+ case 1:
+ mp->prefix_length = prefix_length;
+ clib_memcpy (mp->eid, &ip6, sizeof (ip6));
+ break;
+ case 2:
+ clib_memcpy (mp->eid, mac, sizeof (mac));
+ break;
+ default:
+ errmsg ("unknown EID type %d!", eid_type);
+ return -99;
+ }
}
- /* Wait for a reply... */
- W;
- /* NOTREACHED */
- return 0;
+ vam->noprint_msg = 1;
+
+ /* send it... */
+ S;
+
+ /* Use a control ping for synchronization */
+ {
+ vl_api_noprint_control_ping_t *mp;
+ M (NOPRINT_CONTROL_PING, noprint_control_ping);
+ S;
+ }
+
+ /* Wait for a reply... */
+ /* *INDENT-OFF* */
+ W_L
+ ({
+ if (vam->noprint_msg)
+ {
+ if (!vam->json_output)
+ {
+ vam->retval = print_lisp_eid_table_dump(vam);
+ }
+ else
+ {
+ vam->retval = json_lisp_eid_table_dump(vam);
+ }
+ }
+ vam->noprint_msg = 0;
+ });
+ /* *INDENT-ON* */
+
+ /* NOTREACHED */
+ return 0;
}
static int
-api_lisp_map_resolver_dump(vat_main_t *vam)
+api_lisp_gpe_tunnel_dump (vat_main_t * vam)
{
- vl_api_lisp_map_resolver_dump_t *mp;
- f64 timeout = ~0;
+ vl_api_lisp_gpe_tunnel_dump_t *mp;
+ f64 timeout = ~0;
- if (!vam->json_output) {
- fformat(vam->ofp, "%=20s\n",
- "Map resolver");
+ if (!vam->json_output)
+ {
+ fformat (vam->ofp, "%=20s%=30s%=16s%=16s%=16s%=16s"
+ "%=16s%=16s%=16s%=16s%=16s\n",
+ "Tunel", "Source", "Destination", "Fib encap", "Fib decap",
+ "Decap next", "Lisp version", "Flags", "Next protocol",
+ "ver_res", "res", "iid");
}
- M(LISP_MAP_RESOLVER_DUMP, lisp_map_resolver_dump);
- /* send it... */
+ M (LISP_GPE_TUNNEL_DUMP, lisp_gpe_tunnel_dump);
+ /* send it... */
+ S;
+
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
S;
+ }
+ /* Wait for a reply... */
+ W;
+
+ /* NOTREACHED */
+ return 0;
+}
+
+static int
+api_lisp_map_resolver_dump (vat_main_t * vam)
+{
+ vl_api_lisp_map_resolver_dump_t *mp;
+ f64 timeout = ~0;
- /* Use a control ping for synchronization */
+ if (!vam->json_output)
{
- vl_api_control_ping_t * mp;
- M(CONTROL_PING, control_ping);
- S;
+ fformat (vam->ofp, "%=20s\n", "Map resolver");
}
- /* Wait for a reply... */
- W;
- /* NOTREACHED */
- return 0;
+ M (LISP_MAP_RESOLVER_DUMP, lisp_map_resolver_dump);
+ /* send it... */
+ S;
+
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
+ S;
+ }
+ /* Wait for a reply... */
+ W;
+
+ /* NOTREACHED */
+ return 0;
}
static int
-api_show_lisp_status(vat_main_t *vam)
+api_show_lisp_status (vat_main_t * vam)
{
- vl_api_show_lisp_status_t *mp;
- f64 timeout = ~0;
+ vl_api_show_lisp_status_t *mp;
+ f64 timeout = ~0;
- if (!vam->json_output) {
- fformat(vam->ofp, "%-20s%-16s\n",
- "lisp status", "locator-set");
+ if (!vam->json_output)
+ {
+ fformat (vam->ofp, "%-20s%-16s\n", "lisp status", "locator-set");
}
- M(SHOW_LISP_STATUS, show_lisp_status);
- /* send it... */
- S;
- /* Wait for a reply... */
- W;
+ M (SHOW_LISP_STATUS, show_lisp_status);
+ /* send it... */
+ S;
+ /* Wait for a reply... */
+ W;
- /* NOTREACHED */
- return 0;
+ /* NOTREACHED */
+ return 0;
}
static int
-api_lisp_get_map_request_itr_rlocs(vat_main_t *vam)
+api_lisp_get_map_request_itr_rlocs (vat_main_t * vam)
{
- vl_api_lisp_get_map_request_itr_rlocs_t *mp;
- f64 timeout = ~0;
+ vl_api_lisp_get_map_request_itr_rlocs_t *mp;
+ f64 timeout = ~0;
- if (!vam->json_output) {
- fformat(vam->ofp, "%=20s\n",
- "itr-rlocs:");
+ if (!vam->json_output)
+ {
+ fformat (vam->ofp, "%=20s\n", "itr-rlocs:");
}
- M(LISP_GET_MAP_REQUEST_ITR_RLOCS, lisp_get_map_request_itr_rlocs);
- /* send it... */
- S;
- /* Wait for a reply... */
- W;
+ M (LISP_GET_MAP_REQUEST_ITR_RLOCS, lisp_get_map_request_itr_rlocs);
+ /* send it... */
+ S;
+ /* Wait for a reply... */
+ W;
- /* NOTREACHED */
- return 0;
+ /* NOTREACHED */
+ return 0;
}
static int
api_af_packet_create (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_af_packet_create_t * mp;
- f64 timeout;
- u8 * host_if_name = 0;
- u8 hw_addr[6];
- u8 random_hw_addr = 1;
+ unformat_input_t *i = vam->input;
+ vl_api_af_packet_create_t *mp;
+ f64 timeout;
+ u8 *host_if_name = 0;
+ u8 hw_addr[6];
+ u8 random_hw_addr = 1;
- memset (hw_addr, 0, sizeof (hw_addr));
+ memset (hw_addr, 0, sizeof (hw_addr));
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "name %s", &host_if_name))
- vec_add1 (host_if_name, 0);
- else if (unformat (i, "hw_addr %U", unformat_ethernet_address, hw_addr))
- random_hw_addr = 0;
- else
- break;
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "name %s", &host_if_name))
+ vec_add1 (host_if_name, 0);
+ else if (unformat (i, "hw_addr %U", unformat_ethernet_address, hw_addr))
+ random_hw_addr = 0;
+ else
+ break;
}
- if (!vec_len (host_if_name)) {
- errmsg ("host-interface name must be specified");
- return -99;
+ if (!vec_len (host_if_name))
+ {
+ errmsg ("host-interface name must be specified");
+ return -99;
}
- if (vec_len (host_if_name) > 64) {
- errmsg ("host-interface name too long");
- return -99;
+ if (vec_len (host_if_name) > 64)
+ {
+ errmsg ("host-interface name too long");
+ return -99;
}
- M(AF_PACKET_CREATE, af_packet_create);
+ M (AF_PACKET_CREATE, af_packet_create);
- clib_memcpy (mp->host_if_name, host_if_name, vec_len (host_if_name));
- clib_memcpy (mp->hw_addr, hw_addr, 6);
- mp->use_random_hw_addr = random_hw_addr;
- vec_free (host_if_name);
+ clib_memcpy (mp->host_if_name, host_if_name, vec_len (host_if_name));
+ clib_memcpy (mp->hw_addr, hw_addr, 6);
+ mp->use_random_hw_addr = random_hw_addr;
+ vec_free (host_if_name);
- S; W2(fprintf(vam->ofp," new sw_if_index = %d ", vam->sw_if_index));
- /* NOTREACHED */
- return 0;
+ S;
+ W2 (fprintf (vam->ofp, " new sw_if_index = %d ", vam->sw_if_index));
+ /* NOTREACHED */
+ return 0;
}
static int
api_af_packet_delete (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_af_packet_delete_t * mp;
- f64 timeout;
- u8 * host_if_name = 0;
+ unformat_input_t *i = vam->input;
+ vl_api_af_packet_delete_t *mp;
+ f64 timeout;
+ u8 *host_if_name = 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "name %s", &host_if_name))
- vec_add1 (host_if_name, 0);
- else
- break;
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "name %s", &host_if_name))
+ vec_add1 (host_if_name, 0);
+ else
+ break;
}
- if (!vec_len (host_if_name)) {
- errmsg ("host-interface name must be specified");
- return -99;
+ if (!vec_len (host_if_name))
+ {
+ errmsg ("host-interface name must be specified");
+ return -99;
}
- if (vec_len (host_if_name) > 64) {
- errmsg ("host-interface name too long");
- return -99;
+ if (vec_len (host_if_name) > 64)
+ {
+ errmsg ("host-interface name too long");
+ return -99;
}
- M(AF_PACKET_DELETE, af_packet_delete);
+ M (AF_PACKET_DELETE, af_packet_delete);
- clib_memcpy (mp->host_if_name, host_if_name, vec_len (host_if_name));
- vec_free (host_if_name);
+ clib_memcpy (mp->host_if_name, host_if_name, vec_len (host_if_name));
+ vec_free (host_if_name);
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
static int
api_policer_add_del (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_policer_add_del_t * mp;
- f64 timeout;
- u8 is_add = 1;
- u8 * name = 0;
- u32 cir = 0;
- u32 eir = 0;
- u64 cb = 0;
- u64 eb = 0;
- u8 rate_type = 0;
- u8 round_type = 0;
- u8 type = 0;
- u8 color_aware = 0;
- sse2_qos_pol_action_params_st conform_action, exceed_action, violate_action;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "del"))
- is_add = 0;
- else if (unformat (i, "name %s", &name))
- vec_add1 (name, 0);
- else if (unformat (i, "cir %u", &cir))
- ;
- else if (unformat (i, "eir %u", &eir))
- ;
- else if (unformat (i, "cb %u", &cb))
- ;
- else if (unformat (i, "eb %u", &eb))
- ;
- else if (unformat (i, "rate_type %U", unformat_policer_rate_type,
- &rate_type))
- ;
- else if (unformat (i, "round_type %U", unformat_policer_round_type,
- &round_type))
- ;
- else if (unformat (i, "type %U", unformat_policer_type, &type))
- ;
- else if (unformat (i, "conform_action %U", unformat_policer_action_type,
- &conform_action))
- ;
- else if (unformat (i, "exceed_action %U", unformat_policer_action_type,
- &exceed_action))
- ;
- else if (unformat (i, "violate_action %U", unformat_policer_action_type,
- &violate_action))
- ;
- else if (unformat (i, "color-aware"))
- color_aware = 1;
- else
- break;
+ unformat_input_t *i = vam->input;
+ vl_api_policer_add_del_t *mp;
+ f64 timeout;
+ u8 is_add = 1;
+ u8 *name = 0;
+ u32 cir = 0;
+ u32 eir = 0;
+ u64 cb = 0;
+ u64 eb = 0;
+ u8 rate_type = 0;
+ u8 round_type = 0;
+ u8 type = 0;
+ u8 color_aware = 0;
+ sse2_qos_pol_action_params_st conform_action, exceed_action, violate_action;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "del"))
+ is_add = 0;
+ else if (unformat (i, "name %s", &name))
+ vec_add1 (name, 0);
+ else if (unformat (i, "cir %u", &cir))
+ ;
+ else if (unformat (i, "eir %u", &eir))
+ ;
+ else if (unformat (i, "cb %u", &cb))
+ ;
+ else if (unformat (i, "eb %u", &eb))
+ ;
+ else if (unformat (i, "rate_type %U", unformat_policer_rate_type,
+ &rate_type))
+ ;
+ else if (unformat (i, "round_type %U", unformat_policer_round_type,
+ &round_type))
+ ;
+ else if (unformat (i, "type %U", unformat_policer_type, &type))
+ ;
+ else if (unformat (i, "conform_action %U", unformat_policer_action_type,
+ &conform_action))
+ ;
+ else if (unformat (i, "exceed_action %U", unformat_policer_action_type,
+ &exceed_action))
+ ;
+ else if (unformat (i, "violate_action %U", unformat_policer_action_type,
+ &violate_action))
+ ;
+ else if (unformat (i, "color-aware"))
+ color_aware = 1;
+ else
+ break;
}
- if (!vec_len (name)) {
- errmsg ("policer name must be specified");
- return -99;
+ if (!vec_len (name))
+ {
+ errmsg ("policer name must be specified");
+ return -99;
}
- if (vec_len (name) > 64) {
- errmsg ("policer name too long");
- return -99;
+ if (vec_len (name) > 64)
+ {
+ errmsg ("policer name too long");
+ return -99;
}
- M(POLICER_ADD_DEL, policer_add_del);
+ M (POLICER_ADD_DEL, policer_add_del);
- clib_memcpy (mp->name, name, vec_len (name));
- vec_free (name);
- mp->is_add = is_add;
- mp->cir = cir;
- mp->eir = eir;
- mp->cb = cb;
- mp->eb = eb;
- mp->rate_type = rate_type;
- mp->round_type = round_type;
- mp->type = type;
- mp->conform_action_type = conform_action.action_type;
- mp->conform_dscp = conform_action.dscp;
- mp->exceed_action_type = exceed_action.action_type;
- mp->exceed_dscp = exceed_action.dscp;
- mp->violate_action_type = violate_action.action_type;
- mp->violate_dscp = violate_action.dscp;
- mp->color_aware = color_aware;
+ clib_memcpy (mp->name, name, vec_len (name));
+ vec_free (name);
+ mp->is_add = is_add;
+ mp->cir = cir;
+ mp->eir = eir;
+ mp->cb = cb;
+ mp->eb = eb;
+ mp->rate_type = rate_type;
+ mp->round_type = round_type;
+ mp->type = type;
+ mp->conform_action_type = conform_action.action_type;
+ mp->conform_dscp = conform_action.dscp;
+ mp->exceed_action_type = exceed_action.action_type;
+ mp->exceed_dscp = exceed_action.dscp;
+ mp->violate_action_type = violate_action.action_type;
+ mp->violate_dscp = violate_action.dscp;
+ mp->color_aware = color_aware;
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
static int
-api_policer_dump(vat_main_t *vam)
+api_policer_dump (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_policer_dump_t *mp;
- f64 timeout = ~0;
- u8 *match_name = 0;
- u8 match_name_valid = 0;
+ unformat_input_t *i = vam->input;
+ vl_api_policer_dump_t *mp;
+ f64 timeout = ~0;
+ u8 *match_name = 0;
+ u8 match_name_valid = 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "name %s", &match_name)) {
- vec_add1 (match_name, 0);
- match_name_valid = 1;
- } else
- break;
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "name %s", &match_name))
+ {
+ vec_add1 (match_name, 0);
+ match_name_valid = 1;
+ }
+ else
+ break;
}
- M(POLICER_DUMP, policer_dump);
- mp->match_name_valid = match_name_valid;
- clib_memcpy (mp->match_name, match_name, vec_len (match_name));
- vec_free (match_name);
- /* send it... */
- S;
+ M (POLICER_DUMP, policer_dump);
+ mp->match_name_valid = match_name_valid;
+ clib_memcpy (mp->match_name, match_name, vec_len (match_name));
+ vec_free (match_name);
+ /* send it... */
+ S;
- /* Use a control ping for synchronization */
- {
- vl_api_control_ping_t * mp;
- M(CONTROL_PING, control_ping);
- S;
- }
- /* Wait for a reply... */
- W;
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
+ S;
+ }
+ /* Wait for a reply... */
+ W;
- /* NOTREACHED */
- return 0;
+ /* NOTREACHED */
+ return 0;
}
static int
api_policer_classify_set_interface (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_policer_classify_set_interface_t *mp;
- f64 timeout;
- u32 sw_if_index;
- int sw_if_index_set;
- u32 ip4_table_index = ~0;
- u32 ip6_table_index = ~0;
- u32 l2_table_index = ~0;
- u8 is_add = 1;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "del"))
- is_add = 0;
- else if (unformat (i, "ip4-table %d", &ip4_table_index))
- ;
- else if (unformat (i, "ip6-table %d", &ip6_table_index))
- ;
- else if (unformat (i, "l2-table %d", &l2_table_index))
- ;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
- }
-
- if (sw_if_index_set == 0) {
- errmsg ("missing interface name or sw_if_index\n");
- return -99;
- }
-
- M(POLICER_CLASSIFY_SET_INTERFACE, policer_classify_set_interface);
-
- mp->sw_if_index = ntohl(sw_if_index);
- mp->ip4_table_index = ntohl(ip4_table_index);
- mp->ip6_table_index = ntohl(ip6_table_index);
- mp->l2_table_index = ntohl(l2_table_index);
- mp->is_add = is_add;
-
- S; W;
- /* NOTREACHED */
- return 0;
+ unformat_input_t *i = vam->input;
+ vl_api_policer_classify_set_interface_t *mp;
+ f64 timeout;
+ u32 sw_if_index;
+ int sw_if_index_set;
+ u32 ip4_table_index = ~0;
+ u32 ip6_table_index = ~0;
+ u32 l2_table_index = ~0;
+ u8 is_add = 1;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "del"))
+ is_add = 0;
+ else if (unformat (i, "ip4-table %d", &ip4_table_index))
+ ;
+ else if (unformat (i, "ip6-table %d", &ip6_table_index))
+ ;
+ else if (unformat (i, "l2-table %d", &l2_table_index))
+ ;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
+ }
+
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
+ }
+
+ M (POLICER_CLASSIFY_SET_INTERFACE, policer_classify_set_interface);
+
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->ip4_table_index = ntohl (ip4_table_index);
+ mp->ip6_table_index = ntohl (ip6_table_index);
+ mp->l2_table_index = ntohl (l2_table_index);
+ mp->is_add = is_add;
+
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
static int
-api_policer_classify_dump(vat_main_t *vam)
+api_policer_classify_dump (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_policer_classify_dump_t *mp;
- f64 timeout = ~0;
- u8 type = POLICER_CLASSIFY_N_TABLES;
+ unformat_input_t *i = vam->input;
+ vl_api_policer_classify_dump_t *mp;
+ f64 timeout = ~0;
+ u8 type = POLICER_CLASSIFY_N_TABLES;
- if (unformat (i, "type %U", unformat_classify_table_type, &type))
- ;
- else {
- errmsg ("classify table type must be specified\n");
- return -99;
+ if (unformat (i, "type %U", unformat_classify_table_type, &type))
+ ;
+ else
+ {
+ errmsg ("classify table type must be specified\n");
+ return -99;
}
- if (!vam->json_output) {
- fformat(vam->ofp, "%10s%20s\n", "Intfc idx", "Classify table");
+ if (!vam->json_output)
+ {
+ fformat (vam->ofp, "%10s%20s\n", "Intfc idx", "Classify table");
}
- M(POLICER_CLASSIFY_DUMP, policer_classify_dump);
- mp->type = type;
- /* send it... */
- S;
+ M (POLICER_CLASSIFY_DUMP, policer_classify_dump);
+ mp->type = type;
+ /* send it... */
+ S;
- /* Use a control ping for synchronization */
- {
- vl_api_control_ping_t * mp;
- M(CONTROL_PING, control_ping);
- S;
- }
- /* Wait for a reply... */
- W;
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
+ S;
+ }
+ /* Wait for a reply... */
+ W;
- /* NOTREACHED */
- return 0;
+ /* NOTREACHED */
+ return 0;
}
static int
api_netmap_create (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_netmap_create_t * mp;
- f64 timeout;
- u8 * if_name = 0;
- u8 hw_addr[6];
- u8 random_hw_addr = 1;
- u8 is_pipe = 0;
- u8 is_master = 0;
-
- memset (hw_addr, 0, sizeof (hw_addr));
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "name %s", &if_name))
- vec_add1 (if_name, 0);
- else if (unformat (i, "hw_addr %U", unformat_ethernet_address, hw_addr))
- random_hw_addr = 0;
- else if (unformat (i, "pipe"))
- is_pipe = 1;
- else if (unformat (i, "master"))
- is_master = 1;
- else if (unformat (i, "slave"))
- is_master = 0;
- else
- break;
+ unformat_input_t *i = vam->input;
+ vl_api_netmap_create_t *mp;
+ f64 timeout;
+ u8 *if_name = 0;
+ u8 hw_addr[6];
+ u8 random_hw_addr = 1;
+ u8 is_pipe = 0;
+ u8 is_master = 0;
+
+ memset (hw_addr, 0, sizeof (hw_addr));
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "name %s", &if_name))
+ vec_add1 (if_name, 0);
+ else if (unformat (i, "hw_addr %U", unformat_ethernet_address, hw_addr))
+ random_hw_addr = 0;
+ else if (unformat (i, "pipe"))
+ is_pipe = 1;
+ else if (unformat (i, "master"))
+ is_master = 1;
+ else if (unformat (i, "slave"))
+ is_master = 0;
+ else
+ break;
}
- if (!vec_len (if_name)) {
- errmsg ("interface name must be specified");
- return -99;
+ if (!vec_len (if_name))
+ {
+ errmsg ("interface name must be specified");
+ return -99;
}
- if (vec_len (if_name) > 64) {
- errmsg ("interface name too long");
- return -99;
+ if (vec_len (if_name) > 64)
+ {
+ errmsg ("interface name too long");
+ return -99;
}
- M(NETMAP_CREATE, netmap_create);
+ M (NETMAP_CREATE, netmap_create);
- clib_memcpy (mp->netmap_if_name, if_name, vec_len (if_name));
- clib_memcpy (mp->hw_addr, hw_addr, 6);
- mp->use_random_hw_addr = random_hw_addr;
- mp->is_pipe = is_pipe;
- mp->is_master = is_master;
- vec_free (if_name);
+ clib_memcpy (mp->netmap_if_name, if_name, vec_len (if_name));
+ clib_memcpy (mp->hw_addr, hw_addr, 6);
+ mp->use_random_hw_addr = random_hw_addr;
+ mp->is_pipe = is_pipe;
+ mp->is_master = is_master;
+ vec_free (if_name);
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
static int
api_netmap_delete (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_netmap_delete_t * mp;
- f64 timeout;
- u8 * if_name = 0;
+ unformat_input_t *i = vam->input;
+ vl_api_netmap_delete_t *mp;
+ f64 timeout;
+ u8 *if_name = 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "name %s", &if_name))
- vec_add1 (if_name, 0);
- else
- break;
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "name %s", &if_name))
+ vec_add1 (if_name, 0);
+ else
+ break;
}
- if (!vec_len (if_name)) {
- errmsg ("interface name must be specified");
- return -99;
+ if (!vec_len (if_name))
+ {
+ errmsg ("interface name must be specified");
+ return -99;
}
- if (vec_len (if_name) > 64) {
- errmsg ("interface name too long");
- return -99;
+ if (vec_len (if_name) > 64)
+ {
+ errmsg ("interface name too long");
+ return -99;
}
- M(NETMAP_DELETE, netmap_delete);
+ M (NETMAP_DELETE, netmap_delete);
- clib_memcpy (mp->netmap_if_name, if_name, vec_len (if_name));
- vec_free (if_name);
+ clib_memcpy (mp->netmap_if_name, if_name, vec_len (if_name));
+ vec_free (if_name);
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
static void vl_api_mpls_gre_tunnel_details_t_handler
-(vl_api_mpls_gre_tunnel_details_t * mp)
-{
- vat_main_t * vam = &vat_main;
- i32 i;
- i32 len = ntohl(mp->nlabels);
-
- if (mp->l2_only == 0) {
- fformat(vam->ofp, "[%d]: src %U, dst %U, adj %U/%d, labels ",
- ntohl(mp->tunnel_index),
- format_ip4_address, &mp->tunnel_src,
- format_ip4_address, &mp->tunnel_dst,
- format_ip4_address, &mp->intfc_address,
- ntohl(mp->mask_width));
- for (i = 0; i < len; i++) {
- fformat(vam->ofp, "%u ", ntohl(mp->labels[i]));
- }
- fformat(vam->ofp, "\n");
- fformat(vam->ofp, " inner fib index %d, outer fib index %d\n",
- ntohl(mp->inner_fib_index), ntohl(mp->outer_fib_index));
- } else {
- fformat(vam->ofp, "[%d]: src %U, dst %U, key %U, labels ",
- ntohl(mp->tunnel_index),
- format_ip4_address, &mp->tunnel_src,
- format_ip4_address, &mp->tunnel_dst,
- format_ip4_address, &mp->intfc_address);
- for (i = 0; i < len; i++) {
- fformat(vam->ofp, "%u ", ntohl(mp->labels[i]));
- }
- fformat(vam->ofp, "\n");
- fformat(vam->ofp, " l2 interface %d, outer fib index %d\n",
- ntohl(mp->hw_if_index), ntohl(mp->outer_fib_index));
+ (vl_api_mpls_gre_tunnel_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ i32 i;
+ i32 len = ntohl (mp->nlabels);
+
+ if (mp->l2_only == 0)
+ {
+ fformat (vam->ofp, "[%d]: src %U, dst %U, adj %U/%d, labels ",
+ ntohl (mp->tunnel_index),
+ format_ip4_address, &mp->tunnel_src,
+ format_ip4_address, &mp->tunnel_dst,
+ format_ip4_address, &mp->intfc_address,
+ ntohl (mp->mask_width));
+ for (i = 0; i < len; i++)
+ {
+ fformat (vam->ofp, "%u ", ntohl (mp->labels[i]));
+ }
+ fformat (vam->ofp, "\n");
+ fformat (vam->ofp, " inner fib index %d, outer fib index %d\n",
+ ntohl (mp->inner_fib_index), ntohl (mp->outer_fib_index));
+ }
+ else
+ {
+ fformat (vam->ofp, "[%d]: src %U, dst %U, key %U, labels ",
+ ntohl (mp->tunnel_index),
+ format_ip4_address, &mp->tunnel_src,
+ format_ip4_address, &mp->tunnel_dst,
+ format_ip4_address, &mp->intfc_address);
+ for (i = 0; i < len; i++)
+ {
+ fformat (vam->ofp, "%u ", ntohl (mp->labels[i]));
+ }
+ fformat (vam->ofp, "\n");
+ fformat (vam->ofp, " l2 interface %d, outer fib index %d\n",
+ ntohl (mp->hw_if_index), ntohl (mp->outer_fib_index));
}
}
static void vl_api_mpls_gre_tunnel_details_t_handler_json
-(vl_api_mpls_gre_tunnel_details_t * mp)
-{
- vat_main_t * vam = &vat_main;
- vat_json_node_t *node = NULL;
- struct in_addr ip4;
- i32 i;
- i32 len = ntohl(mp->nlabels);
-
- if (VAT_JSON_ARRAY != vam->json_tree.type) {
- ASSERT(VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array(&vam->json_tree);
- }
- node = vat_json_array_add(&vam->json_tree);
-
- vat_json_init_object(node);
- vat_json_object_add_uint(node, "tunnel_index", ntohl(mp->tunnel_index));
- clib_memcpy(&ip4, &(mp->intfc_address), sizeof(ip4));
- vat_json_object_add_ip4(node, "intfc_address", ip4);
- vat_json_object_add_uint(node, "inner_fib_index", ntohl(mp->inner_fib_index));
- vat_json_object_add_uint(node, "mask_width", ntohl(mp->mask_width));
- vat_json_object_add_uint(node, "encap_index", ntohl(mp->encap_index));
- vat_json_object_add_uint(node, "hw_if_index", ntohl(mp->hw_if_index));
- vat_json_object_add_uint(node, "l2_only", ntohl(mp->l2_only));
- clib_memcpy(&ip4, &(mp->tunnel_src), sizeof(ip4));
- vat_json_object_add_ip4(node, "tunnel_src", ip4);
- clib_memcpy(&ip4, &(mp->tunnel_dst), sizeof(ip4));
- vat_json_object_add_ip4(node, "tunnel_dst", ip4);
- vat_json_object_add_uint(node, "outer_fib_index", ntohl(mp->outer_fib_index));
- vat_json_object_add_uint(node, "label_count", len);
- for (i = 0; i < len; i++) {
- vat_json_object_add_uint(node, "label", ntohl(mp->labels[i]));
- }
-}
-
-static int api_mpls_gre_tunnel_dump (vat_main_t * vam)
-{
- vl_api_mpls_gre_tunnel_dump_t *mp;
- f64 timeout;
- i32 index = -1;
-
- /* Parse args required to build the message */
- while (unformat_check_input (vam->input) != UNFORMAT_END_OF_INPUT) {
- if (!unformat (vam->input, "tunnel_index %d", &index)) {
- index = -1;
- break;
- }
- }
-
- fformat(vam->ofp, " tunnel_index %d\n", index);
-
- M(MPLS_GRE_TUNNEL_DUMP, mpls_gre_tunnel_dump);
- mp->tunnel_index = htonl(index);
- S;
+ (vl_api_mpls_gre_tunnel_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
+ struct in_addr ip4;
+ i32 i;
+ i32 len = ntohl (mp->nlabels);
- /* Use a control ping for synchronization */
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
+ }
+ node = vat_json_array_add (&vam->json_tree);
+
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "tunnel_index", ntohl (mp->tunnel_index));
+ clib_memcpy (&ip4, &(mp->intfc_address), sizeof (ip4));
+ vat_json_object_add_ip4 (node, "intfc_address", ip4);
+ vat_json_object_add_uint (node, "inner_fib_index",
+ ntohl (mp->inner_fib_index));
+ vat_json_object_add_uint (node, "mask_width", ntohl (mp->mask_width));
+ vat_json_object_add_uint (node, "encap_index", ntohl (mp->encap_index));
+ vat_json_object_add_uint (node, "hw_if_index", ntohl (mp->hw_if_index));
+ vat_json_object_add_uint (node, "l2_only", ntohl (mp->l2_only));
+ clib_memcpy (&ip4, &(mp->tunnel_src), sizeof (ip4));
+ vat_json_object_add_ip4 (node, "tunnel_src", ip4);
+ clib_memcpy (&ip4, &(mp->tunnel_dst), sizeof (ip4));
+ vat_json_object_add_ip4 (node, "tunnel_dst", ip4);
+ vat_json_object_add_uint (node, "outer_fib_index",
+ ntohl (mp->outer_fib_index));
+ vat_json_object_add_uint (node, "label_count", len);
+ for (i = 0; i < len; i++)
{
- vl_api_control_ping_t * mp;
- M(CONTROL_PING, control_ping);
- S;
+ vat_json_object_add_uint (node, "label", ntohl (mp->labels[i]));
}
- W;
}
-static void vl_api_mpls_eth_tunnel_details_t_handler
-(vl_api_mpls_eth_tunnel_details_t * mp)
+static int
+api_mpls_gre_tunnel_dump (vat_main_t * vam)
{
- vat_main_t * vam = &vat_main;
- i32 i;
- i32 len = ntohl(mp->nlabels);
+ vl_api_mpls_gre_tunnel_dump_t *mp;
+ f64 timeout;
+ i32 index = -1;
- fformat(vam->ofp, "[%d]: dst %U, adj %U/%d, labels ",
- ntohl(mp->tunnel_index),
- format_ethernet_address, &mp->tunnel_dst_mac,
- format_ip4_address, &mp->intfc_address,
- ntohl(mp->mask_width));
- for (i = 0; i < len; i++) {
- fformat(vam->ofp, "%u ", ntohl(mp->labels[i]));
+ /* Parse args required to build the message */
+ while (unformat_check_input (vam->input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (!unformat (vam->input, "tunnel_index %d", &index))
+ {
+ index = -1;
+ break;
+ }
}
- fformat(vam->ofp, "\n");
- fformat(vam->ofp, " tx on %d, rx fib index %d\n",
- ntohl(mp->tx_sw_if_index),
- ntohl(mp->inner_fib_index));
+
+ fformat (vam->ofp, " tunnel_index %d\n", index);
+
+ M (MPLS_GRE_TUNNEL_DUMP, mpls_gre_tunnel_dump);
+ mp->tunnel_index = htonl (index);
+ S;
+
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
+ S;
+ }
+ W;
}
-static void vl_api_mpls_eth_tunnel_details_t_handler_json
-(vl_api_mpls_eth_tunnel_details_t * mp)
+static void vl_api_mpls_eth_tunnel_details_t_handler
+ (vl_api_mpls_eth_tunnel_details_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t *node = NULL;
- struct in_addr ip4;
- i32 i;
- i32 len = ntohl(mp->nlabels);
+ vat_main_t *vam = &vat_main;
+ i32 i;
+ i32 len = ntohl (mp->nlabels);
- if (VAT_JSON_ARRAY != vam->json_tree.type) {
- ASSERT(VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array(&vam->json_tree);
+ fformat (vam->ofp, "[%d]: dst %U, adj %U/%d, labels ",
+ ntohl (mp->tunnel_index),
+ format_ethernet_address, &mp->tunnel_dst_mac,
+ format_ip4_address, &mp->intfc_address, ntohl (mp->mask_width));
+ for (i = 0; i < len; i++)
+ {
+ fformat (vam->ofp, "%u ", ntohl (mp->labels[i]));
}
- node = vat_json_array_add(&vam->json_tree);
+ fformat (vam->ofp, "\n");
+ fformat (vam->ofp, " tx on %d, rx fib index %d\n",
+ ntohl (mp->tx_sw_if_index), ntohl (mp->inner_fib_index));
+}
- vat_json_init_object(node);
- vat_json_object_add_uint(node, "tunnel_index", ntohl(mp->tunnel_index));
- clib_memcpy(&ip4, &(mp->intfc_address), sizeof(ip4));
- vat_json_object_add_ip4(node, "intfc_address", ip4);
- vat_json_object_add_uint(node, "inner_fib_index", ntohl(mp->inner_fib_index));
- vat_json_object_add_uint(node, "mask_width", ntohl(mp->mask_width));
- vat_json_object_add_uint(node, "encap_index", ntohl(mp->encap_index));
- vat_json_object_add_uint(node, "hw_if_index", ntohl(mp->hw_if_index));
- vat_json_object_add_uint(node, "l2_only", ntohl(mp->l2_only));
- vat_json_object_add_string_copy(node, "tunnel_dst_mac",
- format(0, "%U", format_ethernet_address, &mp->tunnel_dst_mac));
- vat_json_object_add_uint(node, "tx_sw_if_index", ntohl(mp->tx_sw_if_index));
- vat_json_object_add_uint(node, "label_count", len);
- for (i = 0; i < len; i++) {
- vat_json_object_add_uint(node, "label", ntohl(mp->labels[i]));
+static void vl_api_mpls_eth_tunnel_details_t_handler_json
+ (vl_api_mpls_eth_tunnel_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
+ struct in_addr ip4;
+ i32 i;
+ i32 len = ntohl (mp->nlabels);
+
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
+ }
+ node = vat_json_array_add (&vam->json_tree);
+
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "tunnel_index", ntohl (mp->tunnel_index));
+ clib_memcpy (&ip4, &(mp->intfc_address), sizeof (ip4));
+ vat_json_object_add_ip4 (node, "intfc_address", ip4);
+ vat_json_object_add_uint (node, "inner_fib_index",
+ ntohl (mp->inner_fib_index));
+ vat_json_object_add_uint (node, "mask_width", ntohl (mp->mask_width));
+ vat_json_object_add_uint (node, "encap_index", ntohl (mp->encap_index));
+ vat_json_object_add_uint (node, "hw_if_index", ntohl (mp->hw_if_index));
+ vat_json_object_add_uint (node, "l2_only", ntohl (mp->l2_only));
+ vat_json_object_add_string_copy (node, "tunnel_dst_mac",
+ format (0, "%U", format_ethernet_address,
+ &mp->tunnel_dst_mac));
+ vat_json_object_add_uint (node, "tx_sw_if_index",
+ ntohl (mp->tx_sw_if_index));
+ vat_json_object_add_uint (node, "label_count", len);
+ for (i = 0; i < len; i++)
+ {
+ vat_json_object_add_uint (node, "label", ntohl (mp->labels[i]));
}
}
-static int api_mpls_eth_tunnel_dump (vat_main_t * vam)
+static int
+api_mpls_eth_tunnel_dump (vat_main_t * vam)
{
- vl_api_mpls_eth_tunnel_dump_t *mp;
- f64 timeout;
- i32 index = -1;
+ vl_api_mpls_eth_tunnel_dump_t *mp;
+ f64 timeout;
+ i32 index = -1;
- /* Parse args required to build the message */
- while (unformat_check_input (vam->input) != UNFORMAT_END_OF_INPUT) {
- if (!unformat (vam->input, "tunnel_index %d", &index)) {
- index = -1;
- break;
- }
+ /* Parse args required to build the message */
+ while (unformat_check_input (vam->input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (!unformat (vam->input, "tunnel_index %d", &index))
+ {
+ index = -1;
+ break;
+ }
}
- fformat(vam->ofp, " tunnel_index %d\n", index);
+ fformat (vam->ofp, " tunnel_index %d\n", index);
- M(MPLS_ETH_TUNNEL_DUMP, mpls_eth_tunnel_dump);
- mp->tunnel_index = htonl(index);
- S;
+ M (MPLS_ETH_TUNNEL_DUMP, mpls_eth_tunnel_dump);
+ mp->tunnel_index = htonl (index);
+ S;
- /* Use a control ping for synchronization */
- {
- vl_api_control_ping_t * mp;
- M(CONTROL_PING, control_ping);
- S;
- }
- W;
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
+ S;
+ }
+ W;
}
static void vl_api_mpls_fib_encap_details_t_handler
-(vl_api_mpls_fib_encap_details_t * mp)
+ (vl_api_mpls_fib_encap_details_t * mp)
{
- vat_main_t * vam = &vat_main;
- i32 i;
- i32 len = ntohl(mp->nlabels);
+ vat_main_t *vam = &vat_main;
+ i32 i;
+ i32 len = ntohl (mp->nlabels);
- fformat(vam->ofp, "table %d, dest %U, label ",
- ntohl(mp->fib_index),
- format_ip4_address, &mp->dest,
- len);
- for (i = 0; i < len; i++) {
- fformat(vam->ofp, "%u ", ntohl(mp->labels[i]));
+ fformat (vam->ofp, "table %d, dest %U, label ",
+ ntohl (mp->fib_index), format_ip4_address, &mp->dest, len);
+ for (i = 0; i < len; i++)
+ {
+ fformat (vam->ofp, "%u ", ntohl (mp->labels[i]));
}
- fformat(vam->ofp, "\n");
+ fformat (vam->ofp, "\n");
}
static void vl_api_mpls_fib_encap_details_t_handler_json
-(vl_api_mpls_fib_encap_details_t * mp)
+ (vl_api_mpls_fib_encap_details_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t *node = NULL;
- i32 i;
- i32 len = ntohl(mp->nlabels);
- struct in_addr ip4;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
+ i32 i;
+ i32 len = ntohl (mp->nlabels);
+ struct in_addr ip4;
- if (VAT_JSON_ARRAY != vam->json_tree.type) {
- ASSERT(VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array(&vam->json_tree);
- }
- node = vat_json_array_add(&vam->json_tree);
-
- vat_json_init_object(node);
- vat_json_object_add_uint(node, "table", ntohl(mp->fib_index));
- vat_json_object_add_uint(node, "entry_index", ntohl(mp->entry_index));
- clib_memcpy(&ip4, &(mp->dest), sizeof(ip4));
- vat_json_object_add_ip4(node, "dest", ip4);
- vat_json_object_add_uint(node, "s_bit", ntohl(mp->s_bit));
- vat_json_object_add_uint(node, "label_count", len);
- for (i = 0; i < len; i++) {
- vat_json_object_add_uint(node, "label", ntohl(mp->labels[i]));
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
+ }
+ node = vat_json_array_add (&vam->json_tree);
+
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "table", ntohl (mp->fib_index));
+ vat_json_object_add_uint (node, "entry_index", ntohl (mp->entry_index));
+ clib_memcpy (&ip4, &(mp->dest), sizeof (ip4));
+ vat_json_object_add_ip4 (node, "dest", ip4);
+ vat_json_object_add_uint (node, "s_bit", ntohl (mp->s_bit));
+ vat_json_object_add_uint (node, "label_count", len);
+ for (i = 0; i < len; i++)
+ {
+ vat_json_object_add_uint (node, "label", ntohl (mp->labels[i]));
}
}
-static int api_mpls_fib_encap_dump (vat_main_t * vam)
+static int
+api_mpls_fib_encap_dump (vat_main_t * vam)
{
- vl_api_mpls_fib_encap_dump_t *mp;
- f64 timeout;
+ vl_api_mpls_fib_encap_dump_t *mp;
+ f64 timeout;
- M(MPLS_FIB_ENCAP_DUMP, mpls_fib_encap_dump);
- S;
+ M (MPLS_FIB_ENCAP_DUMP, mpls_fib_encap_dump);
+ S;
- /* Use a control ping for synchronization */
- {
- vl_api_control_ping_t * mp;
- M(CONTROL_PING, control_ping);
- S;
- }
- W;
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
+ S;
+ }
+ W;
}
static void vl_api_mpls_fib_decap_details_t_handler
-(vl_api_mpls_fib_decap_details_t * mp)
+ (vl_api_mpls_fib_decap_details_t * mp)
{
- vat_main_t * vam = &vat_main;
+ vat_main_t *vam = &vat_main;
- fformat(vam->ofp, "RX table %d, TX table/intfc %u, swif_tag '%s', label %u, s_bit %u\n",
- ntohl(mp->rx_table_id),
- ntohl(mp->tx_table_id),
- mp->swif_tag,
- ntohl(mp->label),
- ntohl(mp->s_bit));
+ fformat (vam->ofp,
+ "RX table %d, TX table/intfc %u, swif_tag '%s', label %u, s_bit %u\n",
+ ntohl (mp->rx_table_id), ntohl (mp->tx_table_id), mp->swif_tag,
+ ntohl (mp->label), ntohl (mp->s_bit));
}
static void vl_api_mpls_fib_decap_details_t_handler_json
-(vl_api_mpls_fib_decap_details_t * mp)
+ (vl_api_mpls_fib_decap_details_t * mp)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t *node = NULL;
- struct in_addr ip4;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
+ struct in_addr ip4;
- if (VAT_JSON_ARRAY != vam->json_tree.type) {
- ASSERT(VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array(&vam->json_tree);
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
}
- node = vat_json_array_add(&vam->json_tree);
+ node = vat_json_array_add (&vam->json_tree);
- vat_json_init_object(node);
- vat_json_object_add_uint(node, "table", ntohl(mp->fib_index));
- vat_json_object_add_uint(node, "entry_index", ntohl(mp->entry_index));
- clib_memcpy(&ip4, &(mp->dest), sizeof(ip4));
- vat_json_object_add_ip4(node, "dest", ip4);
- vat_json_object_add_uint(node, "s_bit", ntohl(mp->s_bit));
- vat_json_object_add_uint(node, "label", ntohl(mp->label));
- vat_json_object_add_uint(node, "rx_table_id", ntohl(mp->rx_table_id));
- vat_json_object_add_uint(node, "tx_table_id", ntohl(mp->tx_table_id));
- vat_json_object_add_string_copy(node, "swif_tag", mp->swif_tag);
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "table", ntohl (mp->fib_index));
+ vat_json_object_add_uint (node, "entry_index", ntohl (mp->entry_index));
+ clib_memcpy (&ip4, &(mp->dest), sizeof (ip4));
+ vat_json_object_add_ip4 (node, "dest", ip4);
+ vat_json_object_add_uint (node, "s_bit", ntohl (mp->s_bit));
+ vat_json_object_add_uint (node, "label", ntohl (mp->label));
+ vat_json_object_add_uint (node, "rx_table_id", ntohl (mp->rx_table_id));
+ vat_json_object_add_uint (node, "tx_table_id", ntohl (mp->tx_table_id));
+ vat_json_object_add_string_copy (node, "swif_tag", mp->swif_tag);
}
-static int api_mpls_fib_decap_dump (vat_main_t * vam)
+static int
+api_mpls_fib_decap_dump (vat_main_t * vam)
{
- vl_api_mpls_fib_decap_dump_t *mp;
- f64 timeout;
+ vl_api_mpls_fib_decap_dump_t *mp;
+ f64 timeout;
- M(MPLS_FIB_DECAP_DUMP, mpls_fib_decap_dump);
- S;
+ M (MPLS_FIB_DECAP_DUMP, mpls_fib_decap_dump);
+ S;
- /* Use a control ping for synchronization */
- {
- vl_api_control_ping_t * mp;
- M(CONTROL_PING, control_ping);
- S;
- }
- W;
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
+ S;
+ }
+ W;
}
-int api_classify_table_ids (vat_main_t *vam)
+int
+api_classify_table_ids (vat_main_t * vam)
{
- vl_api_classify_table_ids_t *mp;
- f64 timeout;
+ vl_api_classify_table_ids_t *mp;
+ f64 timeout;
- /* Construct the API message */
- M(CLASSIFY_TABLE_IDS, classify_table_ids);
- mp->context = 0;
+ /* Construct the API message */
+ M (CLASSIFY_TABLE_IDS, classify_table_ids);
+ mp->context = 0;
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-int api_classify_table_by_interface (vat_main_t *vam)
+int
+api_classify_table_by_interface (vat_main_t * vam)
{
- unformat_input_t * input = vam->input;
- vl_api_classify_table_by_interface_t *mp;
- f64 timeout;
+ unformat_input_t *input = vam->input;
+ vl_api_classify_table_by_interface_t *mp;
+ f64 timeout;
- u32 sw_if_index = ~0;
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
- if (unformat (input, "%U", unformat_sw_if_index, vam, &sw_if_index))
- ;
- else if (unformat (input, "sw_if_index %d", &sw_if_index))
- ;
- else
- break;
+ u32 sw_if_index = ~0;
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ ;
+ else if (unformat (input, "sw_if_index %d", &sw_if_index))
+ ;
+ else
+ break;
}
- if (sw_if_index == ~0) {
- errmsg ("missing interface name or sw_if_index\n");
- return -99;
+ if (sw_if_index == ~0)
+ {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
}
- /* Construct the API message */
- M(CLASSIFY_TABLE_BY_INTERFACE, classify_table_by_interface);
- mp->context = 0;
- mp->sw_if_index = ntohl(sw_if_index);
+ /* Construct the API message */
+ M (CLASSIFY_TABLE_BY_INTERFACE, classify_table_by_interface);
+ mp->context = 0;
+ mp->sw_if_index = ntohl (sw_if_index);
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-int api_classify_table_info (vat_main_t *vam)
+int
+api_classify_table_info (vat_main_t * vam)
{
- unformat_input_t * input = vam->input;
- vl_api_classify_table_info_t *mp;
- f64 timeout;
+ unformat_input_t *input = vam->input;
+ vl_api_classify_table_info_t *mp;
+ f64 timeout;
- u32 table_id = ~0;
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
- if (unformat (input, "table_id %d", &table_id))
- ;
- else
- break;
+ u32 table_id = ~0;
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "table_id %d", &table_id))
+ ;
+ else
+ break;
}
- if (table_id == ~0) {
- errmsg ("missing table id\n");
- return -99;
+ if (table_id == ~0)
+ {
+ errmsg ("missing table id\n");
+ return -99;
}
- /* Construct the API message */
- M(CLASSIFY_TABLE_INFO, classify_table_info);
- mp->context = 0;
- mp->table_id = ntohl(table_id);
+ /* Construct the API message */
+ M (CLASSIFY_TABLE_INFO, classify_table_info);
+ mp->context = 0;
+ mp->table_id = ntohl (table_id);
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-int api_classify_session_dump (vat_main_t *vam)
+int
+api_classify_session_dump (vat_main_t * vam)
{
- unformat_input_t * input = vam->input;
- vl_api_classify_session_dump_t *mp;
- f64 timeout;
+ unformat_input_t *input = vam->input;
+ vl_api_classify_session_dump_t *mp;
+ f64 timeout;
- u32 table_id = ~0;
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
- if (unformat (input, "table_id %d", &table_id))
- ;
- else
- break;
+ u32 table_id = ~0;
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "table_id %d", &table_id))
+ ;
+ else
+ break;
}
- if (table_id == ~0) {
- errmsg ("missing table id\n");
- return -99;
+ if (table_id == ~0)
+ {
+ errmsg ("missing table id\n");
+ return -99;
}
- /* Construct the API message */
- M(CLASSIFY_SESSION_DUMP, classify_session_dump);
- mp->context = 0;
- mp->table_id = ntohl(table_id);
- S;
+ /* Construct the API message */
+ M (CLASSIFY_SESSION_DUMP, classify_session_dump);
+ mp->context = 0;
+ mp->table_id = ntohl (table_id);
+ S;
- /* Use a control ping for synchronization */
- {
- vl_api_control_ping_t * mp;
- M(CONTROL_PING, control_ping);
- S;
- }
- W;
- /* NOTREACHED */
- return 0;
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
+ S;
+ }
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static void vl_api_ipfix_details_t_handler (vl_api_ipfix_details_t * mp)
+static void
+vl_api_ipfix_details_t_handler (vl_api_ipfix_details_t * mp)
{
- vat_main_t * vam = &vat_main;
+ vat_main_t *vam = &vat_main;
- fformat(vam->ofp, "collector_address %U, collector_port %d, "
- "src_address %U, fib_index %u, path_mtu %u, "
- "template_interval %u\n",
- format_ip4_address, mp->collector_address,
- ntohs(mp->collector_port),
- format_ip4_address, mp->src_address,
- ntohl(mp->fib_index),
- ntohl(mp->path_mtu),
- ntohl(mp->template_interval));
+ fformat (vam->ofp, "collector_address %U, collector_port %d, "
+ "src_address %U, fib_index %u, path_mtu %u, "
+ "template_interval %u\n",
+ format_ip4_address, mp->collector_address,
+ ntohs (mp->collector_port),
+ format_ip4_address, mp->src_address,
+ ntohl (mp->fib_index),
+ ntohl (mp->path_mtu), ntohl (mp->template_interval));
- vam->retval = 0;
- vam->result_ready = 1;
+ vam->retval = 0;
+ vam->result_ready = 1;
+}
+
+static void
+vl_api_ipfix_details_t_handler_json (vl_api_ipfix_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
+ struct in_addr collector_address;
+ struct in_addr src_address;
+
+ vat_json_init_object (&node);
+ clib_memcpy (&collector_address, &mp->collector_address,
+ sizeof (collector_address));
+ vat_json_object_add_ip4 (&node, "collector_address", collector_address);
+ vat_json_object_add_uint (&node, "collector_port",
+ ntohs (mp->collector_port));
+ clib_memcpy (&src_address, &mp->src_address, sizeof (src_address));
+ vat_json_object_add_ip4 (&node, "src_address", src_address);
+ vat_json_object_add_uint (&node, "fib_index", ntohl (mp->fib_index));
+ vat_json_object_add_uint (&node, "path_mtu", ntohl (mp->path_mtu));
+ vat_json_object_add_uint (&node, "template_interval",
+ ntohl (mp->template_interval));
+
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
+ vam->retval = 0;
+ vam->result_ready = 1;
}
-static void vl_api_ipfix_details_t_handler_json
-(vl_api_ipfix_details_t * mp)
+int
+api_ipfix_dump (vat_main_t * vam)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t node;
- struct in_addr collector_address;
- struct in_addr src_address;
+ vl_api_ipfix_dump_t *mp;
+ f64 timeout;
- vat_json_init_object(&node);
- clib_memcpy(&collector_address, &mp->collector_address,
- sizeof(collector_address));
- vat_json_object_add_ip4(&node, "collector_address", collector_address);
- vat_json_object_add_uint(&node, "collector_port",
- ntohs(mp->collector_port));
- clib_memcpy(&src_address, &mp->src_address, sizeof(src_address));
- vat_json_object_add_ip4(&node, "src_address", src_address);
- vat_json_object_add_uint(&node, "fib_index", ntohl(mp->fib_index));
- vat_json_object_add_uint(&node, "path_mtu", ntohl(mp->path_mtu));
- vat_json_object_add_uint(&node, "template_interval",
- ntohl(mp->template_interval));
+ /* Construct the API message */
+ M (IPFIX_DUMP, ipfix_dump);
+ mp->context = 0;
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
- vam->retval = 0;
- vam->result_ready = 1;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-int api_ipfix_dump (vat_main_t *vam)
+int
+api_pg_create_interface (vat_main_t * vam)
{
- vl_api_ipfix_dump_t *mp;
- f64 timeout;
+ unformat_input_t *input = vam->input;
+ vl_api_pg_create_interface_t *mp;
+ f64 timeout;
- /* Construct the API message */
- M(IPFIX_DUMP, ipfix_dump);
- mp->context = 0;
+ u32 if_id = ~0;
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "if_id %d", &if_id))
+ ;
+ else
+ break;
+ }
+ if (if_id == ~0)
+ {
+ errmsg ("missing pg interface index\n");
+ return -99;
+ }
- S; W;
- /* NOTREACHED */
- return 0;
+ /* Construct the API message */
+ M (PG_CREATE_INTERFACE, pg_create_interface);
+ mp->context = 0;
+ mp->interface_id = ntohl (if_id);
+
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-int api_pg_create_interface (vat_main_t *vam)
+int
+api_pg_capture (vat_main_t * vam)
{
- unformat_input_t * input = vam->input;
- vl_api_pg_create_interface_t *mp;
- f64 timeout;
+ unformat_input_t *input = vam->input;
+ vl_api_pg_capture_t *mp;
+ f64 timeout;
- u32 if_id = ~0;
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
- if (unformat (input, "if_id %d", &if_id))
- ;
- else
- break;
+ u32 if_id = ~0;
+ u8 enable = 1;
+ u32 count = 1;
+ u8 pcap_file_set = 0;
+ u8 *pcap_file = 0;
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "if_id %d", &if_id))
+ ;
+ else if (unformat (input, "pcap %s", &pcap_file))
+ pcap_file_set = 1;
+ else if (unformat (input, "count %d", &count))
+ ;
+ else if (unformat (input, "disable"))
+ enable = 0;
+ else
+ break;
+ }
+ if (if_id == ~0)
+ {
+ errmsg ("missing pg interface index\n");
+ return -99;
}
- if (if_id == ~0) {
- errmsg ("missing pg interface index\n");
- return -99;
+ if (pcap_file_set > 0)
+ {
+ if (vec_len (pcap_file) > 255)
+ {
+ errmsg ("pcap file name is too long\n");
+ return -99;
+ }
}
- /* Construct the API message */
- M(PG_CREATE_INTERFACE, pg_create_interface);
- mp->context = 0;
- mp->interface_id = ntohl(if_id);
+ u32 name_len = vec_len (pcap_file);
+ /* Construct the API message */
+ M (PG_CAPTURE, pg_capture);
+ mp->context = 0;
+ mp->interface_id = ntohl (if_id);
+ mp->is_enabled = enable;
+ mp->count = ntohl (count);
+ mp->pcap_name_length = ntohl (name_len);
+ if (pcap_file_set != 0)
+ {
+ clib_memcpy (mp->pcap_file_name, pcap_file, name_len);
+ }
+ vec_free (pcap_file);
- S; W;
- /* NOTREACHED */
- return 0;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-int api_pg_capture (vat_main_t *vam)
-{
- unformat_input_t * input = vam->input;
- vl_api_pg_capture_t *mp;
- f64 timeout;
-
- u32 if_id = ~0;
- u8 enable = 1;
- u32 count = 1;
- u8 pcap_file_set = 0;
- u8 * pcap_file = 0;
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
- if (unformat (input, "if_id %d", &if_id))
- ;
- else if (unformat (input, "pcap %s", &pcap_file))
- pcap_file_set = 1;
- else if (unformat (input, "count %d", &count))
- ;
- else if (unformat (input, "disable"))
- enable = 0;
- else
- break;
- }
- if (if_id == ~0) {
- errmsg ("missing pg interface index\n");
- return -99;
- }
- if (pcap_file_set>0) {
- if (vec_len (pcap_file) > 255) {
- errmsg ("pcap file name is too long\n");
- return -99;
- }
- }
-
- u32 name_len = vec_len(pcap_file);
- /* Construct the API message */
- M(PG_CAPTURE, pg_capture);
- mp->context = 0;
- mp->interface_id = ntohl(if_id);
- mp->is_enabled = enable;
- mp->count = ntohl(count);
- mp->pcap_name_length = ntohl(name_len);
- if (pcap_file_set != 0) {
- clib_memcpy(mp->pcap_file_name, pcap_file, name_len);
- }
- vec_free(pcap_file);
-
- S; W;
- /* NOTREACHED */
- return 0;
+int
+api_pg_enable_disable (vat_main_t * vam)
+{
+ unformat_input_t *input = vam->input;
+ vl_api_pg_enable_disable_t *mp;
+ f64 timeout;
+
+ u8 enable = 1;
+ u8 stream_name_set = 0;
+ u8 *stream_name = 0;
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "stream %s", &stream_name))
+ stream_name_set = 1;
+ else if (unformat (input, "disable"))
+ enable = 0;
+ else
+ break;
+ }
+
+ if (stream_name_set > 0)
+ {
+ if (vec_len (stream_name) > 255)
+ {
+ errmsg ("stream name too long\n");
+ return -99;
+ }
+ }
+
+ u32 name_len = vec_len (stream_name);
+ /* Construct the API message */
+ M (PG_ENABLE_DISABLE, pg_enable_disable);
+ mp->context = 0;
+ mp->is_enabled = enable;
+ if (stream_name_set != 0)
+ {
+ mp->stream_name_length = ntohl (name_len);
+ clib_memcpy (mp->stream_name, stream_name, name_len);
+ }
+ vec_free (stream_name);
+
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-int api_pg_enable_disable (vat_main_t *vam)
+int
+api_ip_source_and_port_range_check_add_del (vat_main_t * vam)
{
- unformat_input_t * input = vam->input;
- vl_api_pg_enable_disable_t *mp;
- f64 timeout;
+ unformat_input_t *input = vam->input;
+ vl_api_ip_source_and_port_range_check_add_del_t *mp;
+ f64 timeout;
- u8 enable = 1;
- u8 stream_name_set = 0;
- u8 * stream_name = 0;
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
- if (unformat (input, "stream %s", &stream_name))
- stream_name_set = 1;
- else if (unformat (input, "disable"))
- enable = 0;
- else
- break;
+ u16 *low_ports = 0;
+ u16 *high_ports = 0;
+ u16 this_low;
+ u16 this_hi;
+ ip4_address_t ip4_addr;
+ ip6_address_t ip6_addr;
+ u32 length;
+ u32 tmp, tmp2;
+ u8 prefix_set = 0;
+ u32 vrf_id = ~0;
+ u8 is_add = 1;
+ u8 is_ipv6 = 0;
+
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "%U/%d", unformat_ip4_address, &ip4_addr, &length))
+ {
+ prefix_set = 1;
+ }
+ else
+ if (unformat
+ (input, "%U/%d", unformat_ip6_address, &ip6_addr, &length))
+ {
+ prefix_set = 1;
+ is_ipv6 = 1;
+ }
+ else if (unformat (input, "vrf %d", &vrf_id))
+ ;
+ else if (unformat (input, "del"))
+ is_add = 0;
+ else if (unformat (input, "port %d", &tmp))
+ {
+ if (tmp == 0 || tmp > 65535)
+ {
+ errmsg ("port %d out of range", tmp);
+ return -99;
+ }
+ this_low = tmp;
+ this_hi = this_low + 1;
+ vec_add1 (low_ports, this_low);
+ vec_add1 (high_ports, this_hi);
+ }
+ else if (unformat (input, "range %d - %d", &tmp, &tmp2))
+ {
+ if ((tmp > tmp2) || (tmp == 0) || (tmp2 > 65535))
+ {
+ errmsg ("incorrect range parameters\n");
+ return -99;
+ }
+ this_low = tmp;
+ /* Note: in debug CLI +1 is added to high before
+ passing to real fn that does "the work"
+ (ip_source_and_port_range_check_add_del).
+ This fn is a wrapper around the binary API fn a
+ control plane will call, which expects this increment
+ to have occurred. Hence letting the binary API control
+ plane fn do the increment for consistency between VAT
+ and other control planes.
+ */
+ this_hi = tmp2;
+ vec_add1 (low_ports, this_low);
+ vec_add1 (high_ports, this_hi);
+ }
+ else
+ break;
}
- if (stream_name_set>0) {
- if (vec_len (stream_name) > 255) {
- errmsg ("stream name too long\n");
- return -99;
- }
+ if (prefix_set == 0)
+ {
+ errmsg ("<address>/<mask> not specified\n");
+ return -99;
}
- u32 name_len = vec_len(stream_name);
- /* Construct the API message */
- M(PG_ENABLE_DISABLE, pg_enable_disable);
- mp->context = 0;
- mp->is_enabled = enable;
- if (stream_name_set != 0) {
- mp->stream_name_length = ntohl(name_len);
- clib_memcpy(mp->stream_name, stream_name, name_len);
+ if (vrf_id == ~0)
+ {
+ errmsg ("VRF ID required, not specified\n");
+ return -99;
}
- vec_free(stream_name);
- S; W;
- /* NOTREACHED */
- return 0;
-}
+ if (vrf_id == 0)
+ {
+ errmsg
+ ("VRF ID should not be default. Should be distinct VRF for this purpose.\n");
+ return -99;
+ }
-int api_ip_source_and_port_range_check_add_del (vat_main_t *vam)
-{
- unformat_input_t * input = vam->input;
- vl_api_ip_source_and_port_range_check_add_del_t *mp;
- f64 timeout;
-
- u16 * low_ports = 0;
- u16 * high_ports = 0;
- u16 this_low;
- u16 this_hi;
- ip4_address_t ip4_addr;
- ip6_address_t ip6_addr;
- u32 length;
- u32 tmp, tmp2;
- u8 prefix_set = 0;
- u32 vrf_id =~0;
- u8 is_add = 1;
- u8 is_ipv6 = 0;
-
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (input, "%U/%d", unformat_ip4_address, &ip4_addr, &length))
- {
- prefix_set = 1;
- }
- else if (unformat (input, "%U/%d", unformat_ip6_address, &ip6_addr, &length))
- {
- prefix_set = 1;
- is_ipv6 = 1;
- }
- else if (unformat (input, "vrf %d", &vrf_id))
- ;
- else if (unformat (input, "del"))
- is_add = 0;
- else if (unformat (input, "port %d", &tmp))
- {
- if (tmp == 0 || tmp > 65535) {
- errmsg ("port %d out of range", tmp);
- return -99;
- }
- this_low = tmp;
- this_hi = this_low + 1;
- vec_add1 (low_ports, this_low);
- vec_add1 (high_ports, this_hi);
- }
- else if (unformat (input, "range %d - %d", &tmp, &tmp2))
- {
- if ((tmp > tmp2) ||
- (tmp == 0) ||
- (tmp2 > 65535)) {
- errmsg ("incorrect range parameters\n");
- return -99;
- }
- this_low = tmp;
- /* Note: in debug CLI +1 is added to high before
- passing to real fn that does "the work"
- (ip_source_and_port_range_check_add_del).
- This fn is a wrapper around the binary API fn a
- control plane will call, which expects this increment
- to have occurred. Hence letting the binary API control
- plane fn do the increment for consistency between VAT
- and other control planes.
- */
- this_hi = tmp2;
- vec_add1 (low_ports, this_low);
- vec_add1 (high_ports, this_hi);
- }
- else
- break;
- }
-
- if (prefix_set == 0) {
- errmsg ("<address>/<mask> not specified\n");
- return -99;
- }
-
- if (vrf_id == ~0) {
- errmsg ("VRF ID required, not specified\n");
- return -99;
- }
-
- if (vrf_id == 0) {
- errmsg ("VRF ID should not be default. Should be distinct VRF for this purpose.\n");
- return -99;
- }
-
- if (vec_len(low_ports) == 0) {
- errmsg ("At least one port or port range required\n");
- return -99;
- }
-
- M(IP_SOURCE_AND_PORT_RANGE_CHECK_ADD_DEL, ip_source_and_port_range_check_add_del);
-
- mp->is_add = is_add;
-
- if (is_ipv6) {
- mp->is_ipv6 = 1;
- clib_memcpy (mp->address, &ip6_addr, sizeof (ip6_addr));
- } else {
- mp->is_ipv6 = 0;
- clib_memcpy (mp->address, &ip4_addr, sizeof (ip4_addr));
- }
-
- mp->mask_length = length;
- mp->number_of_ranges = vec_len (low_ports);
-
- clib_memcpy (mp->low_ports, low_ports, vec_len(low_ports));
- vec_free(low_ports);
-
- clib_memcpy (mp->high_ports, high_ports, vec_len(high_ports));
- vec_free (high_ports);
-
- mp->vrf_id = ntohl(vrf_id);
-
- S; W;
- /* NOTREACHED */
- return 0;
+ if (vec_len (low_ports) == 0)
+ {
+ errmsg ("At least one port or port range required\n");
+ return -99;
+ }
+
+ M (IP_SOURCE_AND_PORT_RANGE_CHECK_ADD_DEL,
+ ip_source_and_port_range_check_add_del);
+
+ mp->is_add = is_add;
+
+ if (is_ipv6)
+ {
+ mp->is_ipv6 = 1;
+ clib_memcpy (mp->address, &ip6_addr, sizeof (ip6_addr));
+ }
+ else
+ {
+ mp->is_ipv6 = 0;
+ clib_memcpy (mp->address, &ip4_addr, sizeof (ip4_addr));
+ }
+
+ mp->mask_length = length;
+ mp->number_of_ranges = vec_len (low_ports);
+
+ clib_memcpy (mp->low_ports, low_ports, vec_len (low_ports));
+ vec_free (low_ports);
+
+ clib_memcpy (mp->high_ports, high_ports, vec_len (high_ports));
+ vec_free (high_ports);
+
+ mp->vrf_id = ntohl (vrf_id);
+
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-int api_ip_source_and_port_range_check_interface_add_del (vat_main_t * vam)
+int
+api_ip_source_and_port_range_check_interface_add_del (vat_main_t * vam)
{
- unformat_input_t * input = vam->input;
- vl_api_ip_source_and_port_range_check_interface_add_del_t *mp;
- f64 timeout;
- u32 sw_if_index = ~0;
- int vrf_set = 0;
- u32 tcp_out_vrf_id = ~0, udp_out_vrf_id = ~0;
- u32 tcp_in_vrf_id = ~0, udp_in_vrf_id = ~0;
- u8 is_add = 1;
+ unformat_input_t *input = vam->input;
+ vl_api_ip_source_and_port_range_check_interface_add_del_t *mp;
+ f64 timeout;
+ u32 sw_if_index = ~0;
+ int vrf_set = 0;
+ u32 tcp_out_vrf_id = ~0, udp_out_vrf_id = ~0;
+ u32 tcp_in_vrf_id = ~0, udp_in_vrf_id = ~0;
+ u8 is_add = 1;
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (input, "%U", unformat_sw_if_index, vam, &sw_if_index))
- ;
- else if (unformat (input, "sw_if_index %d", &sw_if_index))
- ;
- else if (unformat (input, "tcp-out-vrf %d", &tcp_out_vrf_id))
- vrf_set=1;
- else if (unformat (input, "udp-out-vrf %d", &udp_out_vrf_id))
- vrf_set=1;
- else if (unformat (input, "tcp-in-vrf %d", &tcp_in_vrf_id))
- vrf_set=1;
- else if (unformat (input, "udp-in-vrf %d", &udp_in_vrf_id))
- vrf_set=1;
- else if (unformat (input, "del"))
- is_add = 0;
- else
- break;
- }
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ ;
+ else if (unformat (input, "sw_if_index %d", &sw_if_index))
+ ;
+ else if (unformat (input, "tcp-out-vrf %d", &tcp_out_vrf_id))
+ vrf_set = 1;
+ else if (unformat (input, "udp-out-vrf %d", &udp_out_vrf_id))
+ vrf_set = 1;
+ else if (unformat (input, "tcp-in-vrf %d", &tcp_in_vrf_id))
+ vrf_set = 1;
+ else if (unformat (input, "udp-in-vrf %d", &udp_in_vrf_id))
+ vrf_set = 1;
+ else if (unformat (input, "del"))
+ is_add = 0;
+ else
+ break;
+ }
- if (sw_if_index == ~0) {
- errmsg ("Interface required but not specified\n");
- return -99;
+ if (sw_if_index == ~0)
+ {
+ errmsg ("Interface required but not specified\n");
+ return -99;
}
- if (vrf_set == 0) {
- errmsg ("VRF ID required but not specified\n");
- return -99;
+ if (vrf_set == 0)
+ {
+ errmsg ("VRF ID required but not specified\n");
+ return -99;
}
- if (tcp_out_vrf_id == 0
- || udp_out_vrf_id == 0
- || tcp_in_vrf_id == 0
- || udp_in_vrf_id == 0) {
- errmsg ("VRF ID should not be default. Should be distinct VRF for this purpose.\n");
- return -99;
+ if (tcp_out_vrf_id == 0
+ || udp_out_vrf_id == 0 || tcp_in_vrf_id == 0 || udp_in_vrf_id == 0)
+ {
+ errmsg
+ ("VRF ID should not be default. Should be distinct VRF for this purpose.\n");
+ return -99;
}
- /* Construct the API message */
- M(IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL, ip_source_and_port_range_check_interface_add_del);
+ /* Construct the API message */
+ M (IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL,
+ ip_source_and_port_range_check_interface_add_del);
- mp->sw_if_index = ntohl (sw_if_index);
- mp->is_add = is_add;
- mp->tcp_out_vrf_id = ntohl (tcp_out_vrf_id);
- mp->udp_out_vrf_id = ntohl (udp_out_vrf_id);
- mp->tcp_in_vrf_id = ntohl (tcp_in_vrf_id);
- mp->udp_in_vrf_id = ntohl (udp_in_vrf_id);
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->is_add = is_add;
+ mp->tcp_out_vrf_id = ntohl (tcp_out_vrf_id);
+ mp->udp_out_vrf_id = ntohl (udp_out_vrf_id);
+ mp->tcp_in_vrf_id = ntohl (tcp_in_vrf_id);
+ mp->udp_in_vrf_id = ntohl (udp_in_vrf_id);
- /* send it... */
- S;
+ /* send it... */
+ S;
- /* Wait for a reply... */
- W;
+ /* Wait for a reply... */
+ W;
}
-static int q_or_quit (vat_main_t * vam)
+static int
+q_or_quit (vat_main_t * vam)
{
- longjmp (vam->jump_buf, 1);
- return 0; /* not so much */
+ longjmp (vam->jump_buf, 1);
+ return 0; /* not so much */
}
-static int q (vat_main_t * vam) {return q_or_quit (vam);}
-static int quit (vat_main_t * vam) {return q_or_quit (vam);}
-static int comment (vat_main_t * vam)
+static int
+q (vat_main_t * vam)
{
- return 0;
+ return q_or_quit (vam);
}
-static int cmd_cmp (void * a1, void * a2)
+static int
+quit (vat_main_t * vam)
{
- u8 ** c1 = a1;
- u8 ** c2 = a2;
+ return q_or_quit (vam);
+}
- return strcmp ((char *)(c1[0]), (char *)(c2[0]));
+static int
+comment (vat_main_t * vam)
+{
+ return 0;
}
-static int help (vat_main_t * vam)
+static int
+cmd_cmp (void *a1, void *a2)
{
- u8 ** cmds = 0;
- u8 * name = 0;
- hash_pair_t * p;
- unformat_input_t * i = vam->input;
- int j;
+ u8 **c1 = a1;
+ u8 **c2 = a2;
- if (unformat (i, "%s", &name)) {
- uword *hs;
+ return strcmp ((char *) (c1[0]), (char *) (c2[0]));
+}
- vec_add1(name, 0);
+static int
+help (vat_main_t * vam)
+{
+ u8 **cmds = 0;
+ u8 *name = 0;
+ hash_pair_t *p;
+ unformat_input_t *i = vam->input;
+ int j;
- hs = hash_get_mem (vam->help_by_name, name);
- if (hs)
- fformat (vam->ofp, "usage: %s %s\n", name, hs[0]);
- else
- fformat (vam->ofp, "No such msg / command '%s'\n", name);
- vec_free(name);
- return 0;
+ if (unformat (i, "%s", &name))
+ {
+ uword *hs;
+
+ vec_add1 (name, 0);
+
+ hs = hash_get_mem (vam->help_by_name, name);
+ if (hs)
+ fformat (vam->ofp, "usage: %s %s\n", name, hs[0]);
+ else
+ fformat (vam->ofp, "No such msg / command '%s'\n", name);
+ vec_free (name);
+ return 0;
}
- fformat(vam->ofp, "Help is available for the following:\n");
+ fformat (vam->ofp, "Help is available for the following:\n");
+ /* *INDENT-OFF* */
hash_foreach_pair (p, vam->function_by_name,
({
- vec_add1 (cmds, (u8 *)(p->key));
+ vec_add1 (cmds, (u8 *)(p->key));
}));
+ /* *INDENT-ON* */
- vec_sort_with_function (cmds, cmd_cmp);
+ vec_sort_with_function (cmds, cmd_cmp);
- for (j = 0; j < vec_len(cmds); j++)
- fformat (vam->ofp, "%s\n", cmds[j]);
+ for (j = 0; j < vec_len (cmds); j++)
+ fformat (vam->ofp, "%s\n", cmds[j]);
- vec_free (cmds);
- return 0;
+ vec_free (cmds);
+ return 0;
}
-static int set (vat_main_t * vam)
+static int
+set (vat_main_t * vam)
{
- u8 * name = 0, * value = 0;
- unformat_input_t * i = vam->input;
+ u8 *name = 0, *value = 0;
+ unformat_input_t *i = vam->input;
- if (unformat (i, "%s", &name)) {
- /* The input buffer is a vector, not a string. */
- value = vec_dup (i->buffer);
- vec_delete (value, i->index, 0);
- /* Almost certainly has a trailing newline */
- if (value[vec_len(value)-1] == '\n')
- value[vec_len(value)-1] = 0;
- /* Make sure it's a proper string, one way or the other */
- vec_add1 (value, 0);
- (void) clib_macro_set_value (&vam->macro_main,
- (char *)name, (char *)value);
+ if (unformat (i, "%s", &name))
+ {
+ /* The input buffer is a vector, not a string. */
+ value = vec_dup (i->buffer);
+ vec_delete (value, i->index, 0);
+ /* Almost certainly has a trailing newline */
+ if (value[vec_len (value) - 1] == '\n')
+ value[vec_len (value) - 1] = 0;
+ /* Make sure it's a proper string, one way or the other */
+ vec_add1 (value, 0);
+ (void) clib_macro_set_value (&vam->macro_main,
+ (char *) name, (char *) value);
}
- else
- errmsg ("usage: set <name> <value>\n");
+ else
+ errmsg ("usage: set <name> <value>\n");
- vec_free (name);
- vec_free (value);
- return 0;
+ vec_free (name);
+ vec_free (value);
+ return 0;
}
-static int unset (vat_main_t * vam)
+static int
+unset (vat_main_t * vam)
{
- u8 * name = 0;
+ u8 *name = 0;
- if (unformat (vam->input, "%s", &name))
- if (clib_macro_unset (&vam->macro_main, (char *)name) == 1)
- errmsg ("unset: %s wasn't set\n", name);
- vec_free (name);
- return 0;
+ if (unformat (vam->input, "%s", &name))
+ if (clib_macro_unset (&vam->macro_main, (char *) name) == 1)
+ errmsg ("unset: %s wasn't set\n", name);
+ vec_free (name);
+ return 0;
}
-typedef struct {
- u8 * name;
- u8 * value;
+typedef struct
+{
+ u8 *name;
+ u8 *value;
} macro_sort_t;
-static int macro_sort_cmp (void * a1, void * a2)
+static int
+macro_sort_cmp (void *a1, void *a2)
{
- macro_sort_t * s1 = a1;
- macro_sort_t * s2 = a2;
+ macro_sort_t *s1 = a1;
+ macro_sort_t *s2 = a2;
- return strcmp ((char *)(s1->name), (char *)(s2->name));
+ return strcmp ((char *) (s1->name), (char *) (s2->name));
}
-static int dump_macro_table (vat_main_t * vam)
+static int
+dump_macro_table (vat_main_t * vam)
{
- macro_sort_t * sort_me = 0, * sm;
- int i;
- hash_pair_t * p;
+ macro_sort_t *sort_me = 0, *sm;
+ int i;
+ hash_pair_t *p;
+ /* *INDENT-OFF* */
hash_foreach_pair (p, vam->macro_main.the_value_table_hash,
({
- vec_add2 (sort_me, sm, 1);
- sm->name = (u8 *)(p->key);
- sm->value = (u8 *) (p->value[0]);
+ vec_add2 (sort_me, sm, 1);
+ sm->name = (u8 *)(p->key);
+ sm->value = (u8 *) (p->value[0]);
}));
+ /* *INDENT-ON* */
- vec_sort_with_function (sort_me, macro_sort_cmp);
+ vec_sort_with_function (sort_me, macro_sort_cmp);
- if (vec_len(sort_me))
- fformat (vam->ofp, "%-15s%s\n", "Name", "Value");
- else
- fformat (vam->ofp, "The macro table is empty...\n");
+ if (vec_len (sort_me))
+ fformat (vam->ofp, "%-15s%s\n", "Name", "Value");
+ else
+ fformat (vam->ofp, "The macro table is empty...\n");
- for (i = 0; i < vec_len (sort_me); i++)
- fformat (vam->ofp, "%-15s%s\n", sort_me[i].name,
- sort_me[i].value);
- return 0;
+ for (i = 0; i < vec_len (sort_me); i++)
+ fformat (vam->ofp, "%-15s%s\n", sort_me[i].name, sort_me[i].value);
+ return 0;
}
-static int dump_node_table (vat_main_t * vam)
+static int
+dump_node_table (vat_main_t * vam)
{
- int i, j;
- vlib_node_t * node, * next_node;
+ int i, j;
+ vlib_node_t *node, *next_node;
- if (vec_len (vam->graph_nodes) == 0) {
- fformat (vam->ofp, "Node table empty, issue get_node_graph...\n");
- return 0;
+ if (vec_len (vam->graph_nodes) == 0)
+ {
+ fformat (vam->ofp, "Node table empty, issue get_node_graph...\n");
+ return 0;
}
- for (i = 0; i < vec_len (vam->graph_nodes); i++) {
- node = vam->graph_nodes[i];
- fformat (vam->ofp, "[%d] %s\n", i, node->name);
- for (j = 0; j < vec_len (node->next_nodes); j++) {
- if (node->next_nodes[j] != ~0) {
- next_node = vam->graph_nodes[node->next_nodes[j]];
- fformat (vam->ofp, " [%d] %s\n", j, next_node->name);
- }
- }
+ for (i = 0; i < vec_len (vam->graph_nodes); i++)
+ {
+ node = vam->graph_nodes[i];
+ fformat (vam->ofp, "[%d] %s\n", i, node->name);
+ for (j = 0; j < vec_len (node->next_nodes); j++)
+ {
+ if (node->next_nodes[j] != ~0)
+ {
+ next_node = vam->graph_nodes[node->next_nodes[j]];
+ fformat (vam->ofp, " [%d] %s\n", j, next_node->name);
+ }
+ }
}
- return 0;
+ return 0;
}
-static int search_node_table (vat_main_t * vam)
-{
- unformat_input_t * line_input = vam->input;
- u8 * node_to_find;
- int j;
- vlib_node_t * node, * next_node;
- uword * p;
-
- if (vam->graph_node_index_by_name == 0) {
- fformat (vam->ofp, "Node table empty, issue get_node_graph...\n");
- return 0;
- }
-
- while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
- if (unformat (line_input, "%s", &node_to_find)) {
- vec_add1 (node_to_find, 0);
- p = hash_get_mem (vam->graph_node_index_by_name, node_to_find);
- if (p == 0) {
- fformat (vam->ofp, "%s not found...\n", node_to_find);
- goto out;
- }
- node = vam->graph_nodes[p[0]];
- fformat (vam->ofp, "[%d] %s\n", p[0], node->name);
- for (j = 0; j < vec_len (node->next_nodes); j++) {
- if (node->next_nodes[j] != ~0) {
- next_node = vam->graph_nodes[node->next_nodes[j]];
- fformat (vam->ofp, " [%d] %s\n", j, next_node->name);
- }
- }
- }
-
- else {
- clib_warning ("parse error '%U'", format_unformat_error,
- line_input);
- return -99;
- }
+static int
+search_node_table (vat_main_t * vam)
+{
+ unformat_input_t *line_input = vam->input;
+ u8 *node_to_find;
+ int j;
+ vlib_node_t *node, *next_node;
+ uword *p;
+
+ if (vam->graph_node_index_by_name == 0)
+ {
+ fformat (vam->ofp, "Node table empty, issue get_node_graph...\n");
+ return 0;
+ }
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (line_input, "%s", &node_to_find))
+ {
+ vec_add1 (node_to_find, 0);
+ p = hash_get_mem (vam->graph_node_index_by_name, node_to_find);
+ if (p == 0)
+ {
+ fformat (vam->ofp, "%s not found...\n", node_to_find);
+ goto out;
+ }
+ node = vam->graph_nodes[p[0]];
+ fformat (vam->ofp, "[%d] %s\n", p[0], node->name);
+ for (j = 0; j < vec_len (node->next_nodes); j++)
+ {
+ if (node->next_nodes[j] != ~0)
+ {
+ next_node = vam->graph_nodes[node->next_nodes[j]];
+ fformat (vam->ofp, " [%d] %s\n", j, next_node->name);
+ }
+ }
+ }
+
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error,
+ line_input);
+ return -99;
+ }
out:
- vec_free(node_to_find);
+ vec_free (node_to_find);
}
- return 0;
+ return 0;
}
-static int script (vat_main_t * vam)
+static int
+script (vat_main_t * vam)
{
- u8 * s = 0;
- char * save_current_file;
- unformat_input_t save_input;
- jmp_buf save_jump_buf;
- u32 save_line_number;
+ u8 *s = 0;
+ char *save_current_file;
+ unformat_input_t save_input;
+ jmp_buf save_jump_buf;
+ u32 save_line_number;
- FILE * new_fp, * save_ifp;
+ FILE *new_fp, *save_ifp;
- if (unformat (vam->input, "%s", &s)) {
- new_fp = fopen ((char *)s, "r");
- if (new_fp == 0) {
- errmsg ("Couldn't open script file %s\n", s);
- vec_free (s);
- return -99;
- }
- } else {
- errmsg ("Missing script name\n");
- return -99;
+ if (unformat (vam->input, "%s", &s))
+ {
+ new_fp = fopen ((char *) s, "r");
+ if (new_fp == 0)
+ {
+ errmsg ("Couldn't open script file %s\n", s);
+ vec_free (s);
+ return -99;
+ }
+ }
+ else
+ {
+ errmsg ("Missing script name\n");
+ return -99;
}
- clib_memcpy (&save_input, &vam->input, sizeof (save_input));
- clib_memcpy (&save_jump_buf, &vam->jump_buf, sizeof (save_jump_buf));
- save_ifp = vam->ifp;
- save_line_number = vam->input_line_number;
- save_current_file = (char *) vam->current_file;
+ clib_memcpy (&save_input, &vam->input, sizeof (save_input));
+ clib_memcpy (&save_jump_buf, &vam->jump_buf, sizeof (save_jump_buf));
+ save_ifp = vam->ifp;
+ save_line_number = vam->input_line_number;
+ save_current_file = (char *) vam->current_file;
- vam->input_line_number = 0;
- vam->ifp = new_fp;
- vam->current_file = s;
- do_one_file (vam);
+ vam->input_line_number = 0;
+ vam->ifp = new_fp;
+ vam->current_file = s;
+ do_one_file (vam);
- clib_memcpy (&vam->input, &save_input, sizeof (vam->input));
- clib_memcpy (&vam->jump_buf, &save_jump_buf, sizeof (save_jump_buf));
- vam->ifp = save_ifp;
- vam->input_line_number = save_line_number;
- vam->current_file = (u8 *) save_current_file;
- vec_free (s);
+ clib_memcpy (&vam->input, &save_input, sizeof (vam->input));
+ clib_memcpy (&vam->jump_buf, &save_jump_buf, sizeof (save_jump_buf));
+ vam->ifp = save_ifp;
+ vam->input_line_number = save_line_number;
+ vam->current_file = (u8 *) save_current_file;
+ vec_free (s);
- return 0;
+ return 0;
}
-static int echo (vat_main_t * vam)
+static int
+echo (vat_main_t * vam)
{
- fformat (vam->ofp, "%v", vam->input->buffer);
- return 0;
+ fformat (vam->ofp, "%v", vam->input->buffer);
+ return 0;
}
/* List of API message constructors, CLI names map to api_xxx */
@@ -14187,7 +15489,8 @@ _(unset, "usage: unset <variable-name>")
foreach_vpe_api_reply_msg;
#undef _
-void vat_api_hookup (vat_main_t *vam)
+void
+vat_api_hookup (vat_main_t * vam)
{
#define _(N,n) \
vl_msg_api_set_handlers(VL_API_##N, #n, \
@@ -14196,38 +15499,35 @@ void vat_api_hookup (vat_main_t *vam)
vl_api_##n##_t_endian, \
vl_api_##n##_t_print, \
sizeof(vl_api_##n##_t), 1);
- foreach_vpe_api_reply_msg;
+ foreach_vpe_api_reply_msg;
#undef _
- vl_msg_api_set_first_available_msg_id (VL_MSG_FIRST_AVAILABLE);
+ vl_msg_api_set_first_available_msg_id (VL_MSG_FIRST_AVAILABLE);
- vam->sw_if_index_by_interface_name =
- hash_create_string (0, sizeof (uword));
+ vam->sw_if_index_by_interface_name = hash_create_string (0, sizeof (uword));
- vam->function_by_name =
- hash_create_string (0, sizeof(uword));
+ vam->function_by_name = hash_create_string (0, sizeof (uword));
- vam->help_by_name =
- hash_create_string (0, sizeof(uword));
+ vam->help_by_name = hash_create_string (0, sizeof (uword));
- /* API messages we can send */
+ /* API messages we can send */
#define _(n,h) hash_set_mem (vam->function_by_name, #n, api_##n);
- foreach_vpe_api_msg;
+ foreach_vpe_api_msg;
#undef _
- /* Help strings */
+ /* Help strings */
#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
- foreach_vpe_api_msg;
+ foreach_vpe_api_msg;
#undef _
- /* CLI functions */
+ /* CLI functions */
#define _(n,h) hash_set_mem (vam->function_by_name, #n, n);
- foreach_cli_function;
+ foreach_cli_function;
#undef _
- /* Help strings */
+ /* Help strings */
#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
- foreach_cli_function;
+ foreach_cli_function;
#undef _
}
@@ -14236,11 +15536,20 @@ void vat_api_hookup (vat_main_t *vam)
#include <vpp-api/vpe.api.h>
#undef vl_api_version
-void vl_client_add_api_signatures (vl_api_memclnt_create_t *mp)
+void
+vl_client_add_api_signatures (vl_api_memclnt_create_t * mp)
{
- /*
- * Send the main API signature in slot 0. This bit of code must
- * match the checks in ../vpe/api/api.c: vl_msg_api_version_check().
- */
- mp->api_versions[0] = clib_host_to_net_u32 (vpe_api_version);
+ /*
+ * Send the main API signature in slot 0. This bit of code must
+ * match the checks in ../vpe/api/api.c: vl_msg_api_version_check().
+ */
+ mp->api_versions[0] = clib_host_to_net_u32 (vpe_api_version);
}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/vpp-api-test/vat/json_format.c b/vpp-api-test/vat/json_format.c
index 70447ed916c..6f316d972eb 100644
--- a/vpp-api-test/vat/json_format.c
+++ b/vpp-api-test/vat/json_format.c
@@ -24,22 +24,25 @@
#define VAT_TAB_WIDTH 2
-typedef struct vat_print_ctx_s {
- FILE *ofp;
- u32 indent;
+typedef struct vat_print_ctx_s
+{
+ FILE *ofp;
+ u32 indent;
} vat_print_ctx_t;
/* Format an IP4 address. */
-static u8 * vat_json_format_ip4_address (u8 * s, va_list * args)
+static u8 *
+vat_json_format_ip4_address (u8 * s, va_list * args)
{
- u8 * a = va_arg (*args, u8 *);
+ u8 *a = va_arg (*args, u8 *);
return format (s, "%d.%d.%d.%d", a[0], a[1], a[2], a[3]);
}
/* Format an IP6 address. */
-static u8 * vat_json_format_ip6_address (u8 * s, va_list * args)
+static u8 *
+vat_json_format_ip6_address (u8 * s, va_list * args)
{
- ip6_address_t * a = va_arg (*args, ip6_address_t *);
+ ip6_address_t *a = va_arg (*args, ip6_address_t *);
u32 i, i_max_n_zero, max_n_zeros, i_first_zero, n_zeros, last_double_colon;
i_max_n_zero = ARRAY_LEN (a->as_u16);
@@ -50,77 +53,79 @@ static u8 * vat_json_format_ip6_address (u8 * s, va_list * args)
{
u32 is_zero = a->as_u16[i] == 0;
if (is_zero && i_first_zero >= ARRAY_LEN (a->as_u16))
- {
- i_first_zero = i;
- n_zeros = 0;
- }
+ {
+ i_first_zero = i;
+ n_zeros = 0;
+ }
n_zeros += is_zero;
- if ((! is_zero && n_zeros > max_n_zeros)
- || (i + 1 >= ARRAY_LEN (a->as_u16) && n_zeros > max_n_zeros))
- {
- i_max_n_zero = i_first_zero;
- max_n_zeros = n_zeros;
- i_first_zero = ARRAY_LEN (a->as_u16);
- n_zeros = 0;
- }
+ if ((!is_zero && n_zeros > max_n_zeros)
+ || (i + 1 >= ARRAY_LEN (a->as_u16) && n_zeros > max_n_zeros))
+ {
+ i_max_n_zero = i_first_zero;
+ max_n_zeros = n_zeros;
+ i_first_zero = ARRAY_LEN (a->as_u16);
+ n_zeros = 0;
+ }
}
last_double_colon = 0;
for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
{
if (i == i_max_n_zero && max_n_zeros > 1)
- {
- s = format (s, "::");
- i += max_n_zeros - 1;
- last_double_colon = 1;
- }
+ {
+ s = format (s, "::");
+ i += max_n_zeros - 1;
+ last_double_colon = 1;
+ }
else
- {
- s = format (s, "%s%x",
- (last_double_colon || i == 0) ? "" : ":",
- clib_net_to_host_u16 (a->as_u16[i]));
- last_double_colon = 0;
- }
+ {
+ s = format (s, "%s%x",
+ (last_double_colon || i == 0) ? "" : ":",
+ clib_net_to_host_u16 (a->as_u16[i]));
+ last_double_colon = 0;
+ }
}
return s;
}
static void
-vat_json_indent_print (vat_print_ctx_t *ctx)
+vat_json_indent_print (vat_print_ctx_t * ctx)
{
- int i;
- for (i=0; i<ctx->indent * VAT_TAB_WIDTH; i++) {
- fformat(ctx->ofp, " ");
+ int i;
+ for (i = 0; i < ctx->indent * VAT_TAB_WIDTH; i++)
+ {
+ fformat (ctx->ofp, " ");
}
}
static void
-vat_json_indent_line (vat_print_ctx_t * ctx, char * fmt, ...)
+vat_json_indent_line (vat_print_ctx_t * ctx, char *fmt, ...)
{
- va_list va;
+ va_list va;
- vat_json_indent_print(ctx);
- va_start(va, fmt);
- va_fformat(ctx->ofp, fmt, &va);
- va_end(va);
+ vat_json_indent_print (ctx);
+ va_start (va, fmt);
+ va_fformat (ctx->ofp, fmt, &va);
+ va_end (va);
}
static u8
is_num_only (vat_json_node_t * p)
{
- vat_json_node_t * elem;
- vec_foreach(elem, p) {
- if (VAT_JSON_INT != elem->type &&
- VAT_JSON_UINT != elem->type) {
- return 0;
- }
- }
- return 1;
+ vat_json_node_t *elem;
+ vec_foreach (elem, p)
+ {
+ if (VAT_JSON_INT != elem->type && VAT_JSON_UINT != elem->type)
+ {
+ return 0;
+ }
+ }
+ return 1;
}
static void
-vat_json_print_internal (vat_print_ctx_t *ctx, vat_json_node_t *node)
+vat_json_print_internal (vat_print_ctx_t * ctx, vat_json_node_t * node)
{
#define P(fmt,...) fformat(ctx->ofp, fmt, ##__VA_ARGS__)
#define PL(fmt,...) fformat(ctx->ofp, fmt"\n", ##__VA_ARGS__)
@@ -129,85 +134,106 @@ vat_json_print_internal (vat_print_ctx_t *ctx, vat_json_node_t *node)
#define INCR (ctx->indent++)
#define DECR (ctx->indent--)
- vat_json_pair_t *pair;
- u32 i, count;
- vat_json_node_t *elem;
- u8 num_only = 0;
+ vat_json_pair_t *pair;
+ u32 i, count;
+ vat_json_node_t *elem;
+ u8 num_only = 0;
- if (!node) {
- return;
+ if (!node)
+ {
+ return;
}
- switch (node->type) {
+ switch (node->type)
+ {
case VAT_JSON_OBJECT:
- count = vec_len(node->pairs);
- if (count >= 1) {
- PL("{");
- INCR;
- for (i=0; i<count; i++) {
- pair = &node->pairs[i];
- PP("\"%s\": ", pair->name);
- vat_json_print_internal(ctx, &pair->value);
- if (i < count - 1) {
- P(",");
- }
- PL();
- }
- DECR;
- PP("}");
- } else { P("{}"); }
- break;
+ count = vec_len (node->pairs);
+ if (count >= 1)
+ {
+ PL ("{");
+ INCR;
+ for (i = 0; i < count; i++)
+ {
+ pair = &node->pairs[i];
+ PP ("\"%s\": ", pair->name);
+ vat_json_print_internal (ctx, &pair->value);
+ if (i < count - 1)
+ {
+ P (",");
+ }
+ PL ();
+ }
+ DECR;
+ PP ("}");
+ }
+ else
+ {
+ P ("{}");
+ }
+ break;
case VAT_JSON_ARRAY:
- num_only = is_num_only(node->array);
- count = vec_len(node->array);
- if (count >= 1) {
- if (num_only)
- P("[");
- else
- PL("[ ");
- INCR;
- for (i=0; i<count; i++) {
- elem = &node->array[i];
- if (!num_only) {
- vat_json_indent_print(ctx);
- }
- vat_json_print_internal(ctx, elem);
- if (i < count - 1) {
- if (num_only) {
- P(", ");
- } else {
- P(",");
- }
- }
- if (!num_only) PL();
- }
- DECR;
- if (!num_only)
- PP("]");
- else
- P("]");
- } else { P("[]"); }
- break;
+ num_only = is_num_only (node->array);
+ count = vec_len (node->array);
+ if (count >= 1)
+ {
+ if (num_only)
+ P ("[");
+ else
+ PL ("[ ");
+ INCR;
+ for (i = 0; i < count; i++)
+ {
+ elem = &node->array[i];
+ if (!num_only)
+ {
+ vat_json_indent_print (ctx);
+ }
+ vat_json_print_internal (ctx, elem);
+ if (i < count - 1)
+ {
+ if (num_only)
+ {
+ P (", ");
+ }
+ else
+ {
+ P (",");
+ }
+ }
+ if (!num_only)
+ PL ();
+ }
+ DECR;
+ if (!num_only)
+ PP ("]");
+ else
+ P ("]");
+ }
+ else
+ {
+ P ("[]");
+ }
+ break;
case VAT_JSON_INT:
- P("%d", node->sint);
- break;
+ P ("%d", node->sint);
+ break;
case VAT_JSON_UINT:
- P("%"PRIu64, node->uint);
- break;
+ P ("%" PRIu64, node->uint);
+ break;
case VAT_JSON_REAL:
- P("%f", node->real);
- break;
+ P ("%f", node->real);
+ break;
case VAT_JSON_STRING:
- P("\"%s\"", node->string);
- break;
+ P ("\"%s\"", node->string);
+ break;
case VAT_JSON_IPV4:
- P("\"%U\"", vat_json_format_ip4_address, &node->ip4);
- break;
+ P ("\"%U\"", vat_json_format_ip4_address, &node->ip4);
+ break;
case VAT_JSON_IPV6:
- P("\"%U\"", vat_json_format_ip6_address, &node->ip6);
- break;
+ P ("\"%U\"", vat_json_format_ip6_address, &node->ip6);
+ break;
default:
- break;
+ break;
}
#undef PPL
#undef PP
@@ -215,47 +241,64 @@ vat_json_print_internal (vat_print_ctx_t *ctx, vat_json_node_t *node)
#undef P
}
-void vat_json_print(FILE *ofp, vat_json_node_t *node)
+void
+vat_json_print (FILE * ofp, vat_json_node_t * node)
{
- vat_print_ctx_t ctx;
- memset(&ctx, 0, sizeof ctx);
- ctx.indent = 0;
- ctx.ofp = ofp;
- fformat(ofp, "\n");
- vat_json_print_internal(&ctx, node);
- fformat(ofp, "\n");
+ vat_print_ctx_t ctx;
+ memset (&ctx, 0, sizeof ctx);
+ ctx.indent = 0;
+ ctx.ofp = ofp;
+ fformat (ofp, "\n");
+ vat_json_print_internal (&ctx, node);
+ fformat (ofp, "\n");
}
-void vat_json_free (vat_json_node_t *node)
+void
+vat_json_free (vat_json_node_t * node)
{
- int i = 0;
+ int i = 0;
- if (NULL == node) {
- return;
+ if (NULL == node)
+ {
+ return;
}
- switch (node->type) {
+ switch (node->type)
+ {
case VAT_JSON_OBJECT:
- for (i = 0; i < vec_len(node->pairs); i++) {
- vat_json_free(&node->pairs[i].value);
- }
- if (NULL != node->pairs) {
- vec_free(node->pairs);
- }
- break;
+ for (i = 0; i < vec_len (node->pairs); i++)
+ {
+ vat_json_free (&node->pairs[i].value);
+ }
+ if (NULL != node->pairs)
+ {
+ vec_free (node->pairs);
+ }
+ break;
case VAT_JSON_ARRAY:
- for (i = 0; i < vec_len(node->array); i++) {
- vat_json_free(&node->array[i]);
- }
- if (NULL != node->array) {
- vec_free(node->array);
- }
- break;
+ for (i = 0; i < vec_len (node->array); i++)
+ {
+ vat_json_free (&node->array[i]);
+ }
+ if (NULL != node->array)
+ {
+ vec_free (node->array);
+ }
+ break;
case VAT_JSON_STRING:
- if (NULL != node->string) {
- vec_free(node->string);
- }
- break;
+ if (NULL != node->string)
+ {
+ vec_free (node->string);
+ }
+ break;
default:
- break;
+ break;
}
}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/vpp-api-test/vat/json_format.h b/vpp-api-test/vat/json_format.h
index 5a264d08df9..154fb3df04b 100644
--- a/vpp-api-test/vat/json_format.h
+++ b/vpp-api-test/vat/json_format.h
@@ -25,209 +25,230 @@
#include <netinet/ip.h>
/* JSON value type */
-typedef enum {
- VAT_JSON_NONE,
- VAT_JSON_OBJECT,
- VAT_JSON_ARRAY,
- VAT_JSON_STRING,
- VAT_JSON_REAL,
- VAT_JSON_UINT,
- VAT_JSON_INT,
- VAT_JSON_IPV4,
- VAT_JSON_IPV6,
- VAT_JSON_MAX
+typedef enum
+{
+ VAT_JSON_NONE,
+ VAT_JSON_OBJECT,
+ VAT_JSON_ARRAY,
+ VAT_JSON_STRING,
+ VAT_JSON_REAL,
+ VAT_JSON_UINT,
+ VAT_JSON_INT,
+ VAT_JSON_IPV4,
+ VAT_JSON_IPV6,
+ VAT_JSON_MAX
} vat_json_val_type_t;
typedef struct vat_json_node_s vat_json_node_t;
typedef struct vat_json_pair_s vat_json_pair_t;
/* JSON object structure */
-struct vat_json_node_s {
- vat_json_val_type_t type;
- union {
- vat_json_pair_t * pairs;
- vat_json_node_t * array;
- u8 * string;
- struct in_addr ip4;
- struct in6_addr ip6;
- u64 uint;
- i64 sint;
- f64 real;
- };
+struct vat_json_node_s
+{
+ vat_json_val_type_t type;
+ union
+ {
+ vat_json_pair_t *pairs;
+ vat_json_node_t *array;
+ u8 *string;
+ struct in_addr ip4;
+ struct in6_addr ip6;
+ u64 uint;
+ i64 sint;
+ f64 real;
+ };
};
-struct vat_json_pair_s {
- const char *name;
- vat_json_node_t value;
+struct vat_json_pair_s
+{
+ const char *name;
+ vat_json_node_t value;
};
-void vat_json_print(FILE *ofp, vat_json_node_t *node);
-void vat_json_free(vat_json_node_t *node);
+void vat_json_print (FILE * ofp, vat_json_node_t * node);
+void vat_json_free (vat_json_node_t * node);
-static_always_inline void vat_json_init_object(vat_json_node_t *json)
+static_always_inline void
+vat_json_init_object (vat_json_node_t * json)
{
- json->type = VAT_JSON_OBJECT;
- json->pairs = NULL;
+ json->type = VAT_JSON_OBJECT;
+ json->pairs = NULL;
}
-static_always_inline void vat_json_init_array(vat_json_node_t *json)
+static_always_inline void
+vat_json_init_array (vat_json_node_t * json)
{
- json->type = VAT_JSON_ARRAY;
- json->array = NULL;
+ json->type = VAT_JSON_ARRAY;
+ json->array = NULL;
}
-static_always_inline void vat_json_set_string(vat_json_node_t *json, u8 *str)
+static_always_inline void
+vat_json_set_string (vat_json_node_t * json, u8 * str)
{
- json->type = VAT_JSON_STRING;
- json->string = str;
+ json->type = VAT_JSON_STRING;
+ json->string = str;
}
-static_always_inline void vat_json_set_string_copy(vat_json_node_t *json,
- const u8 *str)
+static_always_inline void
+vat_json_set_string_copy (vat_json_node_t * json, const u8 * str)
{
- u8 * ns = NULL;
- vec_validate(ns, strlen((const char *)str));
- strcpy((char*)ns, (const char*)str);
- vec_add1(ns, '\0');
- vat_json_set_string(json, ns);
+ u8 *ns = NULL;
+ vec_validate (ns, strlen ((const char *) str));
+ strcpy ((char *) ns, (const char *) str);
+ vec_add1 (ns, '\0');
+ vat_json_set_string (json, ns);
}
-static_always_inline void vat_json_set_int(vat_json_node_t *json, i64 num)
+static_always_inline void
+vat_json_set_int (vat_json_node_t * json, i64 num)
{
- json->type = VAT_JSON_INT;
- json->sint = num;
+ json->type = VAT_JSON_INT;
+ json->sint = num;
}
-static_always_inline void vat_json_set_uint(vat_json_node_t *json, u64 num)
+static_always_inline void
+vat_json_set_uint (vat_json_node_t * json, u64 num)
{
- json->type = VAT_JSON_UINT;
- json->uint = num;
+ json->type = VAT_JSON_UINT;
+ json->uint = num;
}
-static_always_inline void vat_json_set_real(vat_json_node_t *json, f64 real)
+static_always_inline void
+vat_json_set_real (vat_json_node_t * json, f64 real)
{
- json->type = VAT_JSON_REAL;
- json->real = real;
+ json->type = VAT_JSON_REAL;
+ json->real = real;
}
-static_always_inline void vat_json_set_ip4(vat_json_node_t *json,
- struct in_addr ip4)
+static_always_inline void
+vat_json_set_ip4 (vat_json_node_t * json, struct in_addr ip4)
{
- json->type = VAT_JSON_IPV4;
- json->ip4 = ip4;
+ json->type = VAT_JSON_IPV4;
+ json->ip4 = ip4;
}
-static_always_inline void vat_json_set_ip6(vat_json_node_t *json,
- struct in6_addr ip6)
+static_always_inline void
+vat_json_set_ip6 (vat_json_node_t * json, struct in6_addr ip6)
{
- json->type = VAT_JSON_IPV6;
- json->ip6 = ip6;
+ json->type = VAT_JSON_IPV6;
+ json->ip6 = ip6;
}
-static_always_inline vat_json_node_t* vat_json_object_add(vat_json_node_t *json,
- const char *name)
+static_always_inline vat_json_node_t *
+vat_json_object_add (vat_json_node_t * json, const char *name)
{
- ASSERT(VAT_JSON_OBJECT == json->type);
- uword pos = vec_len(json->pairs);
- vec_validate(json->pairs, pos);
- json->pairs[pos].name = name;
- return &json->pairs[pos].value;
+ ASSERT (VAT_JSON_OBJECT == json->type);
+ uword pos = vec_len (json->pairs);
+ vec_validate (json->pairs, pos);
+ json->pairs[pos].name = name;
+ return &json->pairs[pos].value;
}
-static_always_inline vat_json_node_t* vat_json_array_add(vat_json_node_t *json)
+static_always_inline vat_json_node_t *
+vat_json_array_add (vat_json_node_t * json)
{
- ASSERT(VAT_JSON_ARRAY == json->type);
- uword pos = vec_len(json->array);
- vec_validate(json->array, pos);
- return &json->array[pos];
+ ASSERT (VAT_JSON_ARRAY == json->type);
+ uword pos = vec_len (json->array);
+ vec_validate (json->array, pos);
+ return &json->array[pos];
}
-static_always_inline vat_json_node_t* vat_json_object_add_list(vat_json_node_t *json,
- const char *name)
+static_always_inline vat_json_node_t *
+vat_json_object_add_list (vat_json_node_t * json, const char *name)
{
- vat_json_node_t *array_node = vat_json_object_add(json, name);
- vat_json_init_array(array_node);
- return array_node;
+ vat_json_node_t *array_node = vat_json_object_add (json, name);
+ vat_json_init_array (array_node);
+ return array_node;
}
-static_always_inline void vat_json_object_add_string_copy(vat_json_node_t *json,
- const char *name,
- u8 *str)
+static_always_inline void
+vat_json_object_add_string_copy (vat_json_node_t * json,
+ const char *name, u8 * str)
{
- vat_json_set_string_copy(vat_json_object_add(json, name), str);
+ vat_json_set_string_copy (vat_json_object_add (json, name), str);
}
-static_always_inline void vat_json_object_add_uint(vat_json_node_t *json,
- const char *name,
- u64 number)
+static_always_inline void
+vat_json_object_add_uint (vat_json_node_t * json,
+ const char *name, u64 number)
{
- vat_json_set_uint(vat_json_object_add(json, name), number);
+ vat_json_set_uint (vat_json_object_add (json, name), number);
}
-static_always_inline void vat_json_object_add_int(vat_json_node_t *json,
- const char *name,
- i64 number)
+static_always_inline void
+vat_json_object_add_int (vat_json_node_t * json, const char *name, i64 number)
{
- vat_json_set_int(vat_json_object_add(json, name), number);
+ vat_json_set_int (vat_json_object_add (json, name), number);
}
-static_always_inline void vat_json_object_add_real(vat_json_node_t *json,
- const char *name, f64 real)
+static_always_inline void
+vat_json_object_add_real (vat_json_node_t * json, const char *name, f64 real)
{
- vat_json_set_real(vat_json_object_add(json, name), real);
+ vat_json_set_real (vat_json_object_add (json, name), real);
}
-static_always_inline void vat_json_object_add_ip4(vat_json_node_t *json,
- const char *name,
- struct in_addr ip4)
+static_always_inline void
+vat_json_object_add_ip4 (vat_json_node_t * json,
+ const char *name, struct in_addr ip4)
{
- vat_json_set_ip4(vat_json_object_add(json, name), ip4);
+ vat_json_set_ip4 (vat_json_object_add (json, name), ip4);
}
-static_always_inline void vat_json_object_add_ip6(vat_json_node_t *json,
- const char *name,
- struct in6_addr ip6)
+static_always_inline void
+vat_json_object_add_ip6 (vat_json_node_t * json,
+ const char *name, struct in6_addr ip6)
{
- vat_json_set_ip6(vat_json_object_add(json, name), ip6);
+ vat_json_set_ip6 (vat_json_object_add (json, name), ip6);
}
-static_always_inline void vat_json_array_add_int(vat_json_node_t *json,
- i64 number)
+static_always_inline void
+vat_json_array_add_int (vat_json_node_t * json, i64 number)
{
- vat_json_set_int(vat_json_array_add(json), number);
+ vat_json_set_int (vat_json_array_add (json), number);
}
-static_always_inline void vat_json_array_add_uint(vat_json_node_t *json,
- u64 number)
+static_always_inline void
+vat_json_array_add_uint (vat_json_node_t * json, u64 number)
{
- vat_json_set_uint(vat_json_array_add(json), number);
+ vat_json_set_uint (vat_json_array_add (json), number);
}
-static_always_inline void vat_json_object_add_bytes(vat_json_node_t *json,
- const char *name,
- u8 *array, uword size)
+static_always_inline void
+vat_json_object_add_bytes (vat_json_node_t * json,
+ const char *name, u8 * array, uword size)
{
- ASSERT(VAT_JSON_OBJECT == json->type);
- vat_json_node_t *json_array = vat_json_object_add(json, name);
- vat_json_init_array(json_array);
- int i;
- for (i = 0; i < size; i++) {
- vat_json_array_add_uint(json_array, array[i]);
+ ASSERT (VAT_JSON_OBJECT == json->type);
+ vat_json_node_t *json_array = vat_json_object_add (json, name);
+ vat_json_init_array (json_array);
+ int i;
+ for (i = 0; i < size; i++)
+ {
+ vat_json_array_add_uint (json_array, array[i]);
}
}
-static_always_inline vat_json_node_t*
-vat_json_object_get_element(vat_json_node_t *json, const char *name)
+static_always_inline vat_json_node_t *
+vat_json_object_get_element (vat_json_node_t * json, const char *name)
{
- int i = 0;
+ int i = 0;
- ASSERT(VAT_JSON_OBJECT == json->type);
- for (i = 0; i < vec_len(json->pairs); i++) {
- if (0 == strcmp(json->pairs[i].name, name)) {
- return &json->pairs[i].value;
- }
+ ASSERT (VAT_JSON_OBJECT == json->type);
+ for (i = 0; i < vec_len (json->pairs); i++)
+ {
+ if (0 == strcmp (json->pairs[i].name, name))
+ {
+ return &json->pairs[i].value;
+ }
}
- return NULL;
+ return NULL;
}
#endif /* __JSON_FORMAT_H__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/vpp-api-test/vat/json_test.c b/vpp-api-test/vat/json_test.c
index da06941599e..46261694664 100644
--- a/vpp-api-test/vat/json_test.c
+++ b/vpp-api-test/vat/json_test.c
@@ -21,45 +21,55 @@
#include <vat/vat.h>
#include <vat/json_format.h>
-static void print_json_test(void)
+static void
+print_json_test (void)
{
- vat_json_node_t node;
+ vat_json_node_t node;
- vat_json_init_object(&node);
- vat_json_object_add_string_copy(&node, "str", (u8*)"string-value");
- vat_json_object_add_uint(&node, "ab", 127);
- vat_json_object_add_real(&node, "pi", 3.14159f);
- vat_json_print(stdout, &node);
- vat_json_free(&node);
+ vat_json_init_object (&node);
+ vat_json_object_add_string_copy (&node, "str", (u8 *) "string-value");
+ vat_json_object_add_uint (&node, "ab", 127);
+ vat_json_object_add_real (&node, "pi", 3.14159f);
+ vat_json_print (stdout, &node);
+ vat_json_free (&node);
- vat_json_init_object(&node);
- vat_json_node_t *a1 = vat_json_object_add(&node, "a1");
- vat_json_init_object(a1);
- vat_json_object_add_uint(a1, "b1", 512);
- vat_json_object_add_string_copy(a1, "b2", (u8*)"string");
+ vat_json_init_object (&node);
+ vat_json_node_t *a1 = vat_json_object_add (&node, "a1");
+ vat_json_init_object (a1);
+ vat_json_object_add_uint (a1, "b1", 512);
+ vat_json_object_add_string_copy (a1, "b2", (u8 *) "string");
- vat_json_object_add_int(&node, "a2", 2);
+ vat_json_object_add_int (&node, "a2", 2);
- vat_json_node_t *a3 = vat_json_object_add_list(&node, "a3");
- vat_json_init_array(a3);
- vat_json_array_add_uint(a3, 1);
- vat_json_array_add_int(a3, -2);
- vat_json_array_add_uint(a3, 3);
+ vat_json_node_t *a3 = vat_json_object_add_list (&node, "a3");
+ vat_json_init_array (a3);
+ vat_json_array_add_uint (a3, 1);
+ vat_json_array_add_int (a3, -2);
+ vat_json_array_add_uint (a3, 3);
- vat_json_init_object(vat_json_object_add(&node, "a4"));
+ vat_json_init_object (vat_json_object_add (&node, "a4"));
- struct in_addr ipv4 = {0};
- struct in6_addr ipv6 = {{{0}}};
+ struct in_addr ipv4 = { 0 };
+ struct in6_addr ipv6 = { {{0}} };
- vat_json_object_add_ip4(&node, "ipv4", ipv4);
- vat_json_object_add_ip6(&node, "ipv6", ipv6);
+ vat_json_object_add_ip4 (&node, "ipv4", ipv4);
+ vat_json_object_add_ip6 (&node, "ipv6", ipv6);
- vat_json_print(stdout, &node);
- vat_json_free(&node);
+ vat_json_print (stdout, &node);
+ vat_json_free (&node);
}
-int main(void)
+int
+main (void)
{
- print_json_test();
- return 0;
+ print_json_test ();
+ return 0;
}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/vpp-api-test/vat/main.c b/vpp-api-test/vat/main.c
index cde51fdbd12..904540b679e 100644
--- a/vpp-api-test/vat/main.c
+++ b/vpp-api-test/vat/main.c
@@ -17,269 +17,315 @@
vat_main_t vat_main;
-int connect_to_vpe(char *name)
+int
+connect_to_vpe (char *name)
{
- vat_main_t * vam = &vat_main;
- api_main_t * am = &api_main;
+ vat_main_t *vam = &vat_main;
+ api_main_t *am = &api_main;
- if (vl_client_connect_to_vlib("/vpe-api", name, 32) < 0)
- return -1;
-
- vam->vl_input_queue = am->shmem_hdr->vl_input_queue;
- vam->my_client_index = am->my_client_index;
+ if (vl_client_connect_to_vlib ("/vpe-api", name, 32) < 0)
+ return -1;
- return 0;
+ vam->vl_input_queue = am->shmem_hdr->vl_input_queue;
+ vam->my_client_index = am->my_client_index;
+
+ return 0;
}
-void vlib_cli_output(struct vlib_main_t * vm, char * fmt, ...)
-{ clib_warning ("BUG");}
+void
+vlib_cli_output (struct vlib_main_t *vm, char *fmt, ...)
+{
+ clib_warning ("BUG");
+}
-static u8 * format_api_error (u8 * s, va_list * args)
+static u8 *
+format_api_error (u8 * s, va_list * args)
{
- vat_main_t * vam = va_arg (*args, vat_main_t *);
- i32 error = va_arg (*args, u32);
- uword * p;
+ vat_main_t *vam = va_arg (*args, vat_main_t *);
+ i32 error = va_arg (*args, u32);
+ uword *p;
- p = hash_get (vam->error_string_by_error_number, -error);
+ p = hash_get (vam->error_string_by_error_number, -error);
- if (p)
- s = format (s, "%s", p[0]);
- else
- s = format (s, "%d", error);
- return s;
+ if (p)
+ s = format (s, "%s", p[0]);
+ else
+ s = format (s, "%d", error);
+ return s;
}
-void do_one_file (vat_main_t * vam)
+void
+do_one_file (vat_main_t * vam)
{
- int rv;
- int (*fp)(vat_main_t *vam);
- int arg_len;
- unformat_input_t _input;
- u8 *cmdp, *argsp;
- uword * p;
- u8 * this_cmd = 0;
-
- vam->input = &_input;
-
- /* Used by the "quit" command handler */
- if (setjmp (vam->jump_buf) != 0)
- return;
-
- while (1) {
- if (vam->ifp == stdin) {
- if (vam->exec_mode == 0)
- rv = write (1, "vat# ", 5);
- else
- rv = write (1, "exec# ", 6);
- }
-
- _vec_len(vam->inbuf) = 4096;
-
- if (fgets ((char *)vam->inbuf, vec_len(vam->inbuf), vam->ifp) == 0)
- break;
-
- vam->input_line_number ++;
-
- vec_free (this_cmd);
-
- this_cmd = (u8 *) clib_macro_eval (&vam->macro_main, (char *)vam->inbuf,
- 1 /* complain */);
-
- if (vam->exec_mode == 0) {
- /* Split input into cmd + args */
- cmdp = this_cmd;
-
- while (cmdp < (this_cmd + vec_len(this_cmd))) {
- if (*cmdp == ' ' || *cmdp == '\t' || *cmdp == '\n') {
- cmdp++;
- } else
- break;
- }
- argsp = cmdp;
- while (argsp < (this_cmd + vec_len(this_cmd))) {
- if (*argsp != ' ' && *argsp != '\t' && *argsp != '\n') {
- argsp++;
- } else
- break;
- }
- *argsp++ = 0;
- while (argsp < (this_cmd + vec_len(this_cmd))) {
- if (*argsp == ' ' || *argsp == '\t' || *argsp == '\n') {
- argsp++;
- } else
- break;
- }
-
-
- /* Blank input line? */
- if (*cmdp == 0)
- continue;
-
- p = hash_get_mem (vam->function_by_name, cmdp);
- if (p == 0) {
- errmsg ("'%s': function not found\n", cmdp);
- continue;
- }
-
- arg_len = strlen((char *) argsp);
-
- unformat_init_string (vam->input, (char *)argsp, arg_len);
- fp = (void *)p[0];
- } else {
- unformat_init_string (vam->input, (char *) this_cmd,
- strlen((char *) this_cmd));
- cmdp = this_cmd;
- fp = exec;
- }
-
- rv = (*fp)(vam);
- if (rv < 0)
- errmsg ("%s error: %U\n", cmdp, format_api_error, vam, rv);
- unformat_free (vam->input);
-
- if (vam->regenerate_interface_table) {
- vam->regenerate_interface_table = 0;
- api_sw_interface_dump (vam);
- }
+ int rv;
+ int (*fp) (vat_main_t * vam);
+ int arg_len;
+ unformat_input_t _input;
+ u8 *cmdp, *argsp;
+ uword *p;
+ u8 *this_cmd = 0;
+
+ vam->input = &_input;
+
+ /* Used by the "quit" command handler */
+ if (setjmp (vam->jump_buf) != 0)
+ return;
+
+ while (1)
+ {
+ if (vam->ifp == stdin)
+ {
+ if (vam->exec_mode == 0)
+ rv = write (1, "vat# ", 5);
+ else
+ rv = write (1, "exec# ", 6);
+ }
+
+ _vec_len (vam->inbuf) = 4096;
+
+ if (fgets ((char *) vam->inbuf, vec_len (vam->inbuf), vam->ifp) == 0)
+ break;
+
+ vam->input_line_number++;
+
+ vec_free (this_cmd);
+
+ this_cmd =
+ (u8 *) clib_macro_eval (&vam->macro_main, (char *) vam->inbuf,
+ 1 /* complain */ );
+
+ if (vam->exec_mode == 0)
+ {
+ /* Split input into cmd + args */
+ cmdp = this_cmd;
+
+ while (cmdp < (this_cmd + vec_len (this_cmd)))
+ {
+ if (*cmdp == ' ' || *cmdp == '\t' || *cmdp == '\n')
+ {
+ cmdp++;
+ }
+ else
+ break;
+ }
+ argsp = cmdp;
+ while (argsp < (this_cmd + vec_len (this_cmd)))
+ {
+ if (*argsp != ' ' && *argsp != '\t' && *argsp != '\n')
+ {
+ argsp++;
+ }
+ else
+ break;
+ }
+ *argsp++ = 0;
+ while (argsp < (this_cmd + vec_len (this_cmd)))
+ {
+ if (*argsp == ' ' || *argsp == '\t' || *argsp == '\n')
+ {
+ argsp++;
+ }
+ else
+ break;
+ }
+
+
+ /* Blank input line? */
+ if (*cmdp == 0)
+ continue;
+
+ p = hash_get_mem (vam->function_by_name, cmdp);
+ if (p == 0)
+ {
+ errmsg ("'%s': function not found\n", cmdp);
+ continue;
+ }
+
+ arg_len = strlen ((char *) argsp);
+
+ unformat_init_string (vam->input, (char *) argsp, arg_len);
+ fp = (void *) p[0];
+ }
+ else
+ {
+ unformat_init_string (vam->input, (char *) this_cmd,
+ strlen ((char *) this_cmd));
+ cmdp = this_cmd;
+ fp = exec;
+ }
+
+ rv = (*fp) (vam);
+ if (rv < 0)
+ errmsg ("%s error: %U\n", cmdp, format_api_error, vam, rv);
+ unformat_free (vam->input);
+
+ if (vam->regenerate_interface_table)
+ {
+ vam->regenerate_interface_table = 0;
+ api_sw_interface_dump (vam);
+ }
}
}
-static void init_error_string_table (vat_main_t * vam)
+static void
+init_error_string_table (vat_main_t * vam)
{
- vam->error_string_by_error_number = hash_create (0, sizeof(uword));
+ vam->error_string_by_error_number = hash_create (0, sizeof (uword));
#define _(n,v,s) hash_set (vam->error_string_by_error_number, -v, s);
- foreach_vnet_api_error;
+ foreach_vnet_api_error;
#undef _
- hash_set (vam->error_string_by_error_number, 99, "Misc");
+ hash_set (vam->error_string_by_error_number, 99, "Misc");
}
-static i8 *eval_current_file (macro_main_t *mm, i32 complain)
+static i8 *
+eval_current_file (macro_main_t * mm, i32 complain)
{
- vat_main_t * vam = &vat_main;
- return ((i8 *) format (0, "%s%c", vam->current_file, 0));
+ vat_main_t *vam = &vat_main;
+ return ((i8 *) format (0, "%s%c", vam->current_file, 0));
}
-static i8 *eval_current_line (macro_main_t *mm, i32 complain)
+static i8 *
+eval_current_line (macro_main_t * mm, i32 complain)
{
- vat_main_t * vam = &vat_main;
- return ((i8 *) format (0, "%d%c", vam->input_line_number, 0));
+ vat_main_t *vam = &vat_main;
+ return ((i8 *) format (0, "%d%c", vam->input_line_number, 0));
}
-int main (int argc, char ** argv)
+int
+main (int argc, char **argv)
{
- vat_main_t * vam = &vat_main;
- unformat_input_t _argv, *a = &_argv;
- u8 **input_files = 0;
- u8 *output_file = 0;
- u8 *chroot_prefix;
- u8 *this_input_file;
- u8 interactive = 1;
- u8 json_output = 0;
- u8 * heap;
- mheap_t * h;
- int i;
-
- clib_mem_init (0, 128<<20);
-
- heap = clib_mem_get_per_cpu_heap();
- h = mheap_header (heap);
-
- /* make the main heap thread-safe */
- h->flags |= MHEAP_FLAG_THREAD_SAFE;
-
- clib_macro_init (&vam->macro_main);
- clib_macro_add_builtin (&vam->macro_main, "current_file", eval_current_file);
- clib_macro_add_builtin (&vam->macro_main, "current_line", eval_current_line);
-
- init_error_string_table (vam);
-
- unformat_init_command_line (a, argv);
-
- while (unformat_check_input(a) != UNFORMAT_END_OF_INPUT) {
- if (unformat (a, "in %s", &this_input_file))
- vec_add1 (input_files, this_input_file);
- else if (unformat (a, "out %s", &output_file))
- ;
- else if (unformat (a, "script"))
- interactive = 0;
- else if (unformat (a, "json"))
- json_output = 1;
- else if (unformat (a, "plugin_path %s", (u8 *)&vat_plugin_path))
- vec_add1 (vat_plugin_path, 0);
- else if (unformat (a, "plugin_name_filter %s",
- (u8 *)&vat_plugin_name_filter))
- vec_add1 (vat_plugin_name_filter, 0);
- else if (unformat (a, "chroot prefix %s", &chroot_prefix)) {
- vl_set_memory_root_path ((char *)chroot_prefix);
- } else {
- fformat (stderr,
- "%s: usage [in <f1> ... in <fn>] [out <fn>] [script] [json]\n");
- exit (1);
- }
+ vat_main_t *vam = &vat_main;
+ unformat_input_t _argv, *a = &_argv;
+ u8 **input_files = 0;
+ u8 *output_file = 0;
+ u8 *chroot_prefix;
+ u8 *this_input_file;
+ u8 interactive = 1;
+ u8 json_output = 0;
+ u8 *heap;
+ mheap_t *h;
+ int i;
+
+ clib_mem_init (0, 128 << 20);
+
+ heap = clib_mem_get_per_cpu_heap ();
+ h = mheap_header (heap);
+
+ /* make the main heap thread-safe */
+ h->flags |= MHEAP_FLAG_THREAD_SAFE;
+
+ clib_macro_init (&vam->macro_main);
+ clib_macro_add_builtin (&vam->macro_main, "current_file",
+ eval_current_file);
+ clib_macro_add_builtin (&vam->macro_main, "current_line",
+ eval_current_line);
+
+ init_error_string_table (vam);
+
+ unformat_init_command_line (a, argv);
+
+ while (unformat_check_input (a) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (a, "in %s", &this_input_file))
+ vec_add1 (input_files, this_input_file);
+ else if (unformat (a, "out %s", &output_file))
+ ;
+ else if (unformat (a, "script"))
+ interactive = 0;
+ else if (unformat (a, "json"))
+ json_output = 1;
+ else if (unformat (a, "plugin_path %s", (u8 *) & vat_plugin_path))
+ vec_add1 (vat_plugin_path, 0);
+ else if (unformat (a, "plugin_name_filter %s",
+ (u8 *) & vat_plugin_name_filter))
+ vec_add1 (vat_plugin_name_filter, 0);
+ else if (unformat (a, "chroot prefix %s", &chroot_prefix))
+ {
+ vl_set_memory_root_path ((char *) chroot_prefix);
+ }
+ else
+ {
+ fformat (stderr,
+ "%s: usage [in <f1> ... in <fn>] [out <fn>] [script] [json]\n");
+ exit (1);
+ }
}
- if (output_file)
- vam->ofp = fopen ((char *) output_file, "w");
- else
- vam->ofp = stdout;
+ if (output_file)
+ vam->ofp = fopen ((char *) output_file, "w");
+ else
+ vam->ofp = stdout;
- if (vam->ofp == NULL) {
- fformat (stderr, "Couldn't open output file %s\n",
- output_file ? (char *) output_file : "stdout");
- exit (1);
+ if (vam->ofp == NULL)
+ {
+ fformat (stderr, "Couldn't open output file %s\n",
+ output_file ? (char *) output_file : "stdout");
+ exit (1);
}
- clib_time_init (&vam->clib_time);
+ clib_time_init (&vam->clib_time);
- vat_api_hookup(vam);
- vat_plugin_api_reference();
+ vat_api_hookup (vam);
+ vat_plugin_api_reference ();
- if (connect_to_vpe("vpp_api_test") < 0) {
- svm_region_exit();
- fformat (stderr, "Couldn't connect to vpe, exiting...\n");
- exit (1);
+ if (connect_to_vpe ("vpp_api_test") < 0)
+ {
+ svm_region_exit ();
+ fformat (stderr, "Couldn't connect to vpe, exiting...\n");
+ exit (1);
}
- vam->json_output = json_output;
+ vam->json_output = json_output;
- if (!json_output) {
- api_sw_interface_dump (vam);
+ if (!json_output)
+ {
+ api_sw_interface_dump (vam);
}
- vec_validate (vam->inbuf, 4096);
-
- vam->current_file = (u8 *) "plugin-init";
- vat_plugin_init (vam);
-
- for (i = 0; i < vec_len (input_files); i++) {
- vam->ifp = fopen ((char *) input_files[i], "r");
- if (vam->ifp == NULL) {
- fformat (stderr, "Couldn't open input file %s\n",
- input_files[i]);
- continue;
- }
- vam->current_file = input_files[i];
- vam->input_line_number = 0;
- do_one_file (vam);
- fclose (vam->ifp);
+ vec_validate (vam->inbuf, 4096);
+
+ vam->current_file = (u8 *) "plugin-init";
+ vat_plugin_init (vam);
+
+ for (i = 0; i < vec_len (input_files); i++)
+ {
+ vam->ifp = fopen ((char *) input_files[i], "r");
+ if (vam->ifp == NULL)
+ {
+ fformat (stderr, "Couldn't open input file %s\n", input_files[i]);
+ continue;
+ }
+ vam->current_file = input_files[i];
+ vam->input_line_number = 0;
+ do_one_file (vam);
+ fclose (vam->ifp);
}
- if (output_file)
- fclose (vam->ofp);
+ if (output_file)
+ fclose (vam->ofp);
- if (interactive) {
- vam->ifp = stdin;
- vam->ofp = stdout;
- vam->current_file = (u8 *) "interactive";
- do_one_file (vam);
- fclose(vam->ifp);
+ if (interactive)
+ {
+ vam->ifp = stdin;
+ vam->ofp = stdout;
+ vam->current_file = (u8 *) "interactive";
+ do_one_file (vam);
+ fclose (vam->ifp);
}
- vl_client_disconnect_from_vlib();
- exit (0);
+ vl_client_disconnect_from_vlib ();
+ exit (0);
}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/vpp-api-test/vat/plugin.c b/vpp-api-test/vat/plugin.c
index 89dbad07a9f..c1cc928c217 100644
--- a/vpp-api-test/vat/plugin.c
+++ b/vpp-api-test/vat/plugin.c
@@ -23,26 +23,26 @@
plugin_main_t vat_plugin_main;
-static int
-load_one_plugin (plugin_main_t *pm, plugin_info_t *pi)
+static int
+load_one_plugin (plugin_main_t * pm, plugin_info_t * pi)
{
void *handle, *register_handle;
- clib_error_t * (*fp)(vat_main_t *);
- clib_error_t * error;
-
- handle = dlopen ((char *)pi->name, RTLD_LAZY);
+ clib_error_t *(*fp) (vat_main_t *);
+ clib_error_t *error;
- /*
+ handle = dlopen ((char *) pi->name, RTLD_LAZY);
+
+ /*
* Note: this can happen if the plugin has an undefined symbol reference,
* so print a warning. Otherwise, the poor slob won't know what happened.
* Ask me how I know that...
*/
if (handle == 0)
{
- clib_warning ("%s", dlerror());
+ clib_warning ("%s", dlerror ());
return -1;
}
-
+
pi->handle = handle;
register_handle = dlsym (pi->handle, "vat_plugin_register");
@@ -51,7 +51,7 @@ load_one_plugin (plugin_main_t *pm, plugin_info_t *pi)
fp = register_handle;
- error = (*fp)(pm->vat_main);
+ error = (*fp) (pm->vat_main);
if (error)
{
@@ -65,7 +65,8 @@ load_one_plugin (plugin_main_t *pm, plugin_info_t *pi)
return 0;
}
-static u8 **split_plugin_path (plugin_main_t *pm)
+static u8 **
+split_plugin_path (plugin_main_t * pm)
{
int i;
u8 **rv = 0;
@@ -75,11 +76,11 @@ static u8 **split_plugin_path (plugin_main_t *pm)
for (i = 0; i < vec_len (pm->plugin_path); i++)
{
if (path[i] != ':')
- {
- vec_add1(this, path[i]);
- continue;
- }
- vec_add1(this, 0);
+ {
+ vec_add1 (this, path[i]);
+ continue;
+ }
+ vec_add1 (this, 0);
vec_add1 (rv, this);
this = 0;
}
@@ -91,7 +92,8 @@ static u8 **split_plugin_path (plugin_main_t *pm)
return rv;
}
-int vat_load_new_plugins (plugin_main_t *pm)
+int
+vat_load_new_plugins (plugin_main_t * pm)
{
DIR *dp;
struct dirent *entry;
@@ -102,61 +104,61 @@ int vat_load_new_plugins (plugin_main_t *pm)
int i;
plugin_path = split_plugin_path (pm);
-
+
for (i = 0; i < vec_len (plugin_path); i++)
{
- dp = opendir ((char *)plugin_path[i]);
-
+ dp = opendir ((char *) plugin_path[i]);
+
if (dp == 0)
- continue;
-
+ continue;
+
while ((entry = readdir (dp)))
- {
- u8 *plugin_name;
-
- if (pm->plugin_name_filter)
- {
- int j;
- for (j = 0; j < vec_len (pm->plugin_name_filter); j++)
- if (entry->d_name[j] != pm->plugin_name_filter[j])
- goto next;
- }
-
- plugin_name = format (0, "%s/%s%c", plugin_path[i],
- entry->d_name, 0);
-
- /* unreadable */
- if (stat ((char *)plugin_name, &statb) < 0)
- {
- ignore:
- vec_free (plugin_name);
- continue;
- }
-
- /* a dir or other things which aren't plugins */
- if (!S_ISREG(statb.st_mode))
- goto ignore;
-
- p = hash_get_mem (pm->plugin_by_name_hash, plugin_name);
- if (p == 0)
- {
- vec_add2 (pm->plugin_info, pi, 1);
- pi->name = plugin_name;
- pi->file_info = statb;
-
- if (load_one_plugin (pm, pi))
- {
- vec_free (plugin_name);
- _vec_len (pm->plugin_info) = vec_len (pm->plugin_info) - 1;
- continue;
- }
- memset (pi, 0, sizeof (*pi));
- hash_set_mem (pm->plugin_by_name_hash, plugin_name,
- pi - pm->plugin_info);
- }
- next:
- ;
- }
+ {
+ u8 *plugin_name;
+
+ if (pm->plugin_name_filter)
+ {
+ int j;
+ for (j = 0; j < vec_len (pm->plugin_name_filter); j++)
+ if (entry->d_name[j] != pm->plugin_name_filter[j])
+ goto next;
+ }
+
+ plugin_name = format (0, "%s/%s%c", plugin_path[i],
+ entry->d_name, 0);
+
+ /* unreadable */
+ if (stat ((char *) plugin_name, &statb) < 0)
+ {
+ ignore:
+ vec_free (plugin_name);
+ continue;
+ }
+
+ /* a dir or other things which aren't plugins */
+ if (!S_ISREG (statb.st_mode))
+ goto ignore;
+
+ p = hash_get_mem (pm->plugin_by_name_hash, plugin_name);
+ if (p == 0)
+ {
+ vec_add2 (pm->plugin_info, pi, 1);
+ pi->name = plugin_name;
+ pi->file_info = statb;
+
+ if (load_one_plugin (pm, pi))
+ {
+ vec_free (plugin_name);
+ _vec_len (pm->plugin_info) = vec_len (pm->plugin_info) - 1;
+ continue;
+ }
+ memset (pi, 0, sizeof (*pi));
+ hash_set_mem (pm->plugin_by_name_hash, plugin_name,
+ pi - pm->plugin_info);
+ }
+ next:
+ ;
+ }
closedir (dp);
vec_free (plugin_path[i]);
}
@@ -167,17 +169,18 @@ int vat_load_new_plugins (plugin_main_t *pm)
#define QUOTE_(x) #x
#define QUOTE(x) QUOTE_(x)
-/*
+/*
* Load plugins from /usr/lib/vpp_api_test_plugins by default
*/
char *vat_plugin_path = "/usr/lib/vpp_api_test_plugins";
-
+
char *vat_plugin_name_filter = 0;
-int vat_plugin_init (vat_main_t * vam)
+int
+vat_plugin_init (vat_main_t * vam)
{
plugin_main_t *pm = &vat_plugin_main;
-
+
pm->plugin_path = format (0, "%s%c", vat_plugin_path, 0);
if (vat_plugin_name_filter)
@@ -185,6 +188,14 @@ int vat_plugin_init (vat_main_t * vam)
pm->plugin_by_name_hash = hash_create_string (0, sizeof (uword));
pm->vat_main = vam;
-
+
return vat_load_new_plugins (pm);
}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/vpp-api-test/vat/plugin.h b/vpp-api-test/vat/plugin.h
index 21e9983feec..559ec52f128 100644
--- a/vpp-api-test/vat/plugin.h
+++ b/vpp-api-test/vat/plugin.h
@@ -23,13 +23,15 @@
#include <sys/stat.h>
#include <unistd.h>
-typedef struct {
+typedef struct
+{
u8 *name;
struct stat file_info;
void *handle;
} plugin_info_t;
-typedef struct {
+typedef struct
+{
/* loaded plugin info */
plugin_info_t *plugin_info;
uword *plugin_by_name_hash;
@@ -39,13 +41,21 @@ typedef struct {
u8 *plugin_name_filter;
/* convenience */
- vat_main_t * vat_main;
-
+ vat_main_t *vat_main;
+
} plugin_main_t;
plugin_main_t vat_plugin_main;
int vat_plugin_init (vat_main_t * vam);
-int vat_load_new_plugins (plugin_main_t *pm);
+int vat_load_new_plugins (plugin_main_t * pm);
#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/vpp-api-test/vat/plugin_api.c b/vpp-api-test/vat/plugin_api.c
index ee11b830162..4e1eb897844 100644
--- a/vpp-api-test/vat/plugin_api.c
+++ b/vpp-api-test/vat/plugin_api.c
@@ -15,30 +15,32 @@
#include <vat/vat.h>
#include <vnet/ip/ip.h>
-uword unformat_sw_if_index (unformat_input_t * input, va_list * args)
+uword
+unformat_sw_if_index (unformat_input_t * input, va_list * args)
{
- vat_main_t * vam = va_arg (*args, vat_main_t *);
- u32 * result = va_arg (*args, u32 *);
- u8 * if_name;
- uword * p;
+ vat_main_t *vam = va_arg (*args, vat_main_t *);
+ u32 *result = va_arg (*args, u32 *);
+ u8 *if_name;
+ uword *p;
if (!unformat (input, "%s", &if_name))
- return 0;
+ return 0;
p = hash_get_mem (vam->sw_if_index_by_interface_name, if_name);
if (p == 0)
- return 0;
+ return 0;
*result = p[0];
return 1;
}
/* Parse an IP4 address %d.%d.%d.%d. */
-uword unformat_ip4_address (unformat_input_t * input, va_list * args)
+uword
+unformat_ip4_address (unformat_input_t * input, va_list * args)
{
- u8 * result = va_arg (*args, u8 *);
+ u8 *result = va_arg (*args, u8 *);
unsigned a[4];
- if (! unformat (input, "%d.%d.%d.%d", &a[0], &a[1], &a[2], &a[3]))
+ if (!unformat (input, "%d.%d.%d.%d", &a[0], &a[1], &a[2], &a[3]))
return 0;
if (a[0] >= 256 || a[1] >= 256 || a[2] >= 256 || a[3] >= 256)
@@ -55,11 +57,11 @@ uword unformat_ip4_address (unformat_input_t * input, va_list * args)
uword
unformat_ethernet_address (unformat_input_t * input, va_list * args)
{
- u8 * result = va_arg (*args, u8 *);
+ u8 *result = va_arg (*args, u8 *);
u32 i, a[6];
- if (! unformat (input, "%_%x:%x:%x:%x:%x:%x%_",
- &a[0], &a[1], &a[2], &a[3], &a[4], &a[5]))
+ if (!unformat (input, "%_%x:%x:%x:%x:%x:%x%_",
+ &a[0], &a[1], &a[2], &a[3], &a[4], &a[5]))
return 0;
/* Check range. */
@@ -78,12 +80,11 @@ uword
unformat_ethernet_type_host_byte_order (unformat_input_t * input,
va_list * args)
{
- u16 * result = va_arg (*args, u16 *);
+ u16 *result = va_arg (*args, u16 *);
int type;
/* Numeric type. */
- if (unformat (input, "0x%x", &type)
- || unformat (input, "%d", &type))
+ if (unformat (input, "0x%x", &type) || unformat (input, "%d", &type))
{
if (type >= (1 << 16))
return 0;
@@ -94,9 +95,10 @@ unformat_ethernet_type_host_byte_order (unformat_input_t * input,
}
/* Parse an IP6 address. */
-uword unformat_ip6_address (unformat_input_t * input, va_list * args)
+uword
+unformat_ip6_address (unformat_input_t * input, va_list * args)
{
- ip6_address_t * result = va_arg (*args, ip6_address_t *);
+ ip6_address_t *result = va_arg (*args, ip6_address_t *);
u16 hex_quads[8];
uword hex_quad, n_hex_quads, hex_digit, n_hex_digits;
uword c, n_colon, double_colon_index;
@@ -135,7 +137,7 @@ uword unformat_ip6_address (unformat_input_t * input, va_list * args)
n_colon = 0;
n_hex_digits++;
}
-
+
/* Save position of :: */
if (n_colon == 2)
{
@@ -184,18 +186,31 @@ uword unformat_ip6_address (unformat_input_t * input, va_list * args)
}
}
-u8 * format_ip4_address (u8 * s, va_list * args)
+u8 *
+format_ip4_address (u8 * s, va_list * args)
{
- u8 * a = va_arg (*args, u8 *);
+ u8 *a = va_arg (*args, u8 *);
return format (s, "%d.%d.%d.%d", a[0], a[1], a[2], a[3]);
}
-u8 * format_ethernet_address (u8 * s, va_list * args)
+u8 *
+format_ethernet_address (u8 * s, va_list * args)
{
- u8 * a = va_arg (*args, u8 *);
+ u8 *a = va_arg (*args, u8 *);
return format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
- a[0], a[1], a[2], a[3], a[4], a[5]);
+ a[0], a[1], a[2], a[3], a[4], a[5]);
+}
+
+void
+vat_plugin_api_reference (void)
+{
}
-void vat_plugin_api_reference(void) { }
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/vpp-api-test/vat/restart.c b/vpp-api-test/vat/restart.c
index 2bbaa51625a..adc63f848c0 100644
--- a/vpp-api-test/vat/restart.c
+++ b/vpp-api-test/vat/restart.c
@@ -29,49 +29,49 @@
#include <vppinfra/time.h>
#include <vppinfra/macros.h>
-int restart_main_fn (unformat_input_t * i)
+int
+restart_main_fn (unformat_input_t * i)
{
int verbose = 0;
int old_pid;
int wait;
- u8 * chroot_path = 0;
- svmdb_client_t * svmdb_client;
+ u8 *chroot_path = 0;
+ svmdb_client_t *svmdb_client;
volatile pid_t *pidp;
struct stat statb;
ino_t old_inode;
int sleeps;
- svmdb_map_args_t _ma, *ma= &_ma;
+ svmdb_map_args_t _ma, *ma = &_ma;
struct timespec _req, *req = &_req;
struct timespec _rem, *rem = &_rem;
- if (geteuid())
+ if (geteuid ())
clib_error ("vpp_restart: must be root...");
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
if (unformat (i, "verbose") || unformat (i, "v"))
- verbose = 1;
+ verbose = 1;
else if (unformat (i, "chroot %s", &chroot_path))
- ;
+ ;
else
- {
- clib_error ("unknown input `%U'", format_unformat_error, i);
- return 1;
- }
+ {
+ clib_error ("unknown input `%U'", format_unformat_error, i);
+ return 1;
+ }
}
- /*
- * Step 1: look up the current VPP pid in the shared-memory database
+ /*
+ * Step 1: look up the current VPP pid in the shared-memory database
*/
memset (ma, 0, sizeof (*ma));
- ma->root_path = (char *)chroot_path;
+ ma->root_path = (char *) chroot_path;
svmdb_client = svmdb_map (ma);
pidp = svmdb_local_get_variable_reference (svmdb_client,
- SVMDB_NAMESPACE_VEC,
- "vpp_pid");
+ SVMDB_NAMESPACE_VEC, "vpp_pid");
if (pidp == 0)
{
clib_error ("'vpp_pid' svm variable not found, vpp has never run?");
@@ -82,26 +82,26 @@ int restart_main_fn (unformat_input_t * i)
for (wait = 0; wait < 1000; wait++)
{
req->tv_sec = 0;
- req->tv_nsec = 10000*1000; /* 10 ms */
- while (nanosleep(req, rem) < 0)
- *req = *rem;
-
- if (*pidp)
- goto found2;
+ req->tv_nsec = 10000 * 1000; /* 10 ms */
+ while (nanosleep (req, rem) < 0)
+ *req = *rem;
+
+ if (*pidp)
+ goto found2;
}
clib_error ("VPP not runnning...");
return 3;
-
- found2:
+
+found2:
old_pid = *pidp;
-
+
/*
* Step 2: sanity check the pid we discovered
*/
if (verbose)
- fformat(stdout, "Sanity check current vpp pid %d\n", old_pid);
+ fformat (stdout, "Sanity check current vpp pid %d\n", old_pid);
if (kill (old_pid, 0) < 0)
{
@@ -109,15 +109,15 @@ int restart_main_fn (unformat_input_t * i)
clib_error ("vpp current pid %d not running...", old_pid);
return 2;
}
-
+
if (verbose)
- fformat(stdout, "Sanity check vpp pid %d OK\n", old_pid);
+ fformat (stdout, "Sanity check vpp pid %d OK\n", old_pid);
- /*
- * Step 3: figure out the current vpp <--> client shared-VM file
- * inode number
+ /*
+ * Step 3: figure out the current vpp <--> client shared-VM file
+ * inode number
*/
- if (stat("/dev/shm/vpe-api", &statb) < 0)
+ if (stat ("/dev/shm/vpe-api", &statb) < 0)
{
clib_unix_error ("stat fail");
return 4;
@@ -126,9 +126,9 @@ int restart_main_fn (unformat_input_t * i)
old_inode = statb.st_ino;
if (verbose)
- fformat(stdout, "Old inode %u\n", old_inode);
+ fformat (stdout, "Old inode %u\n", old_inode);
- /* Note: restart wipes out the shared VM database*/
+ /* Note: restart wipes out the shared VM database */
svmdb_unmap (svmdb_client);
/*
@@ -145,53 +145,52 @@ int restart_main_fn (unformat_input_t * i)
sleeps = 0;
- /*
- * Step 5: wait up to 15 seconds for a new incarnation of
+ /*
+ * Step 5: wait up to 15 seconds for a new incarnation of
* the shared-VM API segment to appear.
*/
for (wait = 0; wait < 150; wait++)
{
- if ((stat("/dev/shm/vpe-api", &statb) < 0)
- || statb.st_ino == old_inode)
- {
- req->tv_sec = 0;
- req->tv_nsec = 100000*1000; /* 100 ms */
- while (nanosleep(req, rem) < 0)
- *req = *rem;
- sleeps++;
- }
+ if ((stat ("/dev/shm/vpe-api", &statb) < 0)
+ || statb.st_ino == old_inode)
+ {
+ req->tv_sec = 0;
+ req->tv_nsec = 100000 * 1000; /* 100 ms */
+ while (nanosleep (req, rem) < 0)
+ *req = *rem;
+ sleeps++;
+ }
else
- goto new_inode;
+ goto new_inode;
}
clib_error ("Timeout waiting for new inode to appear...");
return 5;
- new_inode:
+new_inode:
if (verbose && sleeps > 0)
- fformat(stdout, "Inode sleeps %d\n", sleeps);
+ fformat (stdout, "Inode sleeps %d\n", sleeps);
if (verbose)
- fformat(stdout, "New inode %u\n", statb.st_ino);
+ fformat (stdout, "New inode %u\n", statb.st_ino);
- /*
- * Step 6: remap the SVM database
+ /*
+ * Step 6: remap the SVM database
*/
svmdb_client = svmdb_map (ma);
-
+
pidp = svmdb_local_get_variable_reference (svmdb_client,
- SVMDB_NAMESPACE_VEC,
- "vpp_pid");
+ SVMDB_NAMESPACE_VEC, "vpp_pid");
if (pidp == 0)
{
clib_error ("post_restart: 'vpp_pid' svm variable not found,"
- "vpp did not restart?");
+ "vpp did not restart?");
return 2;
}
sleeps = 0;
- /*
+ /*
* Step 7: wait for vpp to publish its new PID
*/
@@ -199,40 +198,49 @@ int restart_main_fn (unformat_input_t * i)
for (wait = 0; wait < 150; wait++)
{
if (*pidp && (*pidp != old_pid))
- goto restarted;
+ goto restarted;
req->tv_sec = 0;
- req->tv_nsec = 100000*1000; /* 100 ms */
- while (nanosleep(req, rem) < 0)
- *req = *rem;
+ req->tv_nsec = 100000 * 1000; /* 100 ms */
+ while (nanosleep (req, rem) < 0)
+ *req = *rem;
sleeps++;
}
-
+
clib_error ("Timeout waiting for vpp to publish pid after restart...");
return 4;
- restarted:
+restarted:
/* Done... */
-
+
if (verbose && sleeps)
- fformat(stdout, "pid sleeps %d\n", sleeps);
+ fformat (stdout, "pid sleeps %d\n", sleeps);
if (verbose)
fformat (stdout, "New PID %d... Restarted...\n", *pidp);
-
+
svmdb_unmap (svmdb_client);
return 0;
}
-int main (int argc, char **argv)
+int
+main (int argc, char **argv)
{
unformat_input_t i;
int ret;
- clib_mem_init (0, 64ULL<<20);
+ clib_mem_init (0, 64ULL << 20);
unformat_init_command_line (&i, argv);
ret = restart_main_fn (&i);
unformat_free (&i);
return ret;
}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/vpp-api-test/vat/vat.h b/vpp-api-test/vat/vat.h
index 5f553bcb9f7..b0ab883764b 100644
--- a/vpp-api-test/vat/vat.h
+++ b/vpp-api-test/vat/vat.h
@@ -30,185 +30,199 @@
#include "vat/json_format.h"
-typedef struct {
- u8 * interface_name;
- u32 sw_if_index;
- /* Subinterface ID. A number 0-N to uniquely identify this subinterface under the super interface*/
- u32 sub_id;
-
- /* 0 = dot1q, 1=dot1ad */
- u8 sub_dot1ad;
-
- /* Number of tags 0-2 */
- u8 sub_number_of_tags;
- u16 sub_outer_vlan_id;
- u16 sub_inner_vlan_id;
- u8 sub_exact_match;
- u8 sub_default;
- u8 sub_outer_vlan_id_any;
- u8 sub_inner_vlan_id_any;
-
- /* vlan tag rewrite */
- u32 vtr_op;
- u32 vtr_push_dot1q;
- u32 vtr_tag1;
- u32 vtr_tag2;
+typedef struct
+{
+ u8 *interface_name;
+ u32 sw_if_index;
+ /*
+ * Subinterface ID. A number 0-N to uniquely identify this
+ * subinterface under the super interface
+ */
+ u32 sub_id;
+
+ /* 0 = dot1q, 1=dot1ad */
+ u8 sub_dot1ad;
+
+ /* Number of tags 0-2 */
+ u8 sub_number_of_tags;
+ u16 sub_outer_vlan_id;
+ u16 sub_inner_vlan_id;
+ u8 sub_exact_match;
+ u8 sub_default;
+ u8 sub_outer_vlan_id_any;
+ u8 sub_inner_vlan_id_any;
+
+ /* vlan tag rewrite */
+ u32 vtr_op;
+ u32 vtr_push_dot1q;
+ u32 vtr_tag1;
+ u32 vtr_tag2;
} sw_interface_subif_t;
-typedef struct {
- u8 ip[16];
- u8 prefix_length;
+typedef struct
+{
+ u8 ip[16];
+ u8 prefix_length;
} ip_address_details_t;
-typedef struct {
- u8 present;
- ip_address_details_t * addr;
+typedef struct
+{
+ u8 present;
+ ip_address_details_t *addr;
} ip_details_t;
-typedef struct {
- u64 packets;
- u64 bytes;
+typedef struct
+{
+ u64 packets;
+ u64 bytes;
} interface_counter_t;
-typedef struct {
- struct in_addr address;
- u8 address_length;
- u64 packets;
- u64 bytes;
+typedef struct
+{
+ struct in_addr address;
+ u8 address_length;
+ u64 packets;
+ u64 bytes;
} ip4_fib_counter_t;
-typedef struct {
- struct in6_addr address;
- u8 address_length;
- u64 packets;
- u64 bytes;
+typedef struct
+{
+ struct in6_addr address;
+ u8 address_length;
+ u64 packets;
+ u64 bytes;
} ip6_fib_counter_t;
-typedef struct {
- u8 * locator_set_name;
- u32 locator_set_index;
+typedef struct
+{
+ u8 *locator_set_name;
+ u32 locator_set_index;
} locator_set_msg_t;
-typedef struct {
- u8 local;
- u32 sw_if_index;
- u8 is_ipv6;
- u8 ip_address[16];
- u8 priority;
- u8 weight;
+typedef struct
+{
+ u8 local;
+ u32 sw_if_index;
+ u8 is_ipv6;
+ u8 ip_address[16];
+ u8 priority;
+ u8 weight;
} locator_msg_t;
-typedef struct {
- u32 locator_set_index;
- u8 is_local;
- u8 eid_type;
- u32 vni;
- u8 eid[16];
- u8 eid_prefix_len;
- u32 ttl;
- u8 authoritative;
+typedef struct
+{
+ u32 locator_set_index;
+ u8 is_local;
+ u8 eid_type;
+ u32 vni;
+ u8 eid[16];
+ u8 eid_prefix_len;
+ u32 ttl;
+ u8 authoritative;
} eid_table_t;
-typedef struct {
- /* vpe input queue */
- unix_shared_memory_queue_t * vl_input_queue;
+typedef struct
+{
+ /* vpe input queue */
+ unix_shared_memory_queue_t *vl_input_queue;
- /* interface name table */
- uword * sw_if_index_by_interface_name;
+ /* interface name table */
+ uword *sw_if_index_by_interface_name;
- /* subinterface table */
- sw_interface_subif_t * sw_if_subif_table;
+ /* subinterface table */
+ sw_interface_subif_t *sw_if_subif_table;
- /* Graph node table */
- uword * graph_node_index_by_name;
- vlib_node_t ** graph_nodes;
+ /* Graph node table */
+ uword *graph_node_index_by_name;
+ vlib_node_t **graph_nodes;
- /* ip tables */
- ip_details_t * ip_details_by_sw_if_index[2];
+ /* ip tables */
+ ip_details_t *ip_details_by_sw_if_index[2];
- /* sw_if_index of currently processed interface */
- u32 current_sw_if_index;
+ /* sw_if_index of currently processed interface */
+ u32 current_sw_if_index;
- /* remember that we are dumping ipv6 */
- u8 is_ipv6;
+ /* remember that we are dumping ipv6 */
+ u8 is_ipv6;
- /* function table */
- uword * function_by_name;
+ /* function table */
+ uword *function_by_name;
- /* help strings */
- uword * help_by_name;
+ /* help strings */
+ uword *help_by_name;
- /* macro table */
- macro_main_t macro_main;
+ /* macro table */
+ macro_main_t macro_main;
- /* Errors by number */
- uword * error_string_by_error_number;
+ /* Errors by number */
+ uword *error_string_by_error_number;
- /* Main thread can spin (w/ timeout) here if needed */
- u32 async_mode;
- u32 async_errors;
- volatile u32 result_ready;
- volatile i32 retval;
- volatile u32 sw_if_index;
- volatile u8 *shmem_result;
+ /* Main thread can spin (w/ timeout) here if needed */
+ u32 async_mode;
+ u32 async_errors;
+ volatile u32 result_ready;
+ volatile i32 retval;
+ volatile u32 sw_if_index;
+ volatile u8 *shmem_result;
- /* our client index */
- u32 my_client_index;
+ /* our client index */
+ u32 my_client_index;
- /* Time is of the essence... */
- clib_time_t clib_time;
+ /* Time is of the essence... */
+ clib_time_t clib_time;
- /* Unwind (so we can quit) */
- jmp_buf jump_buf;
+ /* Unwind (so we can quit) */
+ jmp_buf jump_buf;
- /* temporary parse buffer */
- unformat_input_t *input;
+ /* temporary parse buffer */
+ unformat_input_t *input;
- /* input buffer */
- u8 * inbuf;
+ /* input buffer */
+ u8 *inbuf;
- /* stdio input / output FILEs */
- FILE *ifp, *ofp;
- u8 * current_file;
- u32 input_line_number;
+ /* stdio input / output FILEs */
+ FILE *ifp, *ofp;
+ u8 *current_file;
+ u32 input_line_number;
- /* exec mode toggle */
- int exec_mode;
+ /* exec mode toggle */
+ int exec_mode;
- /* Regenerate the interface table */
- volatile int regenerate_interface_table;
+ /* Regenerate the interface table */
+ volatile int regenerate_interface_table;
- /* flag for JSON output format */
- u8 json_output;
+ /* flag for JSON output format */
+ u8 json_output;
- /* flag for interface event display */
- u8 interface_event_display;
+ /* flag for interface event display */
+ u8 interface_event_display;
- /* JSON tree used in composing dump api call results */
- vat_json_node_t json_tree;
+ /* JSON tree used in composing dump api call results */
+ vat_json_node_t json_tree;
- /* counters */
- u64 **simple_interface_counters;
- interface_counter_t **combined_interface_counters;
- ip4_fib_counter_t **ip4_fib_counters;
- u32 *ip4_fib_counters_vrf_id_by_index;
- ip6_fib_counter_t **ip6_fib_counters;
- u32 *ip6_fib_counters_vrf_id_by_index;
+ /* counters */
+ u64 **simple_interface_counters;
+ interface_counter_t **combined_interface_counters;
+ ip4_fib_counter_t **ip4_fib_counters;
+ u32 *ip4_fib_counters_vrf_id_by_index;
+ ip6_fib_counter_t **ip6_fib_counters;
+ u32 *ip6_fib_counters_vrf_id_by_index;
- /* Lisp */
- u8 noprint_msg;
- locator_set_msg_t * locator_set_msg;
- locator_msg_t * locator_msg;
- eid_table_t * eid_tables;
+ /* Lisp */
+ u8 noprint_msg;
+ locator_set_msg_t *locator_set_msg;
+ locator_msg_t *locator_msg;
+ eid_table_t *eid_tables;
} vat_main_t;
vat_main_t vat_main;
-static inline f64 vat_time_now (vat_main_t *vam)
+static inline f64
+vat_time_now (vat_main_t * vam)
{
- return clib_time_now (&vam->clib_time);
+ return clib_time_now (&vam->clib_time);
}
#define errmsg(fmt,args...) \
@@ -220,7 +234,7 @@ do { \
fflush(vam->ofp); \
} while(0);
-void vat_api_hookup (vat_main_t *vam);
+void vat_api_hookup (vat_main_t * vam);
int api_sw_interface_dump (vat_main_t * vam);
void do_one_file (vat_main_t * vam);
int exec (vat_main_t * vam);
@@ -228,15 +242,23 @@ int exec (vat_main_t * vam);
/* Plugin API library functions */
char *vat_plugin_path;
char *vat_plugin_name_filter;
-void vat_plugin_api_reference(void);
+void vat_plugin_api_reference (void);
uword unformat_sw_if_index (unformat_input_t * input, va_list * args);
uword unformat_ip4_address (unformat_input_t * input, va_list * args);
uword unformat_ethernet_address (unformat_input_t * input, va_list * args);
uword unformat_ethernet_type_host_byte_order (unformat_input_t * input,
- va_list * args);
+ va_list * args);
uword unformat_ip6_address (unformat_input_t * input, va_list * args);
-u8 * format_ip4_address (u8 * s, va_list * args);
-u8 * format_ethernet_address (u8 * s, va_list * args);
+u8 *format_ip4_address (u8 * s, va_list * args);
+u8 *format_ethernet_address (u8 * s, va_list * args);
#endif /* __included_vat_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */