ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

memif: mode ip is not settable from binary API

Browse Source 
While mode ip is supported via the CLI for creating a memif interface,
it is not settable from the binary API due to missing code.

While at it, update the help usage to include the missing keyword secret.

Change-Id: Ia9c71f4017210a5e1733ce4992fbb566b7d20c1a
Signed-off-by: Steven <sluong@cisco.com>
This commit is contained in:
Steven
2017-09-08 15:40:32 -07:00
committed by Damjan Marion
parent 1500254bee
commit a19e1054b5
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/memif/cli.c
View File

@ -109,8 +109,8 @@ VLIB_CLI_COMMAND (memif_create_command, static) = {
.path = "create memif", .path = "create memif",
.short_help = "create memif [id <id>] [socket <path>] " .short_help = "create memif [id <id>] [socket <path>] "
"[ring-size <size>] [buffer-size <size>] [hw-addr <mac-address>] " "[ring-size <size>] [buffer-size <size>] [hw-addr <mac-address>] "
"<master|slave> [rx-queues <number>] [tx-queues <number>]" "<master|slave> [rx-queues <number>] [tx-queues <number>] "
"[mode ip]", "[mode ip] [secret <string>]",
.function = memif_create_command_fn, .function = memif_create_command_fn,
}; };
/* *INDENT-ON* */ /* *INDENT-ON* */

3
src/plugins/memif/memif_api.c
View File

@ -133,6 +133,9 @@ vl_api_memif_create_t_handler (vl_api_memif_create_t * mp)
/* role */ /* role */
args.is_master = (mp->role == 0); args.is_master = (mp->role == 0);
/* mode */
args.mode = mp->mode;
/* rx/tx queues */ /* rx/tx queues */
if (args.is_master == 0) if (args.is_master == 0)
{ {

7
src/plugins/memif/memif_test.c
View File

@ -129,7 +129,7 @@ api_memif_create (vat_main_t * vam)
u32 rx_queues = MEMIF_DEFAULT_RX_QUEUES; u32 rx_queues = MEMIF_DEFAULT_RX_QUEUES;
u32 tx_queues = MEMIF_DEFAULT_TX_QUEUES; u32 tx_queues = MEMIF_DEFAULT_TX_QUEUES;
int ret; int ret;
u8 mode = MEMIF_INTERFACE_MODE_ETHERNET;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{ {
@ -148,6 +148,8 @@ api_memif_create (vat_main_t * vam)
else if (unformat (i, "slave %U", else if (unformat (i, "slave %U",
unformat_memif_queues, &rx_queues, &tx_queues)) unformat_memif_queues, &rx_queues, &tx_queues))
role = 1; role = 1;
else if (unformat (i, "mode ip"))
mode = MEMIF_INTERFACE_MODE_IP;
else if (unformat (i, "hw_addr %U", unformat_ethernet_address, hw_addr)) else if (unformat (i, "hw_addr %U", unformat_ethernet_address, hw_addr))
; ;
else else
@ -177,6 +179,7 @@ api_memif_create (vat_main_t * vam)
M (MEMIF_CREATE, mp); M (MEMIF_CREATE, mp);
mp->mode = mode;
mp->id = clib_host_to_net_u32 (id); mp->id = clib_host_to_net_u32 (id);
mp->role = role; mp->role = role;
mp->ring_size = clib_host_to_net_u32 (ring_size); mp->ring_size = clib_host_to_net_u32 (ring_size);
@ -309,7 +312,7 @@ static void vl_api_memif_details_t_handler (vl_api_memif_details_t * mp)
#define foreach_vpe_api_msg \ #define foreach_vpe_api_msg \
_(memif_create, "[id <id>] [socket <path>] [ring_size <size>] " \ _(memif_create, "[id <id>] [socket <path>] [ring_size <size>] " \
"[buffer_size <size>] [hw_addr <mac_address>] " \ "[buffer_size <size>] [hw_addr <mac_address>] " \
"<master|slave>") \ "[secret <string>] [mode ip] <master|slave>") \
_(memif_delete, "<sw_if_index>") \ _(memif_delete, "<sw_if_index>") \
_(memif_dump, "") _(memif_dump, "")