aboutsummaryrefslogtreecommitdiffstats
path: root/binapi/af_packet
diff options
context:
space:
mode:
Diffstat (limited to 'binapi/af_packet')
-rw-r--r--binapi/af_packet/af_packet.ba.go122
-rw-r--r--binapi/af_packet/af_packet_rest.ba.go83
-rw-r--r--binapi/af_packet/af_packet_rpc.ba.go31
3 files changed, 137 insertions, 99 deletions
diff --git a/binapi/af_packet/af_packet.ba.go b/binapi/af_packet/af_packet.ba.go
index 750e2ce..fb8ff38 100644
--- a/binapi/af_packet/af_packet.ba.go
+++ b/binapi/af_packet/af_packet.ba.go
@@ -1,21 +1,21 @@
// 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/af_packet.api.json
// Package af_packet contains generated bindings for API file af_packet.api.
//
// Contents:
-// 8 messages
+// 10 messages
//
package af_packet
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"
- codec "git.fd.io/govpp.git/codec"
+ api "go.fd.io/govpp/api"
+ ethernet_types "go.fd.io/govpp/binapi/ethernet_types"
+ interface_types "go.fd.io/govpp/binapi/interface_types"
+ codec "go.fd.io/govpp/codec"
)
// This is a compile-time assertion to ensure that this generated file
@@ -27,7 +27,7 @@ const _ = api.GoVppAPIPackageIsVersion2
const (
APIFile = "af_packet"
APIVersion = "2.0.0"
- VersionCrc = 0xe0b6c022
+ VersionCrc = 0x589bd50e
)
// AfPacketCreate defines message 'af_packet_create'.
@@ -108,6 +108,108 @@ func (m *AfPacketCreateReply) Unmarshal(b []byte) error {
return nil
}
+// AfPacketCreateV2 defines message 'af_packet_create_v2'.
+type AfPacketCreateV2 struct {
+ HwAddr ethernet_types.MacAddress `binapi:"mac_address,name=hw_addr" json:"hw_addr,omitempty"`
+ UseRandomHwAddr bool `binapi:"bool,name=use_random_hw_addr" json:"use_random_hw_addr,omitempty"`
+ HostIfName string `binapi:"string[64],name=host_if_name" json:"host_if_name,omitempty"`
+ RxFrameSize uint32 `binapi:"u32,name=rx_frame_size" json:"rx_frame_size,omitempty"`
+ TxFrameSize uint32 `binapi:"u32,name=tx_frame_size" json:"tx_frame_size,omitempty"`
+ RxFramesPerBlock uint32 `binapi:"u32,name=rx_frames_per_block" json:"rx_frames_per_block,omitempty"`
+ TxFramesPerBlock uint32 `binapi:"u32,name=tx_frames_per_block" json:"tx_frames_per_block,omitempty"`
+ Flags uint32 `binapi:"u32,name=flags" json:"flags,omitempty"`
+ NumRxQueues uint16 `binapi:"u16,name=num_rx_queues,default=1" json:"num_rx_queues,omitempty"`
+}
+
+func (m *AfPacketCreateV2) Reset() { *m = AfPacketCreateV2{} }
+func (*AfPacketCreateV2) GetMessageName() string { return "af_packet_create_v2" }
+func (*AfPacketCreateV2) GetCrcString() string { return "4aff0436" }
+func (*AfPacketCreateV2) GetMessageType() api.MessageType {
+ return api.RequestMessage
+}
+
+func (m *AfPacketCreateV2) Size() (size int) {
+ if m == nil {
+ return 0
+ }
+ size += 1 * 6 // m.HwAddr
+ size += 1 // m.UseRandomHwAddr
+ size += 64 // m.HostIfName
+ size += 4 // m.RxFrameSize
+ size += 4 // m.TxFrameSize
+ size += 4 // m.RxFramesPerBlock
+ size += 4 // m.TxFramesPerBlock
+ size += 4 // m.Flags
+ size += 2 // m.NumRxQueues
+ return size
+}
+func (m *AfPacketCreateV2) Marshal(b []byte) ([]byte, error) {
+ if b == nil {
+ b = make([]byte, m.Size())
+ }
+ buf := codec.NewBuffer(b)
+ buf.EncodeBytes(m.HwAddr[:], 6)
+ buf.EncodeBool(m.UseRandomHwAddr)
+ buf.EncodeString(m.HostIfName, 64)
+ buf.EncodeUint32(m.RxFrameSize)
+ buf.EncodeUint32(m.TxFrameSize)
+ buf.EncodeUint32(m.RxFramesPerBlock)
+ buf.EncodeUint32(m.TxFramesPerBlock)
+ buf.EncodeUint32(m.Flags)
+ buf.EncodeUint16(m.NumRxQueues)
+ return buf.Bytes(), nil
+}
+func (m *AfPacketCreateV2) Unmarshal(b []byte) error {
+ buf := codec.NewBuffer(b)
+ copy(m.HwAddr[:], buf.DecodeBytes(6))
+ m.UseRandomHwAddr = buf.DecodeBool()
+ m.HostIfName = buf.DecodeString(64)
+ m.RxFrameSize = buf.DecodeUint32()
+ m.TxFrameSize = buf.DecodeUint32()
+ m.RxFramesPerBlock = buf.DecodeUint32()
+ m.TxFramesPerBlock = buf.DecodeUint32()
+ m.Flags = buf.DecodeUint32()
+ m.NumRxQueues = buf.DecodeUint16()
+ return nil
+}
+
+// AfPacketCreateV2Reply defines message 'af_packet_create_v2_reply'.
+type AfPacketCreateV2Reply 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 *AfPacketCreateV2Reply) Reset() { *m = AfPacketCreateV2Reply{} }
+func (*AfPacketCreateV2Reply) GetMessageName() string { return "af_packet_create_v2_reply" }
+func (*AfPacketCreateV2Reply) GetCrcString() string { return "5383d31f" }
+func (*AfPacketCreateV2Reply) GetMessageType() api.MessageType {
+ return api.ReplyMessage
+}
+
+func (m *AfPacketCreateV2Reply) Size() (size int) {
+ if m == nil {
+ return 0
+ }
+ size += 4 // m.Retval
+ size += 4 // m.SwIfIndex
+ return size
+}
+func (m *AfPacketCreateV2Reply) 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 *AfPacketCreateV2Reply) Unmarshal(b []byte) error {
+ buf := codec.NewBuffer(b)
+ m.Retval = buf.DecodeInt32()
+ m.SwIfIndex = interface_types.InterfaceIndex(buf.DecodeUint32())
+ return nil
+}
+
// AfPacketDelete defines message 'af_packet_delete'.
type AfPacketDelete struct {
HostIfName string `binapi:"string[64],name=host_if_name" json:"host_if_name,omitempty"`
@@ -314,6 +416,8 @@ func init() { file_af_packet_binapi_init() }
func file_af_packet_binapi_init() {
api.RegisterMessage((*AfPacketCreate)(nil), "af_packet_create_a190415f")
api.RegisterMessage((*AfPacketCreateReply)(nil), "af_packet_create_reply_5383d31f")
+ api.RegisterMessage((*AfPacketCreateV2)(nil), "af_packet_create_v2_4aff0436")
+ api.RegisterMessage((*AfPacketCreateV2Reply)(nil), "af_packet_create_v2_reply_5383d31f")
api.RegisterMessage((*AfPacketDelete)(nil), "af_packet_delete_863fa648")
api.RegisterMessage((*AfPacketDeleteReply)(nil), "af_packet_delete_reply_e8d4e804")
api.RegisterMessage((*AfPacketDetails)(nil), "af_packet_details_58c7c042")
@@ -327,6 +431,8 @@ func AllMessages() []api.Message {
return []api.Message{
(*AfPacketCreate)(nil),
(*AfPacketCreateReply)(nil),
+ (*AfPacketCreateV2)(nil),
+ (*AfPacketCreateV2Reply)(nil),
(*AfPacketDelete)(nil),
(*AfPacketDeleteReply)(nil),
(*AfPacketDetails)(nil),
diff --git a/binapi/af_packet/af_packet_rest.ba.go b/binapi/af_packet/af_packet_rest.ba.go
deleted file mode 100644
index e6c498c..0000000
--- a/binapi/af_packet/af_packet_rest.ba.go
+++ /dev/null
@@ -1,83 +0,0 @@
-// Code generated by GoVPP's binapi-generator. DO NOT EDIT.
-
-package af_packet
-
-import (
- "encoding/json"
- "io/ioutil"
- "net/http"
-)
-
-func RESTHandler(rpc RPCService) http.Handler {
- mux := http.NewServeMux()
- mux.HandleFunc("/af_packet_create", func(w http.ResponseWriter, req *http.Request) {
- var request = new(AfPacketCreate)
- 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.AfPacketCreate(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("/af_packet_delete", func(w http.ResponseWriter, req *http.Request) {
- var request = new(AfPacketDelete)
- 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.AfPacketDelete(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("/af_packet_set_l4_cksum_offload", func(w http.ResponseWriter, req *http.Request) {
- var request = new(AfPacketSetL4CksumOffload)
- 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.AfPacketSetL4CksumOffload(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/af_packet/af_packet_rpc.ba.go b/binapi/af_packet/af_packet_rpc.ba.go
index 72fea67..de21ce0 100644
--- a/binapi/af_packet/af_packet_rpc.ba.go
+++ b/binapi/af_packet/af_packet_rpc.ba.go
@@ -5,14 +5,16 @@ package af_packet
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 af_packet.
+// RPCService defines RPC service af_packet.
type RPCService interface {
AfPacketCreate(ctx context.Context, in *AfPacketCreate) (*AfPacketCreateReply, error)
+ AfPacketCreateV2(ctx context.Context, in *AfPacketCreateV2) (*AfPacketCreateV2Reply, error)
AfPacketDelete(ctx context.Context, in *AfPacketDelete) (*AfPacketDeleteReply, error)
AfPacketDump(ctx context.Context, in *AfPacketDump) (RPCService_AfPacketDumpClient, error)
AfPacketSetL4CksumOffload(ctx context.Context, in *AfPacketSetL4CksumOffload) (*AfPacketSetL4CksumOffloadReply, error)
@@ -32,7 +34,16 @@ func (c *serviceClient) AfPacketCreate(ctx context.Context, in *AfPacketCreate)
if err != nil {
return nil, err
}
- return out, nil
+ return out, api.RetvalToVPPApiError(out.Retval)
+}
+
+func (c *serviceClient) AfPacketCreateV2(ctx context.Context, in *AfPacketCreateV2) (*AfPacketCreateV2Reply, error) {
+ out := new(AfPacketCreateV2Reply)
+ err := c.conn.Invoke(ctx, in, out)
+ if err != nil {
+ return nil, err
+ }
+ return out, api.RetvalToVPPApiError(out.Retval)
}
func (c *serviceClient) AfPacketDelete(ctx context.Context, in *AfPacketDelete) (*AfPacketDeleteReply, error) {
@@ -41,7 +52,7 @@ func (c *serviceClient) AfPacketDelete(ctx context.Context, in *AfPacketDelete)
if err != nil {
return nil, err
}
- return out, nil
+ return out, api.RetvalToVPPApiError(out.Retval)
}
func (c *serviceClient) AfPacketDump(ctx context.Context, in *AfPacketDump) (RPCService_AfPacketDumpClient, error) {
@@ -53,7 +64,7 @@ func (c *serviceClient) AfPacketDump(ctx context.Context, in *AfPacketDump) (RPC
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
@@ -76,7 +87,11 @@ func (c *serviceClient_AfPacketDumpClient) Recv() (*AfPacketDetails, error) {
switch m := msg.(type) {
case *AfPacketDetails:
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)
@@ -89,5 +104,5 @@ func (c *serviceClient) AfPacketSetL4CksumOffload(ctx context.Context, in *AfPac
if err != nil {
return nil, err
}
- return out, nil
+ return out, api.RetvalToVPPApiError(out.Retval)
}