commit 32dc913e6f3a026fc8e1fec396b12e70dfeb4cf0
author Benoît Ganne <bganne@cisco.com> Mon Jun 17 15:33:59 2024 +0200
committer Ole Tr�an <otroan@employees.org> Mon Jun 17 18:44:59 2024 +0000
tree 9b1a488d1fd76015e6c04884692302513a126fac
parent 448f08b685e880f472790ad96ad35c19851ef481

vnet: move format_vl_api_address_union() from vpp to vnet

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>

src/vnet/fib/fib_api.c

diff --git a/src/vnet/fib/fib_api.c b/src/vnet/fib/fib_api.c
index 1b1c0d1..426161b 100644
--- a/src/vnet/fib/fib_api.c
+++ b/src/vnet/fib/fib_api.c
@@ -494,6 +494,21 @@
     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)
 {

src/vnet/fib/fib_api.h

diff --git a/src/vnet/fib/fib_api.h b/src/vnet/fib/fib_api.h
index 0c59531..9eac62f 100644
--- a/src/vnet/fib/fib_api.h
+++ b/src/vnet/fib/fib_api.h
@@ -51,6 +51,7 @@
                                   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);
 
 

src/vpp/api/types.c

diff --git a/src/vpp/api/types.c b/src/vpp/api/types.c
index 92bbdb3..8e11810 100644
--- a/src/vpp/api/types.c
+++ b/src/vpp/api/types.c
@@ -49,21 +49,6 @@
 }
 
 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)
 {
   const vl_api_ip4_address_t *addr = va_arg (*args, vl_api_ip4_address_t *);

src/vpp/api/types.h

diff --git a/src/vpp/api/types.h b/src/vpp/api/types.h
index 9864e8c..7a546db 100644
--- a/src/vpp/api/types.h
+++ b/src/vpp/api/types.h
@@ -40,7 +40,6 @@
 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);