Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
tcp: fix fin in syn-rcvd
[vpp.git]
/
src
/
vnet
/
srv6
/
sr_localsid.c
diff --git
a/src/vnet/srv6/sr_localsid.c
b/src/vnet/srv6/sr_localsid.c
index
09b2423
..
7aeb1b6
100755
(executable)
--- a/
src/vnet/srv6/sr_localsid.c
+++ b/
src/vnet/srv6/sr_localsid.c
@@
-146,7
+146,7
@@
sr_cli_localsid (char is_del, ip6_address_t * localsid_addr,
/* Create a new localsid registry */
pool_get (sm->localsids, ls);
/* Create a new localsid registry */
pool_get (sm->localsids, ls);
- memset (ls, 0, sizeof (*ls));
+
clib_
memset (ls, 0, sizeof (*ls));
clib_memcpy (&ls->localsid, localsid_addr, sizeof (ip6_address_t));
ls->end_psp = end_psp;
clib_memcpy (&ls->localsid, localsid_addr, sizeof (ip6_address_t));
ls->end_psp = end_psp;
@@
-276,7
+276,7
@@
sr_cli_localsid_command_fn (vlib_main_t * vm, unformat_input_t * input,
int rv;
int rv;
- memset (&resulting_address, 0, sizeof (ip6_address_t));
+
clib_
memset (&resulting_address, 0, sizeof (ip6_address_t));
ip46_address_reset (&next_hop);
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
ip46_address_reset (&next_hop);
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
@@
-473,8
+473,7
@@
show_sr_localsid_command_fn (vlib_main_t * vm, unformat_input_t * input,
vlib_cli_output (vm,
"\tAddress: \t%U\n\tBehavior: \tT (Endpoint with specific IPv6 table lookup)"
"\n\tTable: \t%u",
vlib_cli_output (vm,
"\tAddress: \t%U\n\tBehavior: \tT (Endpoint with specific IPv6 table lookup)"
"\n\tTable: \t%u",
- format_ip6_address, &ls->localsid,
- format_vnet_sw_if_index_name, vnm, ls->vrf_index);
+ format_ip6_address, &ls->localsid, ls->vrf_index);
break;
case SR_BEHAVIOR_DX4:
vlib_cli_output (vm,
break;
case SR_BEHAVIOR_DX4:
vlib_cli_output (vm,
@@
-575,8
+574,8
@@
clear_sr_localsid_counters_command_fn (vlib_main_t * vm,
/* *INDENT-OFF* */
VLIB_CLI_COMMAND (clear_sr_localsid_counters_command, static) = {
/* *INDENT-OFF* */
VLIB_CLI_COMMAND (clear_sr_localsid_counters_command, static) = {
- .path = "clear sr localsid
counters",
- .short_help = "clear sr localsid
counters",
+ .path = "clear sr localsid
-
counters",
+ .short_help = "clear sr localsid
-
counters",
.function = clear_sr_localsid_counters_command_fn,
};
/* *INDENT-ON* */
.function = clear_sr_localsid_counters_command_fn,
};
/* *INDENT-ON* */
@@
-888,7
+887,7
@@
sr_localsid_d_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
from = vlib_frame_vector_args (from_frame);
n_left_from = from_frame->n_vectors;
next_index = node->cached_next_index;
from = vlib_frame_vector_args (from_frame);
n_left_from = from_frame->n_vectors;
next_index = node->cached_next_index;
- u32 thread_index = v
lib_get_thread_index ()
;
+ u32 thread_index = v
m->thread_index
;
while (n_left_from > 0)
{
while (n_left_from > 0)
{
@@
-947,13
+946,13
@@
sr_localsid_d_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
vnet_buffer (b0)->ip.adj_index[VLIB_TX]);
ls1 =
pool_elt_at_index (sm->localsids,
vnet_buffer (b0)->ip.adj_index[VLIB_TX]);
ls1 =
pool_elt_at_index (sm->localsids,
- vnet_buffer (b
0
)->ip.adj_index[VLIB_TX]);
+ vnet_buffer (b
1
)->ip.adj_index[VLIB_TX]);
ls2 =
pool_elt_at_index (sm->localsids,
ls2 =
pool_elt_at_index (sm->localsids,
- vnet_buffer (b
0
)->ip.adj_index[VLIB_TX]);
+ vnet_buffer (b
2
)->ip.adj_index[VLIB_TX]);
ls3 =
pool_elt_at_index (sm->localsids,
ls3 =
pool_elt_at_index (sm->localsids,
- vnet_buffer (b
0
)->ip.adj_index[VLIB_TX]);
+ vnet_buffer (b
3
)->ip.adj_index[VLIB_TX]);
ip0 = vlib_buffer_get_current (b0);
ip1 = vlib_buffer_get_current (b1);
ip0 = vlib_buffer_get_current (b0);
ip1 = vlib_buffer_get_current (b1);
@@
-1191,7
+1190,7
@@
sr_localsid_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
from = vlib_frame_vector_args (from_frame);
n_left_from = from_frame->n_vectors;
next_index = node->cached_next_index;
from = vlib_frame_vector_args (from_frame);
n_left_from = from_frame->n_vectors;
next_index = node->cached_next_index;
- u32 thread_index = v
lib_get_thread_index ()
;
+ u32 thread_index = v
m->thread_index
;
while (n_left_from > 0)
{
while (n_left_from > 0)
{
@@
-1260,13
+1259,13
@@
sr_localsid_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
vnet_buffer (b0)->ip.adj_index[VLIB_TX]);
ls1 =
pool_elt_at_index (sm->localsids,
vnet_buffer (b0)->ip.adj_index[VLIB_TX]);
ls1 =
pool_elt_at_index (sm->localsids,
- vnet_buffer (b
0
)->ip.adj_index[VLIB_TX]);
+ vnet_buffer (b
1
)->ip.adj_index[VLIB_TX]);
ls2 =
pool_elt_at_index (sm->localsids,
ls2 =
pool_elt_at_index (sm->localsids,
- vnet_buffer (b
0
)->ip.adj_index[VLIB_TX]);
+ vnet_buffer (b
2
)->ip.adj_index[VLIB_TX]);
ls3 =
pool_elt_at_index (sm->localsids,
ls3 =
pool_elt_at_index (sm->localsids,
- vnet_buffer (b
0
)->ip.adj_index[VLIB_TX]);
+ vnet_buffer (b
3
)->ip.adj_index[VLIB_TX]);
end_srh_processing (node, b0, ip0, sr0, ls0, &next0, ls0->end_psp,
prev0);
end_srh_processing (node, b0, ip0, sr0, ls0, &next0, ls0->end_psp,
prev0);
@@
-1550,7
+1549,7
@@
sr_localsid_register_function (vlib_main_t * vm, u8 * fn_name,
plugin - sm->plugin_functions);
}
plugin - sm->plugin_functions);
}
- memset (plugin, 0, sizeof (*plugin));
+
clib_
memset (plugin, 0, sizeof (*plugin));
plugin->sr_localsid_function_number = (plugin - sm->plugin_functions);
plugin->sr_localsid_function_number += SR_BEHAVIOR_LAST;
plugin->sr_localsid_function_number = (plugin - sm->plugin_functions);
plugin->sr_localsid_function_number += SR_BEHAVIOR_LAST;