ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vnet: move format_vl_api_address_union() from vpp to vnet

Browse Source 
format_vl_api_address_union() is used by vnet, creating a linkage
dependency from vnet to vpp.

Type: fix

Change-Id: I298a90d521e51b7527ef140d66130062824e1d16
Signed-off-by: Benoît Ganne <bganne@cisco.com>
This commit is contained in:
Benoît Ganne
2024-06-17 15:33:59 +02:00
committed by Ole Tr�an
parent 448f08b685
commit 32dc913e6f
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/vnet/fib/fib_api.c
View File

@ -494,6 +494,21 @@ fib_api_route_add_del (u8 is_add,
return (0);
}
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, int);
if (ADDRESS_IP6 == af)
s = format (s, "%U", format_ip6_address, addr->ip6);
else
s = format (s, "%U", format_ip4_address, addr->ip4);
return s;
}
u8*
format_vl_api_fib_path (u8 * s, va_list * args)
{

1
src/vnet/fib/fib_api.h
View File

@ -51,6 +51,7 @@ extern int fib_api_route_add_del (u8 is_add,
fib_entry_flag_t entry_flags,
fib_route_path_t *rpaths);
extern u8 *format_vl_api_address_union (u8 * s, va_list * args);
extern u8* format_vl_api_fib_path(u8 * s, va_list * args);

15
src/vpp/api/types.c
View File

@ -48,21 +48,6 @@ format_vl_api_address (u8 * s, va_list * args)
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, int);
if (ADDRESS_IP6 == af)
s = format (s, "%U", format_ip6_address, addr->ip6);
else
s = format (s, "%U", format_ip4_address, addr->ip4);
return s;
}
u8 *
format_vl_api_ip4_address (u8 * s, va_list * args)
{

1
src/vpp/api/types.h
View File

@ -40,7 +40,6 @@ extern u8 *format_vl_api_address (u8 * s, va_list * args);
extern u8 *format_vl_api_address_family (u8 * s, va_list * args);
extern u8 *format_vl_api_ip4_address (u8 * s, va_list * args);
extern u8 *format_vl_api_ip6_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);
extern u8 *format_vl_api_mac_address (u8 * s, va_list * args);