3 files changed, 22 insertions, 54 deletions

diff --git a/binapi/stn/stn.ba.go b/binapi/stn/stn.ba.go
index b44adf5..96f778f 100644
--- a/binapi/stn/stn.ba.go
+++ b/binapi/stn/stn.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/stn.api.json
 
 // Package stn contains generated bindings for API file stn.api.
@@ -12,10 +12,10 @@
 package stn
 
 import (
-	api "git.fd.io/govpp.git/api"
-	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"
+	api "go.fd.io/govpp/api"
+	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
@@ -27,7 +27,7 @@ const _ = api.GoVppAPIPackageIsVersion2
 const (
 	APIFile    = "stn"
 	APIVersion = "2.0.0"
-	VersionCrc = 0x5a5079cd
+	VersionCrc = 0x9cfaef64
 )
 
 // StnAddDelRule defines message 'stn_add_del_rule'.
@@ -39,7 +39,7 @@ type StnAddDelRule struct {
 
 func (m *StnAddDelRule) Reset()               { *m = StnAddDelRule{} }
 func (*StnAddDelRule) GetMessageName() string { return "stn_add_del_rule" }
-func (*StnAddDelRule) GetCrcString() string   { return "53f751e6" }
+func (*StnAddDelRule) GetCrcString() string   { return "224c6edd" }
 func (*StnAddDelRule) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
@@ -115,7 +115,7 @@ type StnRulesDetails struct {
 
 func (m *StnRulesDetails) Reset()               { *m = StnRulesDetails{} }
 func (*StnRulesDetails) GetMessageName() string { return "stn_rules_details" }
-func (*StnRulesDetails) GetCrcString() string   { return "b0f6606c" }
+func (*StnRulesDetails) GetCrcString() string   { return "a51935a6" }
 func (*StnRulesDetails) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
@@ -176,9 +176,9 @@ func (m *StnRulesDump) Unmarshal(b []byte) error {
 
 func init() { file_stn_binapi_init() }
 func file_stn_binapi_init() {
-	api.RegisterMessage((*StnAddDelRule)(nil), "stn_add_del_rule_53f751e6")
+	api.RegisterMessage((*StnAddDelRule)(nil), "stn_add_del_rule_224c6edd")
 	api.RegisterMessage((*StnAddDelRuleReply)(nil), "stn_add_del_rule_reply_e8d4e804")
-	api.RegisterMessage((*StnRulesDetails)(nil), "stn_rules_details_b0f6606c")
+	api.RegisterMessage((*StnRulesDetails)(nil), "stn_rules_details_a51935a6")
 	api.RegisterMessage((*StnRulesDump)(nil), "stn_rules_dump_51077d14")
 }
 
diff --git a/binapi/stn/stn_rest.ba.go b/binapi/stn/stn_rest.ba.go
deleted file mode 100644
index 826aee9..0000000
--- a/binapi/stn/stn_rest.ba.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Code generated by GoVPP's binapi-generator. DO NOT EDIT.
-
-package stn
-
-import (
-	"encoding/json"
-	"io/ioutil"
-	"net/http"
-)
-
-func RESTHandler(rpc RPCService) http.Handler {
-	mux := http.NewServeMux()
-	mux.HandleFunc("/stn_add_del_rule", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(StnAddDelRule)
-		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.StnAddDelRule(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/stn/stn_rpc.ba.go b/binapi/stn/stn_rpc.ba.go
index 932074c..ae387a1 100644
--- a/binapi/stn/stn_rpc.ba.go
+++ b/binapi/stn/stn_rpc.ba.go
@@ -5,12 +5,13 @@ package stn
 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  stn.
+// RPCService defines RPC service stn.
 type RPCService interface {
 	StnAddDelRule(ctx context.Context, in *StnAddDelRule) (*StnAddDelRuleReply, error)
 	StnRulesDump(ctx context.Context, in *StnRulesDump) (RPCService_StnRulesDumpClient, error)
@@ -30,7 +31,7 @@ func (c *serviceClient) StnAddDelRule(ctx context.Context, in *StnAddDelRule) (*
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) StnRulesDump(ctx context.Context, in *StnRulesDump) (RPCService_StnRulesDumpClient, error) {
@@ -42,7 +43,7 @@ func (c *serviceClient) StnRulesDump(ctx context.Context, in *StnRulesDump) (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
@@ -65,7 +66,11 @@ func (c *serviceClient_StnRulesDumpClient) Recv() (*StnRulesDetails, error) {
 	switch m := msg.(type) {
 	case *StnRulesDetails:
 		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)