Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
session: API cleanup
[vpp.git]
/
src
/
plugins
/
ila
/
ila.c
diff --git
a/src/plugins/ila/ila.c
b/src/plugins/ila/ila.c
index
fd56043
..
162d417
100644
(file)
--- a/
src/plugins/ila/ila.c
+++ b/
src/plugins/ila/ila.c
@@
-68,6
+68,11
@@
static dpo_type_t ila_dpo_type;
*/
static fib_node_type_t ila_fib_node_type;
*/
static fib_node_type_t ila_fib_node_type;
+/**
+ * FIB source for adding entries
+ */
+static fib_source_t ila_fib_src;
+
u8 *
format_half_ip6_address (u8 * s, va_list * va)
{
u8 *
format_half_ip6_address (u8 * s, va_list * va)
{
@@
-517,8
+522,8
@@
ila_sir2ila (vlib_main_t * vm,
ip61->dst_address.as_u64[0] = ila_address1->as_u64[0];
ip61->dst_address.as_u64[1] = ila_address1->as_u64[1];
ip61->dst_address.as_u64[0] = ila_address1->as_u64[0];
ip61->dst_address.as_u64[1] = ila_address1->as_u64[1];
- vnet_feature_next (
vnet_buffer (p0)->sw_if_index[VLIB_RX],
&next0, p0);
- vnet_feature_next (
vnet_buffer (p1)->sw_if_index[VLIB_RX],
&next1, p1);
+ vnet_feature_next (&next0, p0);
+ vnet_feature_next (&next1, p1);
vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next,
n_left_to_next, pi0, pi1, next0,
vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next,
n_left_to_next, pi0, pi1, next0,
@@
-569,7
+574,7
@@
ila_sir2ila (vlib_main_t * vm,
ip60->dst_address.as_u64[0] = ila_address0->as_u64[0];
ip60->dst_address.as_u64[1] = ila_address0->as_u64[1];
ip60->dst_address.as_u64[0] = ila_address0->as_u64[0];
ip60->dst_address.as_u64[1] = ila_address0->as_u64[1];
- vnet_feature_next (
vnet_buffer (p0)->sw_if_index[VLIB_RX],
&next0, p0);
+ vnet_feature_next (&next0, p0);
vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
n_left_to_next, pi0, next0);
vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
n_left_to_next, pi0, next0);
@@
-758,7
+763,7
@@
ila_add_del_entry (ila_add_del_entry_args_t * args)
fib_table_entry_special_dpo_add(0,
&pfx,
fib_table_entry_special_dpo_add(0,
&pfx,
-
FIB_SOURCE_PLUGIN_HI
,
+
ila_fib_src
,
FIB_ENTRY_FLAG_EXCLUSIVE,
&dpo);
dpo_reset(&dpo);
FIB_ENTRY_FLAG_EXCLUSIVE,
&dpo);
dpo_reset(&dpo);
@@
-794,7
+799,7
@@
ila_add_del_entry (ila_add_del_entry_args_t * args)
.fp_proto = FIB_PROTOCOL_IP6,
};
.fp_proto = FIB_PROTOCOL_IP6,
};
- fib_table_entry_special_remove(0, &pfx,
FIB_SOURCE_PLUGIN_HI
);
+ fib_table_entry_special_remove(0, &pfx,
ila_fib_src
);
/*
* remove this ILA entry as child of the FIB netry for the next-hop
*/
/*
* remove this ILA entry as child of the FIB netry for the next-hop
*/
@@
-824,7
+829,7
@@
ila_interface (u32 sw_if_index, u8 disable)
/* *INDENT-OFF* */
VLIB_PLUGIN_REGISTER () = {
.version = VPP_BUILD_VER,
/* *INDENT-OFF* */
VLIB_PLUGIN_REGISTER () = {
.version = VPP_BUILD_VER,
- .description = "Identifier
-locator addressing
for IPv6",
+ .description = "Identifier
Locator Addressing (ILA)
for IPv6",
};
/* *INDENT-ON* */
};
/* *INDENT-ON* */
@@
-935,7
+940,9
@@
ila_init (vlib_main_t * vm)
ila_dpo_type = dpo_register_new_type(&ila_vft, ila_nodes);
ila_fib_node_type = fib_node_register_new_type(&ila_fib_node_vft);
ila_dpo_type = dpo_register_new_type(&ila_vft, ila_nodes);
ila_fib_node_type = fib_node_register_new_type(&ila_fib_node_vft);
-
+ ila_fib_src = fib_source_allocate("ila",
+ FIB_SOURCE_PRIORITY_HI,
+ FIB_SOURCE_BH_SIMPLE);
return NULL;
}
return NULL;
}