Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
classify: Reduce the include dependencies on vnet_classify.h
[vpp.git]
/
src
/
vnet
/
fib
/
fib_api.c
diff --git
a/src/vnet/fib/fib_api.c
b/src/vnet/fib/fib_api.c
index
e020b26
..
54cff92
100644
(file)
--- a/
src/vnet/fib/fib_api.c
+++ b/
src/vnet/fib/fib_api.c
@@
-21,6
+21,7
@@
#include <vnet/mfib/mfib_table.h>
#include <vnet/bier/bier_disp_table.h>
#include <vpp/api/types.h>
#include <vnet/mfib/mfib_table.h>
#include <vnet/bier/bier_disp_table.h>
#include <vpp/api/types.h>
+#include <vnet/classify/vnet_classify.h>
#include <vnet/vnet_msg_enum.h>
#include <vnet/vnet_msg_enum.h>
@@
-75,9
+76,9
@@
fib_api_next_hop_decode (const vl_api_fib_path_t *in,
ip46_address_t *out)
{
if (in->proto == FIB_API_PATH_NH_PROTO_IP4)
ip46_address_t *out)
{
if (in->proto == FIB_API_PATH_NH_PROTO_IP4)
- memcpy (&out->ip4, &in->nh.address.ip4, sizeof (out->ip4));
+
clib_
memcpy (&out->ip4, &in->nh.address.ip4, sizeof (out->ip4));
else if (in->proto == FIB_API_PATH_NH_PROTO_IP6)
else if (in->proto == FIB_API_PATH_NH_PROTO_IP6)
- memcpy (&out->ip6, &in->nh.address.ip6, sizeof (out->ip6));
+
clib_
memcpy (&out->ip6, &in->nh.address.ip6, sizeof (out->ip6));
}
static vl_api_fib_path_nh_proto_t
}
static vl_api_fib_path_nh_proto_t
@@
-110,11
+111,11
@@
fib_api_next_hop_encode (const fib_route_path_t *rpath,
fp->proto = fib_api_path_dpo_proto_to_nh(rpath->frp_proto);
if (rpath->frp_proto == DPO_PROTO_IP4)
fp->proto = fib_api_path_dpo_proto_to_nh(rpath->frp_proto);
if (rpath->frp_proto == DPO_PROTO_IP4)
- memcpy (&fp->nh.address.ip4,
+
clib_
memcpy (&fp->nh.address.ip4,
&rpath->frp_addr.ip4,
sizeof (rpath->frp_addr.ip4));
else if (rpath->frp_proto == DPO_PROTO_IP6)
&rpath->frp_addr.ip4,
sizeof (rpath->frp_addr.ip4));
else if (rpath->frp_proto == DPO_PROTO_IP6)
- memcpy (&fp->nh.address.ip6,
+
clib_
memcpy (&fp->nh.address.ip6,
&rpath->frp_addr.ip6,
sizeof (rpath->frp_addr.ip6));
}
&rpath->frp_addr.ip6,
sizeof (rpath->frp_addr.ip6));
}