Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add more CLI options to vpp_api_test for calling ip_add_del_route
[vpp.git]
/
src
/
vat
/
api_format.c
diff --git
a/src/vat/api_format.c
b/src/vat/api_format.c
index
0dde721
..
0a01989
100644
(file)
--- a/
src/vat/api_format.c
+++ b/
src/vat/api_format.c
@@
-8486,6
+8486,8
@@
api_ip_add_del_route (vat_main_t * vam)
mpls_label_t next_hop_out_label = MPLS_LABEL_INVALID;
mpls_label_t next_hop_via_label = MPLS_LABEL_INVALID;
mpls_label_t next_hop_out_label = MPLS_LABEL_INVALID;
mpls_label_t next_hop_via_label = MPLS_LABEL_INVALID;
+ memset (&v4_next_hop_address, 0, sizeof (ip4_address_t));
+ memset (&v6_next_hop_address, 0, sizeof (ip6_address_t));
/* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
/* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
@@
-8518,6
+8520,16
@@
api_ip_add_del_route (vat_main_t * vam)
{
next_hop_set = 1;
}
{
next_hop_set = 1;
}
+ else
+ if (unformat
+ (i, "via %U", api_unformat_sw_if_index, vam, &sw_if_index))
+ {
+ next_hop_set = 1;
+ }
+ else if (unformat (i, "via sw_if_index %d", &sw_if_index))
+ {
+ next_hop_set = 1;
+ }
else if (unformat (i, "resolve-attempts %d", &resolve_attempts))
;
else if (unformat (i, "weight %d", &next_hop_weight))
else if (unformat (i, "resolve-attempts %d", &resolve_attempts))
;
else if (unformat (i, "weight %d", &next_hop_weight))
@@
-14053,6
+14065,8
@@
api_create_vhost_user_if (vat_main_t * vam)
u32 custom_dev_instance = ~0;
u8 hwaddr[6];
u8 use_custom_mac = 0;
u32 custom_dev_instance = ~0;
u8 hwaddr[6];
u8 use_custom_mac = 0;
+ u8 disable_mrg_rxbuf = 0;
+ u8 disable_indirect_desc = 0;
u8 *tag = 0;
int ret;
u8 *tag = 0;
int ret;
@@
-14071,6
+14085,10
@@
api_create_vhost_user_if (vat_main_t * vam)
use_custom_mac = 1;
else if (unformat (i, "server"))
is_server = 1;
use_custom_mac = 1;
else if (unformat (i, "server"))
is_server = 1;
+ else if (unformat (i, "disable_mrg_rxbuf"))
+ disable_mrg_rxbuf = 1;
+ else if (unformat (i, "disable_indirect_desc"))
+ disable_indirect_desc = 1;
else if (unformat (i, "tag %s", &tag))
;
else
else if (unformat (i, "tag %s", &tag))
;
else
@@
-14093,6
+14111,8
@@
api_create_vhost_user_if (vat_main_t * vam)
M (CREATE_VHOST_USER_IF, mp);
mp->is_server = is_server;
M (CREATE_VHOST_USER_IF, mp);
mp->is_server = is_server;
+ mp->disable_mrg_rxbuf = disable_mrg_rxbuf;
+ mp->disable_indirect_desc = disable_indirect_desc;
clib_memcpy (mp->sock_filename, file_name, vec_len (file_name));
vec_free (file_name);
if (custom_dev_instance != ~0)
clib_memcpy (mp->sock_filename, file_name, vec_len (file_name));
vec_free (file_name);
if (custom_dev_instance != ~0)
@@
-14100,6
+14120,7
@@
api_create_vhost_user_if (vat_main_t * vam)
mp->renumber = 1;
mp->custom_dev_instance = ntohl (custom_dev_instance);
}
mp->renumber = 1;
mp->custom_dev_instance = ntohl (custom_dev_instance);
}
+
mp->use_custom_mac = use_custom_mac;
clib_memcpy (mp->mac_address, hwaddr, 6);
if (tag)
mp->use_custom_mac = use_custom_mac;
clib_memcpy (mp->mac_address, hwaddr, 6);
if (tag)
@@
-20431,9
+20452,9
@@
vl_api_ip_fib_details_t_handler (vl_api_ip_fib_details_t * mp)
int i;
print (vam->ofp,
int i;
print (vam->ofp,
- "table-id %d, prefix %U/%d",
+ "table-id %d, prefix %U/%d
stats-index %d
",
ntohl (mp->table_id), format_ip4_address, mp->address,
ntohl (mp->table_id), format_ip4_address, mp->address,
- mp->address_length);
+ mp->address_length
, ntohl (mp->stats_index)
);
fp = mp->path;
for (i = 0; i < count; i++)
{
fp = mp->path;
for (i = 0; i < count; i++)
{
@@
-20643,9
+20664,9
@@
vl_api_ip6_fib_details_t_handler (vl_api_ip6_fib_details_t * mp)
int i;
print (vam->ofp,
int i;
print (vam->ofp,
- "table-id %d, prefix %U/%d",
+ "table-id %d, prefix %U/%d
stats-index %d
",
ntohl (mp->table_id), format_ip6_address, mp->address,
ntohl (mp->table_id), format_ip6_address, mp->address,
- mp->address_length);
+ mp->address_length
, ntohl (mp->stats_index)
);
fp = mp->path;
for (i = 0; i < count; i++)
{
fp = mp->path;
for (i = 0; i < count; i++)
{
@@
-23500,8
+23521,8
@@
_(sw_interface_slave_dump, \
_(ip_table_add_del, \
"table <n> [ipv6] [add | del]\n") \
_(ip_add_del_route, \
_(ip_table_add_del, \
"table <n> [ipv6] [add | del]\n") \
_(ip_add_del_route, \
- "<addr>/<mask> via <
addr | via-label <n>> [table-id <n>]\n"
\
- "[
<intfc> | sw_if_index <id>] [resolve-attempts <n>]\n"
\
+ "<addr>/<mask> via <
<addr>|<intfc>|sw_if_index <id>|via-label <n>>\n"
\
+ "[
table-id <n>] [<intfc> | sw_if_index <id>] [resolve-attempts <n>]\n"
\
"[weight <n>] [drop] [local] [classify <n>] [del]\n" \
"[multipath] [count <n>]") \
_(ip_mroute_add_del, \
"[weight <n>] [drop] [local] [classify <n>] [del]\n" \
"[multipath] [count <n>]") \
_(ip_mroute_add_del, \
@@
-23632,6
+23653,7
@@
_(l2_interface_vlan_tag_rewrite, \
"[translate-2-[1|2]] [push_dot1q 0] tag1 <nn> tag2 <nn>") \
_(create_vhost_user_if, \
"socket <filename> [server] [renumber <dev_instance>] " \
"[translate-2-[1|2]] [push_dot1q 0] tag1 <nn> tag2 <nn>") \
_(create_vhost_user_if, \
"socket <filename> [server] [renumber <dev_instance>] " \
+ "[disable_mrg_rxbuf] [disable_indirect_desc] " \
"[mac <mac_address>]") \
_(modify_vhost_user_if, \
"<intfc> | sw_if_index <nn> socket <filename>\n" \
"[mac <mac_address>]") \
_(modify_vhost_user_if, \
"<intfc> | sw_if_index <nn> socket <filename>\n" \