aboutsummaryrefslogtreecommitdiffstats
path: root/binapi/tapv2
diff options
context:
space:
mode:
Diffstat (limited to 'binapi/tapv2')
-rw-r--r--binapi/tapv2/tapv2.ba.go229
-rw-r--r--binapi/tapv2/tapv2_rest.ba.go60
-rw-r--r--binapi/tapv2/tapv2_rpc.ba.go29
3 files changed, 232 insertions, 86 deletions
diff --git a/binapi/tapv2/tapv2.ba.go b/binapi/tapv2/tapv2.ba.go
index 3745c83..238d013 100644
--- a/binapi/tapv2/tapv2.ba.go
+++ b/binapi/tapv2/tapv2.ba.go
@@ -1,24 +1,25 @@
// Code generated by GoVPP's binapi-generator. DO NOT EDIT.
// versions:
-// binapi-generator: v0.4.0-dev
-// VPP: 20.05-release
+// binapi-generator: v0.6.0-dev
+// VPP: 22.02-release
// source: /usr/share/vpp/api/core/tapv2.api.json
// Package tapv2 contains generated bindings for API file tapv2.api.
//
// Contents:
// 1 enum
-// 6 messages
+// 8 messages
//
package tapv2
import (
- api "git.fd.io/govpp.git/api"
- ethernet_types "git.fd.io/govpp.git/binapi/ethernet_types"
- interface_types "git.fd.io/govpp.git/binapi/interface_types"
- ip_types "git.fd.io/govpp.git/binapi/ip_types"
- codec "git.fd.io/govpp.git/codec"
"strconv"
+
+ api "go.fd.io/govpp/api"
+ ethernet_types "go.fd.io/govpp/binapi/ethernet_types"
+ interface_types "go.fd.io/govpp/binapi/interface_types"
+ ip_types "go.fd.io/govpp/binapi/ip_types"
+ codec "go.fd.io/govpp/codec"
)
// This is a compile-time assertion to ensure that this generated file
@@ -30,7 +31,7 @@ const _ = api.GoVppAPIPackageIsVersion2
const (
APIFile = "tapv2"
APIVersion = "4.0.0"
- VersionCrc = 0x3ed7c42d
+ VersionCrc = 0xc2f80dc7
)
// TapFlags defines enum 'tap_flags'.
@@ -43,16 +44,20 @@ const (
TAP_API_FLAG_ATTACH TapFlags = 8
TAP_API_FLAG_TUN TapFlags = 16
TAP_API_FLAG_GRO_COALESCE TapFlags = 32
+ TAP_API_FLAG_PACKED TapFlags = 64
+ TAP_API_FLAG_IN_ORDER TapFlags = 128
)
var (
TapFlags_name = map[uint32]string{
- 1: "TAP_API_FLAG_GSO",
- 2: "TAP_API_FLAG_CSUM_OFFLOAD",
- 4: "TAP_API_FLAG_PERSIST",
- 8: "TAP_API_FLAG_ATTACH",
- 16: "TAP_API_FLAG_TUN",
- 32: "TAP_API_FLAG_GRO_COALESCE",
+ 1: "TAP_API_FLAG_GSO",
+ 2: "TAP_API_FLAG_CSUM_OFFLOAD",
+ 4: "TAP_API_FLAG_PERSIST",
+ 8: "TAP_API_FLAG_ATTACH",
+ 16: "TAP_API_FLAG_TUN",
+ 32: "TAP_API_FLAG_GRO_COALESCE",
+ 64: "TAP_API_FLAG_PACKED",
+ 128: "TAP_API_FLAG_IN_ORDER",
}
TapFlags_value = map[string]uint32{
"TAP_API_FLAG_GSO": 1,
@@ -61,6 +66,8 @@ var (
"TAP_API_FLAG_ATTACH": 8,
"TAP_API_FLAG_TUN": 16,
"TAP_API_FLAG_GRO_COALESCE": 32,
+ "TAP_API_FLAG_PACKED": 64,
+ "TAP_API_FLAG_IN_ORDER": 128,
}
)
@@ -110,7 +117,7 @@ type SwInterfaceTapV2Details struct {
func (m *SwInterfaceTapV2Details) Reset() { *m = SwInterfaceTapV2Details{} }
func (*SwInterfaceTapV2Details) GetMessageName() string { return "sw_interface_tap_v2_details" }
-func (*SwInterfaceTapV2Details) GetCrcString() string { return "e53c16de" }
+func (*SwInterfaceTapV2Details) GetCrcString() string { return "1e2b2a47" }
func (*SwInterfaceTapV2Details) GetMessageType() api.MessageType {
return api.ReplyMessage
}
@@ -243,7 +250,7 @@ type TapCreateV2 struct {
func (m *TapCreateV2) Reset() { *m = TapCreateV2{} }
func (*TapCreateV2) GetMessageName() string { return "tap_create_v2" }
-func (*TapCreateV2) GetCrcString() string { return "445835fd" }
+func (*TapCreateV2) GetCrcString() string { return "2d0d6570" }
func (*TapCreateV2) GetMessageType() api.MessageType {
return api.RequestMessage
}
@@ -387,6 +394,186 @@ func (m *TapCreateV2Reply) Unmarshal(b []byte) error {
return nil
}
+// TapCreateV3 defines message 'tap_create_v3'.
+type TapCreateV3 struct {
+ ID uint32 `binapi:"u32,name=id,default=4294967295" json:"id,omitempty"`
+ UseRandomMac bool `binapi:"bool,name=use_random_mac,default=true" json:"use_random_mac,omitempty"`
+ MacAddress ethernet_types.MacAddress `binapi:"mac_address,name=mac_address" json:"mac_address,omitempty"`
+ NumRxQueues uint16 `binapi:"u16,name=num_rx_queues,default=1" json:"num_rx_queues,omitempty"`
+ NumTxQueues uint16 `binapi:"u16,name=num_tx_queues,default=1" json:"num_tx_queues,omitempty"`
+ TxRingSz uint16 `binapi:"u16,name=tx_ring_sz,default=256" json:"tx_ring_sz,omitempty"`
+ RxRingSz uint16 `binapi:"u16,name=rx_ring_sz,default=256" json:"rx_ring_sz,omitempty"`
+ HostMtuSet bool `binapi:"bool,name=host_mtu_set" json:"host_mtu_set,omitempty"`
+ HostMtuSize uint32 `binapi:"u32,name=host_mtu_size" json:"host_mtu_size,omitempty"`
+ HostMacAddrSet bool `binapi:"bool,name=host_mac_addr_set" json:"host_mac_addr_set,omitempty"`
+ HostMacAddr ethernet_types.MacAddress `binapi:"mac_address,name=host_mac_addr" json:"host_mac_addr,omitempty"`
+ HostIP4PrefixSet bool `binapi:"bool,name=host_ip4_prefix_set" json:"host_ip4_prefix_set,omitempty"`
+ HostIP4Prefix ip_types.IP4AddressWithPrefix `binapi:"ip4_address_with_prefix,name=host_ip4_prefix" json:"host_ip4_prefix,omitempty"`
+ HostIP6PrefixSet bool `binapi:"bool,name=host_ip6_prefix_set" json:"host_ip6_prefix_set,omitempty"`
+ HostIP6Prefix ip_types.IP6AddressWithPrefix `binapi:"ip6_address_with_prefix,name=host_ip6_prefix" json:"host_ip6_prefix,omitempty"`
+ HostIP4GwSet bool `binapi:"bool,name=host_ip4_gw_set" json:"host_ip4_gw_set,omitempty"`
+ HostIP4Gw ip_types.IP4Address `binapi:"ip4_address,name=host_ip4_gw" json:"host_ip4_gw,omitempty"`
+ HostIP6GwSet bool `binapi:"bool,name=host_ip6_gw_set" json:"host_ip6_gw_set,omitempty"`
+ HostIP6Gw ip_types.IP6Address `binapi:"ip6_address,name=host_ip6_gw" json:"host_ip6_gw,omitempty"`
+ TapFlags TapFlags `binapi:"tap_flags,name=tap_flags" json:"tap_flags,omitempty"`
+ HostNamespaceSet bool `binapi:"bool,name=host_namespace_set" json:"host_namespace_set,omitempty"`
+ HostNamespace string `binapi:"string[64],name=host_namespace" json:"host_namespace,omitempty"`
+ HostIfNameSet bool `binapi:"bool,name=host_if_name_set" json:"host_if_name_set,omitempty"`
+ HostIfName string `binapi:"string[64],name=host_if_name" json:"host_if_name,omitempty"`
+ HostBridgeSet bool `binapi:"bool,name=host_bridge_set" json:"host_bridge_set,omitempty"`
+ HostBridge string `binapi:"string[64],name=host_bridge" json:"host_bridge,omitempty"`
+ Tag string `binapi:"string[],name=tag" json:"tag,omitempty"`
+}
+
+func (m *TapCreateV3) Reset() { *m = TapCreateV3{} }
+func (*TapCreateV3) GetMessageName() string { return "tap_create_v3" }
+func (*TapCreateV3) GetCrcString() string { return "3f3fd1df" }
+func (*TapCreateV3) GetMessageType() api.MessageType {
+ return api.RequestMessage
+}
+
+func (m *TapCreateV3) Size() (size int) {
+ if m == nil {
+ return 0
+ }
+ size += 4 // m.ID
+ size += 1 // m.UseRandomMac
+ size += 1 * 6 // m.MacAddress
+ size += 2 // m.NumRxQueues
+ size += 2 // m.NumTxQueues
+ size += 2 // m.TxRingSz
+ size += 2 // m.RxRingSz
+ size += 1 // m.HostMtuSet
+ size += 4 // m.HostMtuSize
+ size += 1 // m.HostMacAddrSet
+ size += 1 * 6 // m.HostMacAddr
+ size += 1 // m.HostIP4PrefixSet
+ size += 1 * 4 // m.HostIP4Prefix.Address
+ size += 1 // m.HostIP4Prefix.Len
+ size += 1 // m.HostIP6PrefixSet
+ size += 1 * 16 // m.HostIP6Prefix.Address
+ size += 1 // m.HostIP6Prefix.Len
+ size += 1 // m.HostIP4GwSet
+ size += 1 * 4 // m.HostIP4Gw
+ size += 1 // m.HostIP6GwSet
+ size += 1 * 16 // m.HostIP6Gw
+ size += 4 // m.TapFlags
+ size += 1 // m.HostNamespaceSet
+ size += 64 // m.HostNamespace
+ size += 1 // m.HostIfNameSet
+ size += 64 // m.HostIfName
+ size += 1 // m.HostBridgeSet
+ size += 64 // m.HostBridge
+ size += 4 + len(m.Tag) // m.Tag
+ return size
+}
+func (m *TapCreateV3) Marshal(b []byte) ([]byte, error) {
+ if b == nil {
+ b = make([]byte, m.Size())
+ }
+ buf := codec.NewBuffer(b)
+ buf.EncodeUint32(m.ID)
+ buf.EncodeBool(m.UseRandomMac)
+ buf.EncodeBytes(m.MacAddress[:], 6)
+ buf.EncodeUint16(m.NumRxQueues)
+ buf.EncodeUint16(m.NumTxQueues)
+ buf.EncodeUint16(m.TxRingSz)
+ buf.EncodeUint16(m.RxRingSz)
+ buf.EncodeBool(m.HostMtuSet)
+ buf.EncodeUint32(m.HostMtuSize)
+ buf.EncodeBool(m.HostMacAddrSet)
+ buf.EncodeBytes(m.HostMacAddr[:], 6)
+ buf.EncodeBool(m.HostIP4PrefixSet)
+ buf.EncodeBytes(m.HostIP4Prefix.Address[:], 4)
+ buf.EncodeUint8(m.HostIP4Prefix.Len)
+ buf.EncodeBool(m.HostIP6PrefixSet)
+ buf.EncodeBytes(m.HostIP6Prefix.Address[:], 16)
+ buf.EncodeUint8(m.HostIP6Prefix.Len)
+ buf.EncodeBool(m.HostIP4GwSet)
+ buf.EncodeBytes(m.HostIP4Gw[:], 4)
+ buf.EncodeBool(m.HostIP6GwSet)
+ buf.EncodeBytes(m.HostIP6Gw[:], 16)
+ buf.EncodeUint32(uint32(m.TapFlags))
+ buf.EncodeBool(m.HostNamespaceSet)
+ buf.EncodeString(m.HostNamespace, 64)
+ buf.EncodeBool(m.HostIfNameSet)
+ buf.EncodeString(m.HostIfName, 64)
+ buf.EncodeBool(m.HostBridgeSet)
+ buf.EncodeString(m.HostBridge, 64)
+ buf.EncodeString(m.Tag, 0)
+ return buf.Bytes(), nil
+}
+func (m *TapCreateV3) Unmarshal(b []byte) error {
+ buf := codec.NewBuffer(b)
+ m.ID = buf.DecodeUint32()
+ m.UseRandomMac = buf.DecodeBool()
+ copy(m.MacAddress[:], buf.DecodeBytes(6))
+ m.NumRxQueues = buf.DecodeUint16()
+ m.NumTxQueues = buf.DecodeUint16()
+ m.TxRingSz = buf.DecodeUint16()
+ m.RxRingSz = buf.DecodeUint16()
+ m.HostMtuSet = buf.DecodeBool()
+ m.HostMtuSize = buf.DecodeUint32()
+ m.HostMacAddrSet = buf.DecodeBool()
+ copy(m.HostMacAddr[:], buf.DecodeBytes(6))
+ m.HostIP4PrefixSet = buf.DecodeBool()
+ copy(m.HostIP4Prefix.Address[:], buf.DecodeBytes(4))
+ m.HostIP4Prefix.Len = buf.DecodeUint8()
+ m.HostIP6PrefixSet = buf.DecodeBool()
+ copy(m.HostIP6Prefix.Address[:], buf.DecodeBytes(16))
+ m.HostIP6Prefix.Len = buf.DecodeUint8()
+ m.HostIP4GwSet = buf.DecodeBool()
+ copy(m.HostIP4Gw[:], buf.DecodeBytes(4))
+ m.HostIP6GwSet = buf.DecodeBool()
+ copy(m.HostIP6Gw[:], buf.DecodeBytes(16))
+ m.TapFlags = TapFlags(buf.DecodeUint32())
+ m.HostNamespaceSet = buf.DecodeBool()
+ m.HostNamespace = buf.DecodeString(64)
+ m.HostIfNameSet = buf.DecodeBool()
+ m.HostIfName = buf.DecodeString(64)
+ m.HostBridgeSet = buf.DecodeBool()
+ m.HostBridge = buf.DecodeString(64)
+ m.Tag = buf.DecodeString(0)
+ return nil
+}
+
+// TapCreateV3Reply defines message 'tap_create_v3_reply'.
+type TapCreateV3Reply struct {
+ Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"`
+ SwIfIndex interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index" json:"sw_if_index,omitempty"`
+}
+
+func (m *TapCreateV3Reply) Reset() { *m = TapCreateV3Reply{} }
+func (*TapCreateV3Reply) GetMessageName() string { return "tap_create_v3_reply" }
+func (*TapCreateV3Reply) GetCrcString() string { return "5383d31f" }
+func (*TapCreateV3Reply) GetMessageType() api.MessageType {
+ return api.ReplyMessage
+}
+
+func (m *TapCreateV3Reply) Size() (size int) {
+ if m == nil {
+ return 0
+ }
+ size += 4 // m.Retval
+ size += 4 // m.SwIfIndex
+ return size
+}
+func (m *TapCreateV3Reply) Marshal(b []byte) ([]byte, error) {
+ if b == nil {
+ b = make([]byte, m.Size())
+ }
+ buf := codec.NewBuffer(b)
+ buf.EncodeInt32(m.Retval)
+ buf.EncodeUint32(uint32(m.SwIfIndex))
+ return buf.Bytes(), nil
+}
+func (m *TapCreateV3Reply) Unmarshal(b []byte) error {
+ buf := codec.NewBuffer(b)
+ m.Retval = buf.DecodeInt32()
+ m.SwIfIndex = interface_types.InterfaceIndex(buf.DecodeUint32())
+ return nil
+}
+
// TapDeleteV2 defines message 'tap_delete_v2'.
type TapDeleteV2 struct {
SwIfIndex interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index" json:"sw_if_index,omitempty"`
@@ -455,10 +642,12 @@ func (m *TapDeleteV2Reply) Unmarshal(b []byte) error {
func init() { file_tapv2_binapi_init() }
func file_tapv2_binapi_init() {
- api.RegisterMessage((*SwInterfaceTapV2Details)(nil), "sw_interface_tap_v2_details_e53c16de")
+ api.RegisterMessage((*SwInterfaceTapV2Details)(nil), "sw_interface_tap_v2_details_1e2b2a47")
api.RegisterMessage((*SwInterfaceTapV2Dump)(nil), "sw_interface_tap_v2_dump_f9e6675e")
- api.RegisterMessage((*TapCreateV2)(nil), "tap_create_v2_445835fd")
+ api.RegisterMessage((*TapCreateV2)(nil), "tap_create_v2_2d0d6570")
api.RegisterMessage((*TapCreateV2Reply)(nil), "tap_create_v2_reply_5383d31f")
+ api.RegisterMessage((*TapCreateV3)(nil), "tap_create_v3_3f3fd1df")
+ api.RegisterMessage((*TapCreateV3Reply)(nil), "tap_create_v3_reply_5383d31f")
api.RegisterMessage((*TapDeleteV2)(nil), "tap_delete_v2_f9e6675e")
api.RegisterMessage((*TapDeleteV2Reply)(nil), "tap_delete_v2_reply_e8d4e804")
}
@@ -470,6 +659,8 @@ func AllMessages() []api.Message {
(*SwInterfaceTapV2Dump)(nil),
(*TapCreateV2)(nil),
(*TapCreateV2Reply)(nil),
+ (*TapCreateV3)(nil),
+ (*TapCreateV3Reply)(nil),
(*TapDeleteV2)(nil),
(*TapDeleteV2Reply)(nil),
}
diff --git a/binapi/tapv2/tapv2_rest.ba.go b/binapi/tapv2/tapv2_rest.ba.go
deleted file mode 100644
index b1d1111..0000000
--- a/binapi/tapv2/tapv2_rest.ba.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// Code generated by GoVPP's binapi-generator. DO NOT EDIT.
-
-package tapv2
-
-import (
- "encoding/json"
- "io/ioutil"
- "net/http"
-)
-
-func RESTHandler(rpc RPCService) http.Handler {
- mux := http.NewServeMux()
- mux.HandleFunc("/tap_create_v2", func(w http.ResponseWriter, req *http.Request) {
- var request = new(TapCreateV2)
- b, err := ioutil.ReadAll(req.Body)
- if err != nil {
- http.Error(w, "read body failed", http.StatusBadRequest)
- return
- }
- if err := json.Unmarshal(b, request); err != nil {
- http.Error(w, "unmarshal data failed", http.StatusBadRequest)
- return
- }
- reply, err := rpc.TapCreateV2(req.Context(), request)
- if err != nil {
- http.Error(w, "request failed: "+err.Error(), http.StatusInternalServerError)
- return
- }
- rep, err := json.MarshalIndent(reply, "", " ")
- if err != nil {
- http.Error(w, "marshal failed: "+err.Error(), http.StatusInternalServerError)
- return
- }
- w.Write(rep)
- })
- mux.HandleFunc("/tap_delete_v2", func(w http.ResponseWriter, req *http.Request) {
- var request = new(TapDeleteV2)
- b, err := ioutil.ReadAll(req.Body)
- if err != nil {
- http.Error(w, "read body failed", http.StatusBadRequest)
- return
- }
- if err := json.Unmarshal(b, request); err != nil {
- http.Error(w, "unmarshal data failed", http.StatusBadRequest)
- return
- }
- reply, err := rpc.TapDeleteV2(req.Context(), request)
- if err != nil {
- http.Error(w, "request failed: "+err.Error(), http.StatusInternalServerError)
- return
- }
- rep, err := json.MarshalIndent(reply, "", " ")
- if err != nil {
- http.Error(w, "marshal failed: "+err.Error(), http.StatusInternalServerError)
- return
- }
- w.Write(rep)
- })
- return http.HandlerFunc(mux.ServeHTTP)
-}
diff --git a/binapi/tapv2/tapv2_rpc.ba.go b/binapi/tapv2/tapv2_rpc.ba.go
index ab530eb..a32a21b 100644
--- a/binapi/tapv2/tapv2_rpc.ba.go
+++ b/binapi/tapv2/tapv2_rpc.ba.go
@@ -5,15 +5,17 @@ package tapv2
import (
"context"
"fmt"
- api "git.fd.io/govpp.git/api"
- vpe "git.fd.io/govpp.git/binapi/vpe"
"io"
+
+ api "go.fd.io/govpp/api"
+ memclnt "go.fd.io/govpp/binapi/memclnt"
)
-// RPCService defines RPC service tapv2.
+// RPCService defines RPC service tapv2.
type RPCService interface {
SwInterfaceTapV2Dump(ctx context.Context, in *SwInterfaceTapV2Dump) (RPCService_SwInterfaceTapV2DumpClient, error)
TapCreateV2(ctx context.Context, in *TapCreateV2) (*TapCreateV2Reply, error)
+ TapCreateV3(ctx context.Context, in *TapCreateV3) (*TapCreateV3Reply, error)
TapDeleteV2(ctx context.Context, in *TapDeleteV2) (*TapDeleteV2Reply, error)
}
@@ -34,7 +36,7 @@ func (c *serviceClient) SwInterfaceTapV2Dump(ctx context.Context, in *SwInterfac
if err := x.Stream.SendMsg(in); err != nil {
return nil, err
}
- if err = x.Stream.SendMsg(&vpe.ControlPing{}); err != nil {
+ if err = x.Stream.SendMsg(&memclnt.ControlPing{}); err != nil {
return nil, err
}
return x, nil
@@ -57,7 +59,11 @@ func (c *serviceClient_SwInterfaceTapV2DumpClient) Recv() (*SwInterfaceTapV2Deta
switch m := msg.(type) {
case *SwInterfaceTapV2Details:
return m, nil
- case *vpe.ControlPingReply:
+ case *memclnt.ControlPingReply:
+ err = c.Stream.Close()
+ if err != nil {
+ return nil, err
+ }
return nil, io.EOF
default:
return nil, fmt.Errorf("unexpected message: %T %v", m, m)
@@ -70,7 +76,16 @@ func (c *serviceClient) TapCreateV2(ctx context.Context, in *TapCreateV2) (*TapC
if err != nil {
return nil, err
}
- return out, nil
+ return out, api.RetvalToVPPApiError(out.Retval)
+}
+
+func (c *serviceClient) TapCreateV3(ctx context.Context, in *TapCreateV3) (*TapCreateV3Reply, error) {
+ out := new(TapCreateV3Reply)
+ err := c.conn.Invoke(ctx, in, out)
+ if err != nil {
+ return nil, err
+ }
+ return out, api.RetvalToVPPApiError(out.Retval)
}
func (c *serviceClient) TapDeleteV2(ctx context.Context, in *TapDeleteV2) (*TapDeleteV2Reply, error) {
@@ -79,5 +94,5 @@ func (c *serviceClient) TapDeleteV2(ctx context.Context, in *TapDeleteV2) (*TapD
if err != nil {
return nil, err
}
- return out, nil
+ return out, api.RetvalToVPPApiError(out.Retval)
}