diff options
| author |   Neale Ranns <nranns@cisco.com> | 2018-11-02 09:14:01 -0700 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2018-11-05 12:29:53 +0000 |
| commit | 86327be9751ad54cb24d16c161cacb001dc20772 (patch) | |
| tree | e9afa974edc516244805f1d0296909920dc8d49f /src/vnet/ip | |
| parent | 871bca9aa7a850c66228ce7124d459a6e6f21e72 (diff) | |
Genric API types format/unformat support for VAT and custom dump
Change-Id: I8bc3a991f0ede0605d78b51ba609fbe5889513f2
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/vnet/ip')
| -rw-r--r-- | src/vnet/ip/ip_types_api.c | 39 | ||||
| -rw-r--r-- | src/vnet/ip/ip_types_api.h | 5 |
2 files changed, 0 insertions, 44 deletions
diff --git a/src/vnet/ip/ip_types_api.c b/src/vnet/ip/ip_types_api.c index d5a56fa5547..11b52760fad 100644 --- a/src/vnet/ip/ip_types_api.c +++ b/src/vnet/ip/ip_types_api.c @@ -140,45 +140,6 @@ ip_mprefix_decode (const vl_api_mprefix_t * in, mfib_prefix_t * out) ip_address_union_decode (&in->src_address, in->af, &out->fp_src_addr); } -u8 * -format_vl_api_address (u8 * s, va_list * args) -{ - const vl_api_address_t *addr = va_arg (*args, vl_api_address_t *); - - if (ADDRESS_IP6 == clib_net_to_host_u32 (addr->af)) - s = format (s, "ip6:%U", format_ip6_address, addr->un.ip6.address); - else - s = format (s, "ip4:%U", format_ip4_address, addr->un.ip4.address); - - return s; -} - -u8 * -format_vl_api_address_union (u8 * s, va_list * args) -{ - const vl_api_address_union_t *addr = - va_arg (*args, vl_api_address_union_t *); - vl_api_address_family_t af = va_arg (*args, vl_api_address_family_t); - - if (ADDRESS_IP6 == af) - s = format (s, "ip6:%U", format_ip6_address, addr->ip6.address); - else - s = format (s, "ip4:%U", format_ip4_address, addr->ip4.address); - - return s; -} - -u8 * -format_vl_api_prefix (u8 * s, va_list * args) -{ - const vl_api_prefix_t *pfx = va_arg (*args, vl_api_prefix_t *); - - s = format (s, "%U/%d", format_vl_api_address, - &pfx->address, pfx->address_length); - - return s; -} - /* * fd.io coding-style-patch-verification: ON * diff --git a/src/vnet/ip/ip_types_api.h b/src/vnet/ip/ip_types_api.h index 1bc899a4588..be41bf59ec3 100644 --- a/src/vnet/ip/ip_types_api.h +++ b/src/vnet/ip/ip_types_api.h @@ -46,11 +46,6 @@ extern void ip_mprefix_decode (const struct _vl_api_mprefix *in, extern void ip_mprefix_encode (const mfib_prefix_t * in, struct _vl_api_mprefix *out); -extern u8 *format_vl_api_address (u8 * s, va_list * args); -extern u8 *format_vl_api_address_union (u8 * s, va_list * args); -extern u8 *format_vl_api_prefix (u8 * s, va_list * args); -extern u8 *format_vl_api_mprefix (u8 * s, va_list * args); - #endif /* |