diff options
Diffstat (limited to 'vpp')
| -rw-r--r-- | vpp/Makefile.am | 12 | ||||
| -rw-r--r-- | vpp/configure.ac | 8 | ||||
| l--------- | vpp/vpp-api/api_format.c | 1 | ||||
| -rw-r--r-- | vpp/vpp-api/api_main.c | 192 | ||||
| -rw-r--r-- | vpp/vpp-api/json_format.c | 304 | ||||
| -rw-r--r-- | vpp/vpp-api/json_format.h | 254 | ||||
| l--------- | vpp/vpp-api/vat.h | 1 |
7 files changed, 770 insertions, 2 deletions
diff --git a/vpp/Makefile.am b/vpp/Makefile.am index 9ae06055..f90cb647 100644 --- a/vpp/Makefile.am +++ b/vpp/Makefile.am @@ -13,7 +13,7 @@ AUTOMAKE_OPTIONS = foreign subdir-objects -AM_CFLAGS = -Wall @DPDK@ @DPDK_CRYPTO@ @IPSEC@ @VCGN@ @IPV6SR@ +AM_CFLAGS = -Wall @DPDK@ @DPDK_CRYPTO@ @IPSEC@ @VCGN@ @IPV6SR@ @APICLI@ noinst_PROGRAMS = BUILT_SOURCES = @@ -31,7 +31,15 @@ vpp_SOURCES = \ vpp_SOURCES += \ vpp-api/api.c \ - vpp-api/custom_dump.c + vpp-api/custom_dump.c \ + vpp-api/json_format.c + +if WITH_APICLI + vpp_SOURCES += \ + vpp-api/api_format.c \ + vpp-api/api_main.c +endif + # comment out to disable stats upload to gmond diff --git a/vpp/configure.ac b/vpp/configure.ac index d36695cc..2ade3d2a 100644 --- a/vpp/configure.ac +++ b/vpp/configure.ac @@ -34,6 +34,11 @@ AC_ARG_WITH(ipv6sr, [with_ipv6sr=0], [with_ipv6sr=1]) +AC_ARG_WITH(apicli, + AC_HELP_STRING([--without-apicli],[Disable binary api CLI]), + [with_apicli=0], + [with_apicli=1]) + AM_CONDITIONAL(WITH_DPDK, test "$with_dpdk" = "1") AM_CONDITIONAL(ENABLE_DPDK_SHARED, test "$enable_dpdk_shared" = "1") AC_SUBST(DPDK,["-DDPDK=${with_dpdk} -DDPDK_SHARED_LIB=${enable_dpdk_shared}"]) @@ -64,4 +69,7 @@ AC_SUBST(VCGN,[-DVCGN=${with_vcgn}]) AM_CONDITIONAL(WITH_IPV6SR, test "$with_ipv6sr" = "1") AC_SUBST(IPV6SR,[-DIPV6SR=${with_ipv6sr}]) +AM_CONDITIONAL(WITH_APICLI, test "$with_apicli" = "1") +AC_SUBST(APICLI,[-DVPP_API_TEST_BUILTIN=${with_apicli}]) + AC_OUTPUT([Makefile]) diff --git a/vpp/vpp-api/api_format.c b/vpp/vpp-api/api_format.c new file mode 120000 index 00000000..f37e6575 --- /dev/null +++ b/vpp/vpp-api/api_format.c @@ -0,0 +1 @@ +../../vpp-api-test/vat/api_format.c
\ No newline at end of file diff --git a/vpp/vpp-api/api_main.c b/vpp/vpp-api/api_main.c new file mode 100644 index 00000000..db532061 --- /dev/null +++ b/vpp/vpp-api/api_main.c @@ -0,0 +1,192 @@ +#include "vat.h" + +vat_main_t vat_main; + +void +vat_suspend (vlib_main_t * vm, f64 interval) +{ + vlib_process_suspend (vm, interval); +} + +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; + + 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; +} + + +static void +init_error_string_table (vat_main_t * vam) +{ + + 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; +#undef _ + + hash_set (vam->error_string_by_error_number, 99, "Misc"); +} + +static clib_error_t * +api_main_init (vlib_main_t * vm) +{ + vat_main_t *vam = &vat_main; + + vam->vlib_main = vm; + vam->my_client_index = (u32) ~ 0; + init_error_string_table (vam); + vat_api_hookup (vam); + return 0; +} + +VLIB_INIT_FUNCTION (api_main_init); + +static clib_error_t * +api_command_fn (vlib_main_t * vm, + unformat_input_t * input, vlib_cli_command_t * cmd) +{ + vat_main_t *vam = &vat_main; + unformat_input_t _input; + uword c; + u8 *cmdp, *argsp, *this_cmd; + uword *p; + u32 arg_len; + int rv; + int (*fp) (vat_main_t *); + api_main_t *am = &api_main; + + vam->vl_input_queue = am->shmem_hdr->vl_input_queue; + + vec_reset_length (vam->inbuf); + vam->input = &_input; + + while (((c = unformat_get_input (input)) != '\n') && + (c != UNFORMAT_END_OF_INPUT)) + vec_add1 (vam->inbuf, c); + + /* Add 1 octet's worth of extra space in case there are no args... */ + vec_add1 (vam->inbuf, 0); + + /*$$$$ reinstall macro evaluator */ + + /* Split input into cmd + args */ + this_cmd = cmdp = vam->inbuf; + + 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) + return 0; + + p = hash_get_mem (vam->function_by_name, cmdp); + if (p == 0) + { + return clib_error_return (0, "'%s': function not found\n", cmdp); + } + + arg_len = strlen ((char *) argsp); + + unformat_init_string (vam->input, (char *) argsp, arg_len); + fp = (void *) p[0]; + + rv = (*fp) (vam); + + if (rv < 0) + { + unformat_free (vam->input); + return clib_error_return (0, + "%s error: %U\n", cmdp, + format_api_error, vam, rv); + + if (vam->regenerate_interface_table) + { + vam->regenerate_interface_table = 0; + api_sw_interface_dump (vam); + } + } + unformat_free (vam->input); + return 0; +} + +/* *INDENT-OFF* */ +VLIB_CLI_COMMAND (api_command, static) = +{ + .path = "binary-api", + .short_help = "binary-api <name> [<args>]", + .function = api_command_fn, +}; +/* *INDENT-ON* */ + +void +api_cli_output (void *notused, const char *fmt, ...) +{ + va_list va; + vat_main_t *vam = &vat_main; + vlib_main_t *vm = vam->vlib_main; + vlib_process_t *cp = vlib_get_current_process (vm); + u8 *s; + + va_start (va, fmt); + s = va_format (0, fmt, &va); + va_end (va); + + /* Terminate with \n if not present. */ + if (vec_len (s) > 0 && s[vec_len (s) - 1] != '\n') + vec_add1 (s, '\n'); + + if ((!cp) || (!cp->output_function)) + fformat (stdout, "%v", s); + else + cp->output_function (cp->output_function_arg, s, vec_len (s)); + + vec_free (s); +} + +/* + * fd.io coding-style-patch-verification: ON + * + * Local Variables: + * eval: (c-set-style "gnu") + * End: + */ diff --git a/vpp/vpp-api/json_format.c b/vpp/vpp-api/json_format.c new file mode 100644 index 00000000..63454b87 --- /dev/null +++ b/vpp/vpp-api/json_format.c @@ -0,0 +1,304 @@ +/* + *------------------------------------------------------------------ + * json_format.c + * + * Copyright (c) 2015 Cisco and/or its affiliates. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *------------------------------------------------------------------ + +*/ +#include <inttypes.h> +#include "json_format.h" +#include <vnet/ip/ip.h> +#include <vppinfra/vec.h> + +#define VAT_TAB_WIDTH 2 + +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) +{ + 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) +{ + 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; + } + } + + 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; +} + +static void +vat_json_indent_print (vat_print_ctx_t * ctx) +{ + 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, ...) +{ + va_list 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; +} + +static void +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__) +#define PPL(fmt,...) vat_json_indent_line(ctx, fmt"\n", ##__VA_ARGS__) +#define PP(fmt,...) vat_json_indent_line(ctx, fmt, ##__VA_ARGS__) +#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; + + if (!node) + { + return; + } + + 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; + 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; + case VAT_JSON_INT: + P ("%d", node->sint); + break; + case VAT_JSON_UINT: + P ("%" PRIu64, node->uint); + break; + case VAT_JSON_REAL: + P ("%f", node->real); + break; + case VAT_JSON_STRING: + P ("\"%s\"", node->string); + break; + case VAT_JSON_IPV4: + P ("\"%U\"", vat_json_format_ip4_address, &node->ip4); + break; + case VAT_JSON_IPV6: + P ("\"%U\"", vat_json_format_ip6_address, &node->ip6); + break; + default: + break; + } +#undef PPL +#undef PP +#undef PL +#undef P +} + +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"); +} + +void +vat_json_free (vat_json_node_t * node) +{ + int i = 0; + + if (NULL == node) + { + return; + } + 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; + 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; + case VAT_JSON_STRING: + if (NULL != node->string) + { + vec_free (node->string); + } + break; + default: + break; + } +} + +/* + * fd.io coding-style-patch-verification: ON + * + * Local Variables: + * eval: (c-set-style "gnu") + * End: + */ diff --git a/vpp/vpp-api/json_format.h b/vpp/vpp-api/json_format.h new file mode 100644 index 00000000..154fb3df --- /dev/null +++ b/vpp/vpp-api/json_format.h @@ -0,0 +1,254 @@ +/* + *------------------------------------------------------------------ + * json_format.h + * + * Copyright (c) 2015 Cisco and/or its affiliates. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *------------------------------------------------------------------ + */ + +#ifndef __JSON_FORMAT_H__ +#define __JSON_FORMAT_H__ + +#include <vppinfra/clib.h> +#include <vppinfra/format.h> +#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 +} 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_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); + +static_always_inline void +vat_json_init_object (vat_json_node_t * json) +{ + json->type = VAT_JSON_OBJECT; + json->pairs = NULL; +} + +static_always_inline void +vat_json_init_array (vat_json_node_t * json) +{ + json->type = VAT_JSON_ARRAY; + json->array = NULL; +} + +static_always_inline void +vat_json_set_string (vat_json_node_t * json, u8 * 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) +{ + 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) +{ + json->type = VAT_JSON_INT; + json->sint = num; +} + +static_always_inline void +vat_json_set_uint (vat_json_node_t * json, u64 num) +{ + json->type = VAT_JSON_UINT; + json->uint = num; +} + +static_always_inline void +vat_json_set_real (vat_json_node_t * json, f64 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) +{ + 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) +{ + 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) +{ + 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) +{ + 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) +{ + 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) +{ + 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) +{ + 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) +{ + 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) +{ + 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) +{ + 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) +{ + 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) +{ + 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) +{ + 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) +{ + 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) +{ + 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; + } + } + 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/vpp-api/vat.h b/vpp/vpp-api/vat.h new file mode 120000 index 00000000..b7a00e90 --- /dev/null +++ b/vpp/vpp-api/vat.h @@ -0,0 +1 @@ +../../vpp-api-test/vat/vat.h
\ No newline at end of file |