aboutsummaryrefslogtreecommitdiffstats
path: root/binapi/punt
diff options
context:
space:
mode:
Diffstat (limited to 'binapi/punt')
-rw-r--r--binapi/punt/punt.ba.go36
-rw-r--r--binapi/punt/punt_rest.ba.go83
-rw-r--r--binapi/punt/punt_rpc.ba.go29
3 files changed, 38 insertions, 110 deletions
diff --git a/binapi/punt/punt.ba.go b/binapi/punt/punt.ba.go
index 18ff678..f32c8a7 100644
--- a/binapi/punt/punt.ba.go
+++ b/binapi/punt/punt.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/core/punt.api.json
// Package punt contains generated bindings for API file punt.api.
@@ -15,10 +15,11 @@
package punt
import (
- api "git.fd.io/govpp.git/api"
- ip_types "git.fd.io/govpp.git/binapi/ip_types"
- codec "git.fd.io/govpp.git/codec"
"strconv"
+
+ api "go.fd.io/govpp/api"
+ 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 = "punt"
APIVersion = "2.2.1"
- VersionCrc = 0x31354154
+ VersionCrc = 0xee63b6c7
)
// PuntType defines enum 'punt_type'.
@@ -95,9 +96,10 @@ type PuntReason struct {
// PuntUnion defines union 'punt_union'.
type PuntUnion struct {
- // Exception *PuntException
- // L4 *PuntL4
- // IPProto *PuntIPProto
+ // PuntUnion can be one of:
+ // - Exception *PuntException
+ // - L4 *PuntL4
+ // - IPProto *PuntIPProto
XXX_UnionData [4]byte
}
@@ -228,7 +230,7 @@ type PuntSocketDeregister struct {
func (m *PuntSocketDeregister) Reset() { *m = PuntSocketDeregister{} }
func (*PuntSocketDeregister) GetMessageName() string { return "punt_socket_deregister" }
-func (*PuntSocketDeregister) GetCrcString() string { return "98a444f4" }
+func (*PuntSocketDeregister) GetCrcString() string { return "98fc9102" }
func (*PuntSocketDeregister) GetMessageType() api.MessageType {
return api.RequestMessage
}
@@ -298,7 +300,7 @@ type PuntSocketDetails struct {
func (m *PuntSocketDetails) Reset() { *m = PuntSocketDetails{} }
func (*PuntSocketDetails) GetMessageName() string { return "punt_socket_details" }
-func (*PuntSocketDetails) GetCrcString() string { return "1de0ce75" }
+func (*PuntSocketDetails) GetCrcString() string { return "de575080" }
func (*PuntSocketDetails) GetMessageType() api.MessageType {
return api.ReplyMessage
}
@@ -372,7 +374,7 @@ type PuntSocketRegister struct {
func (m *PuntSocketRegister) Reset() { *m = PuntSocketRegister{} }
func (*PuntSocketRegister) GetMessageName() string { return "punt_socket_register" }
-func (*PuntSocketRegister) GetCrcString() string { return "c8cd10fa" }
+func (*PuntSocketRegister) GetCrcString() string { return "95268cbf" }
func (*PuntSocketRegister) GetMessageType() api.MessageType {
return api.RequestMessage
}
@@ -452,7 +454,7 @@ type SetPunt struct {
func (m *SetPunt) Reset() { *m = SetPunt{} }
func (*SetPunt) GetMessageName() string { return "set_punt" }
-func (*SetPunt) GetCrcString() string { return "83799618" }
+func (*SetPunt) GetCrcString() string { return "aa83d523" }
func (*SetPunt) GetMessageType() api.MessageType {
return api.RequestMessage
}
@@ -521,13 +523,13 @@ func init() { file_punt_binapi_init() }
func file_punt_binapi_init() {
api.RegisterMessage((*PuntReasonDetails)(nil), "punt_reason_details_2c9d4a40")
api.RegisterMessage((*PuntReasonDump)(nil), "punt_reason_dump_5c0dd4fe")
- api.RegisterMessage((*PuntSocketDeregister)(nil), "punt_socket_deregister_98a444f4")
+ api.RegisterMessage((*PuntSocketDeregister)(nil), "punt_socket_deregister_98fc9102")
api.RegisterMessage((*PuntSocketDeregisterReply)(nil), "punt_socket_deregister_reply_e8d4e804")
- api.RegisterMessage((*PuntSocketDetails)(nil), "punt_socket_details_1de0ce75")
+ api.RegisterMessage((*PuntSocketDetails)(nil), "punt_socket_details_de575080")
api.RegisterMessage((*PuntSocketDump)(nil), "punt_socket_dump_52974935")
- api.RegisterMessage((*PuntSocketRegister)(nil), "punt_socket_register_c8cd10fa")
+ api.RegisterMessage((*PuntSocketRegister)(nil), "punt_socket_register_95268cbf")
api.RegisterMessage((*PuntSocketRegisterReply)(nil), "punt_socket_register_reply_bd30ae90")
- api.RegisterMessage((*SetPunt)(nil), "set_punt_83799618")
+ api.RegisterMessage((*SetPunt)(nil), "set_punt_aa83d523")
api.RegisterMessage((*SetPuntReply)(nil), "set_punt_reply_e8d4e804")
}
diff --git a/binapi/punt/punt_rest.ba.go b/binapi/punt/punt_rest.ba.go
deleted file mode 100644
index 5b999b9..0000000
--- a/binapi/punt/punt_rest.ba.go
+++ /dev/null
@@ -1,83 +0,0 @@
-// Code generated by GoVPP's binapi-generator. DO NOT EDIT.
-
-package punt
-
-import (
- "encoding/json"
- "io/ioutil"
- "net/http"
-)
-
-func RESTHandler(rpc RPCService) http.Handler {
- mux := http.NewServeMux()
- mux.HandleFunc("/punt_socket_deregister", func(w http.ResponseWriter, req *http.Request) {
- var request = new(PuntSocketDeregister)
- 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.PuntSocketDeregister(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("/punt_socket_register", func(w http.ResponseWriter, req *http.Request) {
- var request = new(PuntSocketRegister)
- 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.PuntSocketRegister(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("/set_punt", func(w http.ResponseWriter, req *http.Request) {
- var request = new(SetPunt)
- 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.SetPunt(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/punt/punt_rpc.ba.go b/binapi/punt/punt_rpc.ba.go
index e2150ed..e9b0cf5 100644
--- a/binapi/punt/punt_rpc.ba.go
+++ b/binapi/punt/punt_rpc.ba.go
@@ -5,12 +5,13 @@ package punt
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 punt.
+// RPCService defines RPC service punt.
type RPCService interface {
PuntReasonDump(ctx context.Context, in *PuntReasonDump) (RPCService_PuntReasonDumpClient, error)
PuntSocketDeregister(ctx context.Context, in *PuntSocketDeregister) (*PuntSocketDeregisterReply, error)
@@ -36,7 +37,7 @@ func (c *serviceClient) PuntReasonDump(ctx context.Context, in *PuntReasonDump)
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
@@ -59,7 +60,11 @@ func (c *serviceClient_PuntReasonDumpClient) Recv() (*PuntReasonDetails, error)
switch m := msg.(type) {
case *PuntReasonDetails:
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)
@@ -72,7 +77,7 @@ func (c *serviceClient) PuntSocketDeregister(ctx context.Context, in *PuntSocket
if err != nil {
return nil, err
}
- return out, nil
+ return out, api.RetvalToVPPApiError(out.Retval)
}
func (c *serviceClient) PuntSocketDump(ctx context.Context, in *PuntSocketDump) (RPCService_PuntSocketDumpClient, error) {
@@ -84,7 +89,7 @@ func (c *serviceClient) PuntSocketDump(ctx context.Context, in *PuntSocketDump)
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
@@ -107,7 +112,11 @@ func (c *serviceClient_PuntSocketDumpClient) Recv() (*PuntSocketDetails, error)
switch m := msg.(type) {
case *PuntSocketDetails:
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)
@@ -120,7 +129,7 @@ func (c *serviceClient) PuntSocketRegister(ctx context.Context, in *PuntSocketRe
if err != nil {
return nil, err
}
- return out, nil
+ return out, api.RetvalToVPPApiError(out.Retval)
}
func (c *serviceClient) SetPunt(ctx context.Context, in *SetPunt) (*SetPuntReply, error) {
@@ -129,5 +138,5 @@ func (c *serviceClient) SetPunt(ctx context.Context, in *SetPunt) (*SetPuntReply
if err != nil {
return nil, err
}
- return out, nil
+ return out, api.RetvalToVPPApiError(out.Retval)
}