Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
migrate ipsec to new multiarch infra
[vpp.git]
/
src
/
vnet
/
ipsec
/
ipsec_if_in.c
diff --git
a/src/vnet/ipsec/ipsec_if_in.c
b/src/vnet/ipsec/ipsec_if_in.c
index
655668a
..
a9aab82
100644
(file)
--- a/
src/vnet/ipsec/ipsec_if_in.c
+++ b/
src/vnet/ipsec/ipsec_if_in.c
@@
-59,9
+59,9
@@
format_ipsec_if_input_trace (u8 * s, va_list * args)
return s;
}
return s;
}
-static uword
-
ipsec_if_input_node_fn (vlib_main_t * vm,
vlib_node_runtime_t * node,
- vlib_frame_t * from_frame)
+VLIB_NODE_FN (ipsec_if_input_node) (vlib_main_t * vm,
+
vlib_node_runtime_t * node,
+
vlib_frame_t * from_frame)
{
ipsec_main_t *im = &ipsec_main;
vnet_main_t *vnm = im->vnet_main;
{
ipsec_main_t *im = &ipsec_main;
vnet_main_t *vnm = im->vnet_main;
@@
-69,7
+69,7
@@
ipsec_if_input_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
ipsec_proto_main_t *em = &ipsec_proto_main;
u32 *from, *to_next = 0, next_index;
u32 n_left_from, last_sw_if_index = ~0;
ipsec_proto_main_t *em = &ipsec_proto_main;
u32 *from, *to_next = 0, next_index;
u32 n_left_from, last_sw_if_index = ~0;
- u32 thread_index = v
lib_get_thread_index ()
;
+ u32 thread_index = v
m->thread_index
;
u64 n_bytes = 0, n_packets = 0;
u8 icv_len;
ipsec_tunnel_if_t *last_t = NULL;
u64 n_bytes = 0, n_packets = 0;
u8 icv_len;
ipsec_tunnel_if_t *last_t = NULL;
@@
-179,7
+179,7
@@
ipsec_if_input_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
}
vlib_buffer_advance (b0, ip4_header_bytes (ip0));
}
vlib_buffer_advance (b0, ip4_header_bytes (ip0));
- next0 = im->esp_decrypt_next_index;
+ next0 = im->esp
4
_decrypt_next_index;
}
trace:
}
trace:
@@
-222,7
+222,6
@@
ipsec_if_input_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
/* *INDENT-OFF* */
VLIB_REGISTER_NODE (ipsec_if_input_node) = {
/* *INDENT-OFF* */
VLIB_REGISTER_NODE (ipsec_if_input_node) = {
- .function = ipsec_if_input_node_fn,
.name = "ipsec-if-input",
.vector_size = sizeof (u32),
.format_trace = format_ipsec_if_input_trace,
.name = "ipsec-if-input",
.vector_size = sizeof (u32),
.format_trace = format_ipsec_if_input_trace,
@@
-231,11
+230,10
@@
VLIB_REGISTER_NODE (ipsec_if_input_node) = {
.n_errors = ARRAY_LEN(ipsec_if_input_error_strings),
.error_strings = ipsec_if_input_error_strings,
.n_errors = ARRAY_LEN(ipsec_if_input_error_strings),
.error_strings = ipsec_if_input_error_strings,
- .sibling_of = "ipsec
-input-ip4
",
+ .sibling_of = "ipsec
4-input
",
};
/* *INDENT-ON* */
};
/* *INDENT-ON* */
-VLIB_NODE_FUNCTION_MULTIARCH (ipsec_if_input_node, ipsec_if_input_node_fn)
/*
* fd.io coding-style-patch-verification: ON
*
/*
* fd.io coding-style-patch-verification: ON
*