diff options
Diffstat (limited to 'src/vat')
| -rw-r--r-- | src/vat/api_format.c | 60 |
1 files changed, 37 insertions, 23 deletions
diff --git a/src/vat/api_format.c b/src/vat/api_format.c index 652fe0310c2..a6f53dff557 100644 --- a/src/vat/api_format.c +++ b/src/vat/api_format.c @@ -7336,14 +7336,19 @@ api_tap_create_v2 (vat_main_t * vam) u8 random_mac = 1; u32 id = ~0; u8 *host_if_name = 0; + u8 host_if_name_set = 0; u8 *host_ns = 0; + u8 host_ns_set = 0; u8 host_mac_addr[6]; u8 host_mac_addr_set = 0; u8 *host_bridge = 0; + u8 host_bridge_set = 0; + u8 host_ip4_addr_set = 0; ip4_address_t host_ip4_addr; ip4_address_t host_ip4_gw; u8 host_ip4_gw_set = 0; u32 host_ip4_prefix_len = 0; + u8 host_ip6_addr_set = 0; ip6_address_t host_ip6_addr; ip6_address_t host_ip6_gw; u8 host_ip6_gw_set = 0; @@ -7365,31 +7370,31 @@ api_tap_create_v2 (vat_main_t * vam) } else if (unformat (i, "id %u", &id)) ; - else if (unformat (i, "host-if-name %s", &host_if_name)) + else if (unformat (i, "rx-ring-size %d", &rx_ring_sz)) ; - else if (unformat (i, "host-ns %s", &host_ns)) + else if (unformat (i, "tx-ring-size %d", &tx_ring_sz)) ; + else if (unformat (i, "host-if-name %s", &host_if_name)) + host_if_name_set = 1; + else if (unformat (i, "host-ns %s", &host_ns)) + host_ns_set = 1; else if (unformat (i, "host-mac-addr %U", unformat_ethernet_address, host_mac_addr)) host_mac_addr_set = 1; else if (unformat (i, "host-bridge %s", &host_bridge)) - ; + host_bridge_set = 1; else if (unformat (i, "host-ip4-addr %U/%d", unformat_ip4_address, &host_ip4_addr, &host_ip4_prefix_len)) - ; + host_ip4_addr_set = 1; else if (unformat (i, "host-ip6-addr %U/%d", unformat_ip6_address, &host_ip6_addr, &host_ip6_prefix_len)) - ; + host_ip6_addr_set = 1; else if (unformat (i, "host-ip4-gw %U", unformat_ip4_address, &host_ip4_gw)) host_ip4_gw_set = 1; else if (unformat (i, "host-ip6-gw %U", unformat_ip6_address, &host_ip6_gw)) host_ip6_gw_set = 1; - else if (unformat (i, "rx-ring-size %d", &rx_ring_sz)) - ; - else if (unformat (i, "tx-ring-size %d", &tx_ring_sz)) - ; else if (unformat (i, "host-mtu-size %d", &host_mtu_size)) host_mtu_set = 1; else if (unformat (i, "no-gso")) @@ -7454,15 +7459,18 @@ api_tap_create_v2 (vat_main_t * vam) /* Construct the API message */ M (TAP_CREATE_V2, mp); - mp->use_random_mac = random_mac; - mp->id = ntohl (id); - mp->host_namespace_set = host_ns != 0; - mp->host_bridge_set = host_bridge != 0; - mp->host_ip4_addr_set = host_ip4_prefix_len != 0; - mp->host_ip6_addr_set = host_ip6_prefix_len != 0; + mp->use_random_mac = random_mac; mp->rx_ring_sz = ntohs (rx_ring_sz); mp->tx_ring_sz = ntohs (tx_ring_sz); + mp->host_if_name_set = host_if_name_set; + mp->host_namespace_set = host_ns_set; + mp->host_mac_addr_set = host_mac_addr_set; + mp->host_bridge_set = host_bridge_set; + mp->host_ip4_addr_set = host_ip4_addr_set; + mp->host_ip6_addr_set = host_ip6_addr_set; + mp->host_ip4_gw_set = host_ip4_gw_set; + mp->host_ip6_gw_set = host_ip6_gw_set; mp->host_mtu_set = host_mtu_set; mp->host_mtu_size = ntohl (host_mtu_size); mp->tap_flags = ntohl (tap_flags); @@ -7471,16 +7479,22 @@ api_tap_create_v2 (vat_main_t * vam) clib_memcpy (mp->mac_address, mac_address, 6); if (host_mac_addr_set) clib_memcpy (mp->host_mac_addr, host_mac_addr, 6); - if (host_if_name) + if (host_if_name_set) clib_memcpy (mp->host_if_name, host_if_name, vec_len (host_if_name)); - if (host_ns) + if (host_ns_set) clib_memcpy (mp->host_namespace, host_ns, vec_len (host_ns)); - if (host_bridge) + if (host_bridge_set) clib_memcpy (mp->host_bridge, host_bridge, vec_len (host_bridge)); - if (host_ip4_prefix_len) - clib_memcpy (mp->host_ip4_addr, &host_ip4_addr, 4); - if (host_ip6_prefix_len) - clib_memcpy (mp->host_ip6_addr, &host_ip6_addr, 16); + if (host_ip4_addr_set) + { + clib_memcpy (mp->host_ip4_addr, &host_ip4_addr, 4); + mp->host_ip4_prefix_len = (u8) host_ip4_prefix_len; + } + if (host_ip6_addr_set) + { + clib_memcpy (mp->host_ip6_addr, &host_ip6_addr, 16); + mp->host_ip6_prefix_len = (u8) host_ip4_prefix_len; + } if (host_ip4_gw_set) clib_memcpy (mp->host_ip4_gw, &host_ip4_gw, 4); if (host_ip6_gw_set) @@ -21705,7 +21719,7 @@ _(l2_flags, \ _(bridge_flags, \ "bd_id <bridge-domain-id> [learn] [forward] [uu-flood] [flood] [arp-term] [disable]\n") \ _(tap_create_v2, \ - "id <num> [hw-addr <mac-addr>] [host-ns <name>] [rx-ring-size <num> [tx-ring-size <num>] [host-mtu-size <mtu>] [gso | no-gso]") \ + "id <num> [hw-addr <mac-addr>] [rx-ring-size <num>] [tx-ring-size <num>] [host-if-name <name>] [host-mac-addr <host-mac-address>] [host-ns <name>] [host-bridge <bridge-name>] [host-ip4-addr <ip4addr/mask>] [host-ip6-addr <ip6-addr>] [host-ip4-gw <ip4-addr>] [host-ip6-gw <ip6-addr>] [host-mtu-size <mtu>] [gso | no-gso]") \ _(tap_delete_v2, \ "<vpp-if-name> | sw_if_index <id>") \ _(sw_interface_tap_v2_dump, "") \ |