tapv2: add "tap_flags" field to the TAPv2 interface API

[vpp.git] / src / vnet / devices / tap / tap.h

diff --git a/src/vnet/devices/tap/tap.h b/src/vnet/devices/tap/tap.h
index 0e0f8cb..19dc88d 100644 (file)
--- a/src/vnet/devices/tap/tap.h
+++ b/src/vnet/devices/tap/tap.h
@@ -24,17 +24,24 @@
 
 typedef struct
 {
-  u8 *name;
-  u8 hw_addr_set;
-  u8 hw_addr[6];
+  u32 id;
+  u8 mac_addr_set;
+  u8 mac_addr[6];
   u16 rx_ring_sz;
   u16 tx_ring_sz;
+  u32 tap_flags;
   u8 *host_namespace;
+  u8 *host_if_name;
+  u8 host_mac_addr[6];
   u8 *host_bridge;
   ip4_address_t host_ip4_addr;
-  u32 host_ip4_prefix_len;
+  u8 host_ip4_prefix_len;
+  ip4_address_t host_ip4_gw;
+  u8 host_ip4_gw_set;
   ip6_address_t host_ip6_addr;
-  u32 host_ip6_prefix_len;
+  u8 host_ip6_prefix_len;
+  ip6_address_t host_ip6_gw;
+  u8 host_ip6_gw_set;
   /* return */
   u32 sw_if_index;
   int rv;
@@ -44,10 +51,31 @@ typedef struct
 /** TAP interface details struct */
 typedef struct
 {
+  u32 id;
   u32 sw_if_index;
+  u32 tap_flags;
   u8 dev_name[64];
+  u16 tx_ring_sz;
+  u16 rx_ring_sz;
+  u8 host_mac_addr[6];
+  u8 host_if_name[64];
+  u8 host_namespace[64];
+  u8 host_bridge[64];
+  u8 host_ip4_addr[4];
+  u8 host_ip4_prefix_len;
+  u8 host_ip6_addr[16];
+  u8 host_ip6_prefix_len;
 } tap_interface_details_t;
 
+typedef struct
+{
+  /* logging */
+  vlib_log_class_t log_default;
+
+  /* bit-map of in-use IDs */
+  uword *tap_ids;
+} tap_main_t;
+
 void tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args);
 int tap_delete_if (vlib_main_t * vm, u32 sw_if_index);
 int tap_dump_ifs (tap_interface_details_t ** out_tapids);