From d1f24d37bd447b64e402298bb8eb2479681facf9 Mon Sep 17 00:00:00 2001 From: Ondrej Fabry Date: Fri, 17 Jul 2020 10:36:28 +0200 Subject: Improve binapi generator - simplified Size/Marshal/Unmarshal methods - replace struc in unions with custom marshal/unmarshal - fix imports in generated files - fix mock adapter - generate rpc service using low-level stream API (dumps generate control ping or stream msg..) - move examples/binapi to binapi and generate all API for latest release - add binapigen.Plugin for developing custom generator plugins - optionally generate HTTP handlers (REST API) for RPC services - add govpp program for browsing VPP API Change-Id: I092e9ed2b0c17972b3476463c3d4b14dd76ed42b Signed-off-by: Ondrej Fabry --- binapi/tls_openssl/tls_openssl.ba.go | 127 ++++++++++++++++++++++++++++++ binapi/tls_openssl/tls_openssl_rest.ba.go | 37 +++++++++ binapi/tls_openssl/tls_openssl_rpc.ba.go | 30 +++++++ 3 files changed, 194 insertions(+) create mode 100644 binapi/tls_openssl/tls_openssl.ba.go create mode 100644 binapi/tls_openssl/tls_openssl_rest.ba.go create mode 100644 binapi/tls_openssl/tls_openssl_rpc.ba.go (limited to 'binapi/tls_openssl') diff --git a/binapi/tls_openssl/tls_openssl.ba.go b/binapi/tls_openssl/tls_openssl.ba.go new file mode 100644 index 0000000..b4293fd --- /dev/null +++ b/binapi/tls_openssl/tls_openssl.ba.go @@ -0,0 +1,127 @@ +// Code generated by GoVPP's binapi-generator. DO NOT EDIT. +// versions: +// binapi-generator: v0.4.0-dev +// VPP: 20.05-release +// source: /usr/share/vpp/api/plugins/tls_openssl.api.json + +// Package tls_openssl contains generated bindings for API file tls_openssl.api. +// +// Contents: +// 2 messages +// +package tls_openssl + +import ( + api "git.fd.io/govpp.git/api" + codec "git.fd.io/govpp.git/codec" +) + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the GoVPP api package it is being compiled against. +// A compilation error at this line likely means your copy of the +// GoVPP api package needs to be updated. +const _ = api.GoVppAPIPackageIsVersion2 + +const ( + APIFile = "tls_openssl" + APIVersion = "2.0.0" + VersionCrc = 0x7386fbcd +) + +// TLSOpensslSetEngine defines message 'tls_openssl_set_engine'. +type TLSOpensslSetEngine struct { + AsyncEnable uint32 `binapi:"u32,name=async_enable" json:"async_enable,omitempty"` + Engine []byte `binapi:"u8[64],name=engine" json:"engine,omitempty"` + Algorithm []byte `binapi:"u8[64],name=algorithm" json:"algorithm,omitempty"` + Ciphers []byte `binapi:"u8[64],name=ciphers" json:"ciphers,omitempty"` +} + +func (m *TLSOpensslSetEngine) Reset() { *m = TLSOpensslSetEngine{} } +func (*TLSOpensslSetEngine) GetMessageName() string { return "tls_openssl_set_engine" } +func (*TLSOpensslSetEngine) GetCrcString() string { return "e34d95c1" } +func (*TLSOpensslSetEngine) GetMessageType() api.MessageType { + return api.RequestMessage +} + +func (m *TLSOpensslSetEngine) Size() int { + if m == nil { + return 0 + } + var size int + size += 4 // m.AsyncEnable + size += 1 * 64 // m.Engine + size += 1 * 64 // m.Algorithm + size += 1 * 64 // m.Ciphers + return size +} +func (m *TLSOpensslSetEngine) Marshal(b []byte) ([]byte, error) { + var buf *codec.Buffer + if b == nil { + buf = codec.NewBuffer(make([]byte, m.Size())) + } else { + buf = codec.NewBuffer(b) + } + buf.EncodeUint32(uint32(m.AsyncEnable)) + buf.EncodeBytes(m.Engine[:], 64) + buf.EncodeBytes(m.Algorithm[:], 64) + buf.EncodeBytes(m.Ciphers[:], 64) + return buf.Bytes(), nil +} +func (m *TLSOpensslSetEngine) Unmarshal(b []byte) error { + buf := codec.NewBuffer(b) + m.AsyncEnable = buf.DecodeUint32() + copy(m.Engine[:], buf.DecodeBytes(64)) + copy(m.Algorithm[:], buf.DecodeBytes(64)) + copy(m.Ciphers[:], buf.DecodeBytes(64)) + return nil +} + +// TLSOpensslSetEngineReply defines message 'tls_openssl_set_engine_reply'. +type TLSOpensslSetEngineReply struct { + Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"` +} + +func (m *TLSOpensslSetEngineReply) Reset() { *m = TLSOpensslSetEngineReply{} } +func (*TLSOpensslSetEngineReply) GetMessageName() string { return "tls_openssl_set_engine_reply" } +func (*TLSOpensslSetEngineReply) GetCrcString() string { return "e8d4e804" } +func (*TLSOpensslSetEngineReply) GetMessageType() api.MessageType { + return api.ReplyMessage +} + +func (m *TLSOpensslSetEngineReply) Size() int { + if m == nil { + return 0 + } + var size int + size += 4 // m.Retval + return size +} +func (m *TLSOpensslSetEngineReply) Marshal(b []byte) ([]byte, error) { + var buf *codec.Buffer + if b == nil { + buf = codec.NewBuffer(make([]byte, m.Size())) + } else { + buf = codec.NewBuffer(b) + } + buf.EncodeUint32(uint32(m.Retval)) + return buf.Bytes(), nil +} +func (m *TLSOpensslSetEngineReply) Unmarshal(b []byte) error { + buf := codec.NewBuffer(b) + m.Retval = int32(buf.DecodeUint32()) + return nil +} + +func init() { file_tls_openssl_binapi_init() } +func file_tls_openssl_binapi_init() { + api.RegisterMessage((*TLSOpensslSetEngine)(nil), "tls_openssl_set_engine_e34d95c1") + api.RegisterMessage((*TLSOpensslSetEngineReply)(nil), "tls_openssl_set_engine_reply_e8d4e804") +} + +// Messages returns list of all messages in this module. +func AllMessages() []api.Message { + return []api.Message{ + (*TLSOpensslSetEngine)(nil), + (*TLSOpensslSetEngineReply)(nil), + } +} diff --git a/binapi/tls_openssl/tls_openssl_rest.ba.go b/binapi/tls_openssl/tls_openssl_rest.ba.go new file mode 100644 index 0000000..bfabb43 --- /dev/null +++ b/binapi/tls_openssl/tls_openssl_rest.ba.go @@ -0,0 +1,37 @@ +// Code generated by GoVPP's binapi-generator. DO NOT EDIT. + +package tls_openssl + +import ( + "encoding/json" + "io/ioutil" + "net/http" +) + +func RESTHandler(rpc RPCService) http.Handler { + mux := http.NewServeMux() + mux.HandleFunc("/tls_openssl_set_engine", func(w http.ResponseWriter, req *http.Request) { + var request = new(TLSOpensslSetEngine) + 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.TLSOpensslSetEngine(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/tls_openssl/tls_openssl_rpc.ba.go b/binapi/tls_openssl/tls_openssl_rpc.ba.go new file mode 100644 index 0000000..2575bf2 --- /dev/null +++ b/binapi/tls_openssl/tls_openssl_rpc.ba.go @@ -0,0 +1,30 @@ +// Code generated by GoVPP's binapi-generator. DO NOT EDIT. + +package tls_openssl + +import ( + "context" + api "git.fd.io/govpp.git/api" +) + +// RPCService defines RPC service tls_openssl. +type RPCService interface { + TLSOpensslSetEngine(ctx context.Context, in *TLSOpensslSetEngine) (*TLSOpensslSetEngineReply, error) +} + +type serviceClient struct { + conn api.Connection +} + +func NewServiceClient(conn api.Connection) RPCService { + return &serviceClient{conn} +} + +func (c *serviceClient) TLSOpensslSetEngine(ctx context.Context, in *TLSOpensslSetEngine) (*TLSOpensslSetEngineReply, error) { + out := new(TLSOpensslSetEngineReply) + err := c.conn.Invoke(ctx, in, out) + if err != nil { + return nil, err + } + return out, nil +} -- cgit 1.2.3-korg