Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
sr: Change the CLI keyword from address to prefix.
[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
2e8b10d
..
4c21edf
100755
(executable)
--- a/
src/vnet/srv6/sr_localsid.c
+++ b/
src/vnet/srv6/sr_localsid.c
@@
-144,6
+144,11
@@
sr_cli_localsid (char is_del, ip6_address_t * localsid_addr,
pref_length = plugin->prefix_length;
}
pref_length = plugin->prefix_length;
}
+ if (localsid_prefix_len != 0)
+ {
+ pref_length = localsid_prefix_len;
+ }
+
/* Check whether there exists a FIB entry with such address */
fib_prefix_t pfx = {
.fp_proto = FIB_PROTOCOL_IP6,
/* Check whether there exists a FIB entry with such address */
fib_prefix_t pfx = {
.fp_proto = FIB_PROTOCOL_IP6,
@@
-152,11
+157,7
@@
sr_cli_localsid (char is_del, ip6_address_t * localsid_addr,
pfx.fp_addr.as_u64[0] = localsid_addr->as_u64[0];
pfx.fp_addr.as_u64[1] = localsid_addr->as_u64[1];
pfx.fp_addr.as_u64[0] = localsid_addr->as_u64[0];
pfx.fp_addr.as_u64[1] = localsid_addr->as_u64[1];
-
- if (pref_length != 0)
- {
- pfx.fp_len = pref_length;
- }
+ pfx.fp_len = pref_length;
/* Lookup the FIB index associated to the table id provided */
u32 fib_index = fib_table_find (FIB_PROTOCOL_IP6, fib_table);
/* Lookup the FIB index associated to the table id provided */
u32 fib_index = fib_table_find (FIB_PROTOCOL_IP6, fib_table);
@@
-311,7
+312,7
@@
sr_cli_localsid_command_fn (vlib_main_t * vm, unformat_input_t * input,
if (unformat (input, "del"))
is_del = 1;
else if (!address_set
if (unformat (input, "del"))
is_del = 1;
else if (!address_set
- && unformat (input, "
address
%U/%u", unformat_ip6_address,
+ && unformat (input, "
prefix
%U/%u", unformat_ip6_address,
&resulting_address, &prefix_len))
address_set = 1;
else if (!address_set
&resulting_address, &prefix_len))
address_set = 1;
else if (!address_set