aboutsummaryrefslogtreecommitdiffstats
path: root/binapi/memif
diff options
context:
space:
mode:
Diffstat (limited to 'binapi/memif')
-rw-r--r--binapi/memif/memif.ba.go19
-rw-r--r--binapi/memif/memif_rest.ba.go83
-rw-r--r--binapi/memif/memif_rpc.ba.go29
3 files changed, 29 insertions, 102 deletions
diff --git a/binapi/memif/memif.ba.go b/binapi/memif/memif.ba.go
index adc41b6..5502fd4 100644
--- a/binapi/memif/memif.ba.go
+++ b/binapi/memif/memif.ba.go
@@ -1,7 +1,7 @@
// 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/plugins/memif.api.json
// Package memif contains generated bindings for API file memif.api.
@@ -13,11 +13,12 @@
package memif
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"
"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"
+ codec "go.fd.io/govpp/codec"
)
// This is a compile-time assertion to ensure that this generated file
@@ -29,7 +30,7 @@ const _ = api.GoVppAPIPackageIsVersion2
const (
APIFile = "memif"
APIVersion = "3.0.0"
- VersionCrc = 0x1a1c95b8
+ VersionCrc = 0xd189f1e1
)
// MemifMode defines enum 'memif_mode'.
@@ -282,7 +283,7 @@ type MemifDetails struct {
func (m *MemifDetails) Reset() { *m = MemifDetails{} }
func (*MemifDetails) GetMessageName() string { return "memif_details" }
-func (*MemifDetails) GetCrcString() string { return "d0382c4c" }
+func (*MemifDetails) GetCrcString() string { return "da34feb9" }
func (*MemifDetails) GetMessageType() api.MessageType {
return api.ReplyMessage
}
@@ -511,7 +512,7 @@ func file_memif_binapi_init() {
api.RegisterMessage((*MemifCreateReply)(nil), "memif_create_reply_5383d31f")
api.RegisterMessage((*MemifDelete)(nil), "memif_delete_f9e6675e")
api.RegisterMessage((*MemifDeleteReply)(nil), "memif_delete_reply_e8d4e804")
- api.RegisterMessage((*MemifDetails)(nil), "memif_details_d0382c4c")
+ api.RegisterMessage((*MemifDetails)(nil), "memif_details_da34feb9")
api.RegisterMessage((*MemifDump)(nil), "memif_dump_51077d14")
api.RegisterMessage((*MemifSocketFilenameAddDel)(nil), "memif_socket_filename_add_del_a2ce1a10")
api.RegisterMessage((*MemifSocketFilenameAddDelReply)(nil), "memif_socket_filename_add_del_reply_e8d4e804")
diff --git a/binapi/memif/memif_rest.ba.go b/binapi/memif/memif_rest.ba.go
deleted file mode 100644
index 726824f..0000000
--- a/binapi/memif/memif_rest.ba.go
+++ /dev/null
@@ -1,83 +0,0 @@
-// Code generated by GoVPP's binapi-generator. DO NOT EDIT.
-
-package memif
-
-import (
- "encoding/json"
- "io/ioutil"
- "net/http"
-)
-
-func RESTHandler(rpc RPCService) http.Handler {
- mux := http.NewServeMux()
- mux.HandleFunc("/memif_create", func(w http.ResponseWriter, req *http.Request) {
- var request = new(MemifCreate)
- 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.MemifCreate(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("/memif_delete", func(w http.ResponseWriter, req *http.Request) {
- var request = new(MemifDelete)
- 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.MemifDelete(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("/memif_socket_filename_add_del", func(w http.ResponseWriter, req *http.Request) {
- var request = new(MemifSocketFilenameAddDel)
- 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.MemifSocketFilenameAddDel(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/memif/memif_rpc.ba.go b/binapi/memif/memif_rpc.ba.go
index 4cd1fa1..f2e3e52 100644
--- a/binapi/memif/memif_rpc.ba.go
+++ b/binapi/memif/memif_rpc.ba.go
@@ -5,12 +5,13 @@ package memif
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 memif.
+// RPCService defines RPC service memif.
type RPCService interface {
MemifCreate(ctx context.Context, in *MemifCreate) (*MemifCreateReply, error)
MemifDelete(ctx context.Context, in *MemifDelete) (*MemifDeleteReply, error)
@@ -33,7 +34,7 @@ func (c *serviceClient) MemifCreate(ctx context.Context, in *MemifCreate) (*Memi
if err != nil {
return nil, err
}
- return out, nil
+ return out, api.RetvalToVPPApiError(out.Retval)
}
func (c *serviceClient) MemifDelete(ctx context.Context, in *MemifDelete) (*MemifDeleteReply, error) {
@@ -42,7 +43,7 @@ func (c *serviceClient) MemifDelete(ctx context.Context, in *MemifDelete) (*Memi
if err != nil {
return nil, err
}
- return out, nil
+ return out, api.RetvalToVPPApiError(out.Retval)
}
func (c *serviceClient) MemifDump(ctx context.Context, in *MemifDump) (RPCService_MemifDumpClient, error) {
@@ -54,7 +55,7 @@ func (c *serviceClient) MemifDump(ctx context.Context, in *MemifDump) (RPCServic
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
@@ -77,7 +78,11 @@ func (c *serviceClient_MemifDumpClient) Recv() (*MemifDetails, error) {
switch m := msg.(type) {
case *MemifDetails:
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)
@@ -90,7 +95,7 @@ func (c *serviceClient) MemifSocketFilenameAddDel(ctx context.Context, in *Memif
if err != nil {
return nil, err
}
- return out, nil
+ return out, api.RetvalToVPPApiError(out.Retval)
}
func (c *serviceClient) MemifSocketFilenameDump(ctx context.Context, in *MemifSocketFilenameDump) (RPCService_MemifSocketFilenameDumpClient, error) {
@@ -102,7 +107,7 @@ func (c *serviceClient) MemifSocketFilenameDump(ctx context.Context, in *MemifSo
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
@@ -125,7 +130,11 @@ func (c *serviceClient_MemifSocketFilenameDumpClient) Recv() (*MemifSocketFilena
switch m := msg.(type) {
case *MemifSocketFilenameDetails:
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)