Refactoring and fixes

* refactor creation of new channel
* add missing closing of created streams
* correct documentation regarding thread safety of stream

Signed-off-by: mhalaj1 <matus.halaj@pantheon.tech>
Change-Id: Ic601efff298fcbdecaafab83fa236253af69de21

204 files changed, 911 insertions, 161 deletions

diff --git a/api/api.go b/api/api.go
index 3089f24..c4f069f 100644
--- a/api/api.go
+++ b/api/api.go
@@ -36,21 +36,16 @@ type Connection interface {
 // Stream provides low-level access for sending and receiving messages.
 // Users should handle correct type and ordering of messages.
 //
+// It is not safe to call these methods on the same stream in different
+// goroutines.
+//
 // NOTE: This API is EXPERIMENTAL.
 type Stream interface {
 	// SendMsg sends a message to the client.
 	// It blocks until message is sent to the transport.
-	//
-	// It is safe to have a goroutine calling SendMsg and another goroutine
-	// calling RecvMsg on the same stream at the same time, but it is not safe
-	// to call SendMsg on the same stream in different goroutines.
 	SendMsg(Message) error
 
 	// RecvMsg blocks until a message is received or error occurs.
-	//
-	// It is safe to have a goroutine calling SendMsg and another goroutine
-	// calling RecvMsg on the same stream at the same time, but it is not safe
-	// to call SendMsg on the same stream in different goroutines.
 	RecvMsg() (Message, error)
 
 	// Close closes the stream. Calling SendMsg and RecvMsg will return error
diff --git a/binapi/abf/abf.ba.go b/binapi/abf/abf.ba.go
index 209986a..b3083d8 100644
--- a/binapi/abf/abf.ba.go
+++ b/binapi/abf/abf.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/abf.api.json
 
diff --git a/binapi/abf/abf_rpc.ba.go b/binapi/abf/abf_rpc.ba.go
index 5b2f825..4ab9e18 100644
--- a/binapi/abf/abf_rpc.ba.go
+++ b/binapi/abf/abf_rpc.ba.go
@@ -70,6 +70,10 @@ func (c *serviceClient_AbfItfAttachDumpClient) Recv() (*AbfItfAttachDetails, err
 	case *AbfItfAttachDetails:
 		return m, nil
 	case *vpe.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)
@@ -127,6 +131,10 @@ func (c *serviceClient_AbfPolicyDumpClient) Recv() (*AbfPolicyDetails, error) {
 	case *AbfPolicyDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/acl/acl.ba.go b/binapi/acl/acl.ba.go
index 2ee4b14..fbb0e16 100644
--- a/binapi/acl/acl.ba.go
+++ b/binapi/acl/acl.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/acl.api.json
 
diff --git a/binapi/acl/acl_rpc.ba.go b/binapi/acl/acl_rpc.ba.go
index da1ecca..62c33e1 100644
--- a/binapi/acl/acl_rpc.ba.go
+++ b/binapi/acl/acl_rpc.ba.go
@@ -93,6 +93,10 @@ func (c *serviceClient_ACLDumpClient) Recv() (*ACLDetails, error) {
 	case *ACLDetails:
 		return m, nil
 	case *vpe.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)
@@ -141,6 +145,10 @@ func (c *serviceClient_ACLInterfaceEtypeWhitelistDumpClient) Recv() (*ACLInterfa
 	case *ACLInterfaceEtypeWhitelistDetails:
 		return m, nil
 	case *vpe.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)
@@ -180,6 +188,10 @@ func (c *serviceClient_ACLInterfaceListDumpClient) Recv() (*ACLInterfaceListDeta
 	case *ACLInterfaceListDetails:
 		return m, nil
 	case *vpe.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)
@@ -300,6 +312,10 @@ func (c *serviceClient_MacipACLDumpClient) Recv() (*MacipACLDetails, error) {
 	case *MacipACLDetails:
 		return m, nil
 	case *vpe.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)
@@ -357,6 +373,10 @@ func (c *serviceClient_MacipACLInterfaceListDumpClient) Recv() (*MacipACLInterfa
 	case *MacipACLInterfaceListDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/acl_types/acl_types.ba.go b/binapi/acl_types/acl_types.ba.go
index f9b6128..b9d4686 100644
--- a/binapi/acl_types/acl_types.ba.go
+++ b/binapi/acl_types/acl_types.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/acl_types.api.json
 
diff --git a/binapi/adl/adl.ba.go b/binapi/adl/adl.ba.go
index 9f30501..1272287 100644
--- a/binapi/adl/adl.ba.go
+++ b/binapi/adl/adl.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/adl.api.json
 
diff --git a/binapi/af_packet/af_packet.ba.go b/binapi/af_packet/af_packet.ba.go
index 3da5478..bc636da 100644
--- a/binapi/af_packet/af_packet.ba.go
+++ b/binapi/af_packet/af_packet.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/af_packet.api.json
 
diff --git a/binapi/af_packet/af_packet_rpc.ba.go b/binapi/af_packet/af_packet_rpc.ba.go
index f8c3732..27e22fc 100644
--- a/binapi/af_packet/af_packet_rpc.ba.go
+++ b/binapi/af_packet/af_packet_rpc.ba.go
@@ -78,6 +78,10 @@ func (c *serviceClient_AfPacketDumpClient) Recv() (*AfPacketDetails, error) {
 	case *AfPacketDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/af_xdp/af_xdp.ba.go b/binapi/af_xdp/af_xdp.ba.go
index e99892f..ac16ac3 100644
--- a/binapi/af_xdp/af_xdp.ba.go
+++ b/binapi/af_xdp/af_xdp.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/af_xdp.api.json
 
diff --git a/binapi/arp/arp.ba.go b/binapi/arp/arp.ba.go
index 88482f1..ca03a90 100644
--- a/binapi/arp/arp.ba.go
+++ b/binapi/arp/arp.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/arp.api.json
 
diff --git a/binapi/arp/arp_rpc.ba.go b/binapi/arp/arp_rpc.ba.go
index 6e60bf3..d9f38f2 100644
--- a/binapi/arp/arp_rpc.ba.go
+++ b/binapi/arp/arp_rpc.ba.go
@@ -69,6 +69,10 @@ func (c *serviceClient_ProxyArpDumpClient) Recv() (*ProxyArpDetails, error) {
 	case *ProxyArpDetails:
 		return m, nil
 	case *vpe.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)
@@ -108,6 +112,10 @@ func (c *serviceClient_ProxyArpIntfcDumpClient) Recv() (*ProxyArpIntfcDetails, e
 	case *ProxyArpIntfcDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/arping/arping.ba.go b/binapi/arping/arping.ba.go
index b246610..be4db66 100644
--- a/binapi/arping/arping.ba.go
+++ b/binapi/arping/arping.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/arping.api.json
 
diff --git a/binapi/avf/avf.ba.go b/binapi/avf/avf.ba.go
index d5a20fc..b741cdf 100644
--- a/binapi/avf/avf.ba.go
+++ b/binapi/avf/avf.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/avf.api.json
 
diff --git a/binapi/bfd/bfd.ba.go b/binapi/bfd/bfd.ba.go
index 5504b3b..b9d3859 100644
--- a/binapi/bfd/bfd.ba.go
+++ b/binapi/bfd/bfd.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/bfd.api.json
 
diff --git a/binapi/bfd/bfd_rpc.ba.go b/binapi/bfd/bfd_rpc.ba.go
index a2e5c5c..b3c2e86 100644
--- a/binapi/bfd/bfd_rpc.ba.go
+++ b/binapi/bfd/bfd_rpc.ba.go
@@ -79,6 +79,10 @@ func (c *serviceClient_BfdAuthKeysDumpClient) Recv() (*BfdAuthKeysDetails, error
 	case *BfdAuthKeysDetails:
 		return m, nil
 	case *vpe.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)
@@ -190,6 +194,10 @@ func (c *serviceClient_BfdUDPSessionDumpClient) Recv() (*BfdUDPSessionDetails, e
 	case *BfdUDPSessionDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/bier/bier.ba.go b/binapi/bier/bier.ba.go
index faaf019..3d45b6a 100644
--- a/binapi/bier/bier.ba.go
+++ b/binapi/bier/bier.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/bier.api.json
 
diff --git a/binapi/bier/bier_rpc.ba.go b/binapi/bier/bier_rpc.ba.go
index 56b027c..5766723 100644
--- a/binapi/bier/bier_rpc.ba.go
+++ b/binapi/bier/bier_rpc.ba.go
@@ -76,6 +76,10 @@ func (c *serviceClient_BierDispEntryDumpClient) Recv() (*BierDispEntryDetails, e
 	case *BierDispEntryDetails:
 		return m, nil
 	case *vpe.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)
@@ -124,6 +128,10 @@ func (c *serviceClient_BierDispTableDumpClient) Recv() (*BierDispTableDetails, e
 	case *BierDispTableDetails:
 		return m, nil
 	case *vpe.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)
@@ -181,6 +189,10 @@ func (c *serviceClient_BierImpDumpClient) Recv() (*BierImpDetails, error) {
 	case *BierImpDetails:
 		return m, nil
 	case *vpe.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)
@@ -229,6 +241,10 @@ func (c *serviceClient_BierRouteDumpClient) Recv() (*BierRouteDetails, error) {
 	case *BierRouteDetails:
 		return m, nil
 	case *vpe.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)
@@ -277,6 +293,10 @@ func (c *serviceClient_BierTableDumpClient) Recv() (*BierTableDetails, error) {
 	case *BierTableDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/bond/bond.ba.go b/binapi/bond/bond.ba.go
index 1141bde..71ae508 100644
--- a/binapi/bond/bond.ba.go
+++ b/binapi/bond/bond.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/bond.api.json
 
diff --git a/binapi/bond/bond_rpc.ba.go b/binapi/bond/bond_rpc.ba.go
index ac8b3a8..55f0e5f 100644
--- a/binapi/bond/bond_rpc.ba.go
+++ b/binapi/bond/bond_rpc.ba.go
@@ -131,6 +131,10 @@ func (c *serviceClient_SwBondInterfaceDumpClient) Recv() (*SwBondInterfaceDetail
 	case *SwBondInterfaceDetails:
 		return m, nil
 	case *vpe.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)
@@ -170,6 +174,10 @@ func (c *serviceClient_SwInterfaceBondDumpClient) Recv() (*SwInterfaceBondDetail
 	case *SwInterfaceBondDetails:
 		return m, nil
 	case *vpe.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)
@@ -218,6 +226,10 @@ func (c *serviceClient_SwInterfaceSlaveDumpClient) Recv() (*SwInterfaceSlaveDeta
 	case *SwInterfaceSlaveDetails:
 		return m, nil
 	case *vpe.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)
@@ -257,6 +269,10 @@ func (c *serviceClient_SwMemberInterfaceDumpClient) Recv() (*SwMemberInterfaceDe
 	case *SwMemberInterfaceDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/builtinurl/builtinurl.ba.go b/binapi/builtinurl/builtinurl.ba.go
index daa8ced..f631940 100644
--- a/binapi/builtinurl/builtinurl.ba.go
+++ b/binapi/builtinurl/builtinurl.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/builtinurl.api.json
 
diff --git a/binapi/cdp/cdp.ba.go b/binapi/cdp/cdp.ba.go
index c80f100..720c3df 100644
--- a/binapi/cdp/cdp.ba.go
+++ b/binapi/cdp/cdp.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/cdp.api.json
 
diff --git a/binapi/classify/classify.ba.go b/binapi/classify/classify.ba.go
index 2ee8e41..c136722 100644
--- a/binapi/classify/classify.ba.go
+++ b/binapi/classify/classify.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/classify.api.json
 
diff --git a/binapi/classify/classify_rpc.ba.go b/binapi/classify/classify_rpc.ba.go
index 4913758..92034df 100644
--- a/binapi/classify/classify_rpc.ba.go
+++ b/binapi/classify/classify_rpc.ba.go
@@ -121,6 +121,10 @@ func (c *serviceClient_ClassifySessionDumpClient) Recv() (*ClassifySessionDetail
 	case *ClassifySessionDetails:
 		return m, nil
 	case *vpe.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)
@@ -232,6 +236,10 @@ func (c *serviceClient_FlowClassifyDumpClient) Recv() (*FlowClassifyDetails, err
 	case *FlowClassifyDetails:
 		return m, nil
 	case *vpe.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)
@@ -298,6 +306,10 @@ func (c *serviceClient_PolicerClassifyDumpClient) Recv() (*PolicerClassifyDetail
 	case *PolicerClassifyDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/cnat/cnat.ba.go b/binapi/cnat/cnat.ba.go
index 735aaeb..c77a37d 100644
--- a/binapi/cnat/cnat.ba.go
+++ b/binapi/cnat/cnat.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/cnat.api.json
 
diff --git a/binapi/cnat/cnat_rpc.ba.go b/binapi/cnat/cnat_rpc.ba.go
index 4a87669..f239261 100644
--- a/binapi/cnat/cnat_rpc.ba.go
+++ b/binapi/cnat/cnat_rpc.ba.go
@@ -75,6 +75,10 @@ func (c *serviceClient_CnatSessionDumpClient) Recv() (*CnatSessionDetails, error
 	case *CnatSessionDetails:
 		return m, nil
 	case *vpe.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)
@@ -168,6 +172,10 @@ func (c *serviceClient_CnatTranslationDumpClient) Recv() (*CnatTranslationDetail
 	case *CnatTranslationDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/crypto/crypto.ba.go b/binapi/crypto/crypto.ba.go
index 2b8a3b5..a5844bf 100644
--- a/binapi/crypto/crypto.ba.go
+++ b/binapi/crypto/crypto.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/crypto.api.json
 
diff --git a/binapi/crypto_sw_scheduler/crypto_sw_scheduler.ba.go b/binapi/crypto_sw_scheduler/crypto_sw_scheduler.ba.go
index bfd0e50..41fbd82 100644
--- a/binapi/crypto_sw_scheduler/crypto_sw_scheduler.ba.go
+++ b/binapi/crypto_sw_scheduler/crypto_sw_scheduler.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/crypto_sw_scheduler.api.json
 
diff --git a/binapi/ct6/ct6.ba.go b/binapi/ct6/ct6.ba.go
index fc9925f..3c66b14 100644
--- a/binapi/ct6/ct6.ba.go
+++ b/binapi/ct6/ct6.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/ct6.api.json
 
diff --git a/binapi/det44/det44.ba.go b/binapi/det44/det44.ba.go
index e94ba8c..9e25bb7 100644
--- a/binapi/det44/det44.ba.go
+++ b/binapi/det44/det44.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/det44.api.json
 
diff --git a/binapi/det44/det44_rpc.ba.go b/binapi/det44/det44_rpc.ba.go
index 7efcc30..e943932 100644
--- a/binapi/det44/det44_rpc.ba.go
+++ b/binapi/det44/det44_rpc.ba.go
@@ -129,6 +129,10 @@ func (c *serviceClient_Det44InterfaceDumpClient) Recv() (*Det44InterfaceDetails,
 	case *Det44InterfaceDetails:
 		return m, nil
 	case *vpe.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)
@@ -168,6 +172,10 @@ func (c *serviceClient_Det44MapDumpClient) Recv() (*Det44MapDetails, error) {
 	case *Det44MapDetails:
 		return m, nil
 	case *vpe.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)
@@ -225,6 +233,10 @@ func (c *serviceClient_Det44SessionDumpClient) Recv() (*Det44SessionDetails, err
 	case *Det44SessionDetails:
 		return m, nil
 	case *vpe.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)
@@ -309,6 +321,10 @@ func (c *serviceClient_NatDetMapDumpClient) Recv() (*NatDetMapDetails, error) {
 	case *NatDetMapDetails:
 		return m, nil
 	case *vpe.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)
@@ -357,6 +373,10 @@ func (c *serviceClient_NatDetSessionDumpClient) Recv() (*NatDetSessionDetails, e
 	case *NatDetSessionDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/dhcp/dhcp.ba.go b/binapi/dhcp/dhcp.ba.go
index 20cd356..646ee01 100644
--- a/binapi/dhcp/dhcp.ba.go
+++ b/binapi/dhcp/dhcp.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/dhcp.api.json
 
diff --git a/binapi/dhcp/dhcp_rpc.ba.go b/binapi/dhcp/dhcp_rpc.ba.go
index 6309d8e..f4df371 100644
--- a/binapi/dhcp/dhcp_rpc.ba.go
+++ b/binapi/dhcp/dhcp_rpc.ba.go
@@ -114,6 +114,10 @@ func (c *serviceClient_DHCPClientDumpClient) Recv() (*DHCPClientDetails, error)
 	case *DHCPClientDetails:
 		return m, nil
 	case *vpe.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)
@@ -180,6 +184,10 @@ func (c *serviceClient_DHCPProxyDumpClient) Recv() (*DHCPProxyDetails, error) {
 	case *DHCPProxyDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/dhcp6_ia_na_client_cp/dhcp6_ia_na_client_cp.ba.go b/binapi/dhcp6_ia_na_client_cp/dhcp6_ia_na_client_cp.ba.go
index 70537d7..d1c9c4d 100644
--- a/binapi/dhcp6_ia_na_client_cp/dhcp6_ia_na_client_cp.ba.go
+++ b/binapi/dhcp6_ia_na_client_cp/dhcp6_ia_na_client_cp.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/dhcp6_ia_na_client_cp.api.json
 
diff --git a/binapi/dhcp6_pd_client_cp/dhcp6_pd_client_cp.ba.go b/binapi/dhcp6_pd_client_cp/dhcp6_pd_client_cp.ba.go
index 8a8f96a..f6af356 100644
--- a/binapi/dhcp6_pd_client_cp/dhcp6_pd_client_cp.ba.go
+++ b/binapi/dhcp6_pd_client_cp/dhcp6_pd_client_cp.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/dhcp6_pd_client_cp.api.json
 
diff --git a/binapi/dns/dns.ba.go b/binapi/dns/dns.ba.go
index 2107ff3..65f7200 100644
--- a/binapi/dns/dns.ba.go
+++ b/binapi/dns/dns.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/dns.api.json
 
diff --git a/binapi/dslite/dslite.ba.go b/binapi/dslite/dslite.ba.go
index 77d8220..6d5d30a 100644
--- a/binapi/dslite/dslite.ba.go
+++ b/binapi/dslite/dslite.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/dslite.api.json
 
diff --git a/binapi/dslite/dslite_rpc.ba.go b/binapi/dslite/dslite_rpc.ba.go
index 5847cf6..6bec82d 100644
--- a/binapi/dslite/dslite_rpc.ba.go
+++ b/binapi/dslite/dslite_rpc.ba.go
@@ -71,6 +71,10 @@ func (c *serviceClient_DsliteAddressDumpClient) Recv() (*DsliteAddressDetails, e
 	case *DsliteAddressDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/ethernet_types/ethernet_types.ba.go b/binapi/ethernet_types/ethernet_types.ba.go
index 9b393ff..dd18d9e 100644
--- a/binapi/ethernet_types/ethernet_types.ba.go
+++ b/binapi/ethernet_types/ethernet_types.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/ethernet_types.api.json
 
diff --git a/binapi/feature/feature.ba.go b/binapi/feature/feature.ba.go
index e4e79da..cb5d084 100644
--- a/binapi/feature/feature.ba.go
+++ b/binapi/feature/feature.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/feature.api.json
 
diff --git a/binapi/fib/fib.ba.go b/binapi/fib/fib.ba.go
index f805aa3..67c4186 100644
--- a/binapi/fib/fib.ba.go
+++ b/binapi/fib/fib.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/fib.api.json
 
diff --git a/binapi/fib/fib_rpc.ba.go b/binapi/fib/fib_rpc.ba.go
index 245663b..a2bd407 100644
--- a/binapi/fib/fib_rpc.ba.go
+++ b/binapi/fib/fib_rpc.ba.go
@@ -67,6 +67,10 @@ func (c *serviceClient_FibSourceDumpClient) Recv() (*FibSourceDetails, error) {
 	case *FibSourceDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/fib_types/fib_types.ba.go b/binapi/fib_types/fib_types.ba.go
index 3841117..76e64a7 100644
--- a/binapi/fib_types/fib_types.ba.go
+++ b/binapi/fib_types/fib_types.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/fib_types.api.json
 
diff --git a/binapi/flow/flow.ba.go b/binapi/flow/flow.ba.go
index bd479b7..0652096 100644
--- a/binapi/flow/flow.ba.go
+++ b/binapi/flow/flow.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/flow.api.json
 
diff --git a/binapi/flow_types/flow_types.ba.go b/binapi/flow_types/flow_types.ba.go
index bf6aa00..6ac52bd 100644
--- a/binapi/flow_types/flow_types.ba.go
+++ b/binapi/flow_types/flow_types.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/flow_types.api.json
 
diff --git a/binapi/flowprobe/flowprobe.ba.go b/binapi/flowprobe/flowprobe.ba.go
index 30fc50a..f636207 100644
--- a/binapi/flowprobe/flowprobe.ba.go
+++ b/binapi/flowprobe/flowprobe.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/flowprobe.api.json
 
diff --git a/binapi/gbp/gbp.ba.go b/binapi/gbp/gbp.ba.go
index cbcf23b..079b83e 100644
--- a/binapi/gbp/gbp.ba.go
+++ b/binapi/gbp/gbp.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/gbp.api.json
 
diff --git a/binapi/gbp/gbp_rpc.ba.go b/binapi/gbp/gbp_rpc.ba.go
index 4b45ea7..13544f6 100644
--- a/binapi/gbp/gbp_rpc.ba.go
+++ b/binapi/gbp/gbp_rpc.ba.go
@@ -97,6 +97,10 @@ func (c *serviceClient_GbpBridgeDomainDumpClient) Recv() (*GbpBridgeDomainDetail
 	case *GbpBridgeDomainDetails:
 		return m, nil
 	case *vpe.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)
@@ -145,6 +149,10 @@ func (c *serviceClient_GbpContractDumpClient) Recv() (*GbpContractDetails, error
 	case *GbpContractDetails:
 		return m, nil
 	case *vpe.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)
@@ -202,6 +210,10 @@ func (c *serviceClient_GbpEndpointDumpClient) Recv() (*GbpEndpointDetails, error
 	case *GbpEndpointDetails:
 		return m, nil
 	case *vpe.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)
@@ -259,6 +271,10 @@ func (c *serviceClient_GbpEndpointGroupDumpClient) Recv() (*GbpEndpointGroupDeta
 	case *GbpEndpointGroupDetails:
 		return m, nil
 	case *vpe.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)
@@ -307,6 +323,10 @@ func (c *serviceClient_GbpExtItfDumpClient) Recv() (*GbpExtItfDetails, error) {
 	case *GbpExtItfDetails:
 		return m, nil
 	case *vpe.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)
@@ -355,6 +375,10 @@ func (c *serviceClient_GbpRecircDumpClient) Recv() (*GbpRecircDetails, error) {
 	case *GbpRecircDetails:
 		return m, nil
 	case *vpe.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)
@@ -412,6 +436,10 @@ func (c *serviceClient_GbpRouteDomainDumpClient) Recv() (*GbpRouteDomainDetails,
 	case *GbpRouteDomainDetails:
 		return m, nil
 	case *vpe.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)
@@ -460,6 +488,10 @@ func (c *serviceClient_GbpSubnetDumpClient) Recv() (*GbpSubnetDetails, error) {
 	case *GbpSubnetDetails:
 		return m, nil
 	case *vpe.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)
@@ -517,6 +549,10 @@ func (c *serviceClient_GbpVxlanTunnelDumpClient) Recv() (*GbpVxlanTunnelDetails,
 	case *GbpVxlanTunnelDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/geneve/geneve.ba.go b/binapi/geneve/geneve.ba.go
index 27304f0..9906004 100644
--- a/binapi/geneve/geneve.ba.go
+++ b/binapi/geneve/geneve.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/geneve.api.json
 
diff --git a/binapi/geneve/geneve_rpc.ba.go b/binapi/geneve/geneve_rpc.ba.go
index 5d44d7d..a926667 100644
--- a/binapi/geneve/geneve_rpc.ba.go
+++ b/binapi/geneve/geneve_rpc.ba.go
@@ -78,6 +78,10 @@ func (c *serviceClient_GeneveTunnelDumpClient) Recv() (*GeneveTunnelDetails, err
 	case *GeneveTunnelDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/graph/graph.ba.go b/binapi/graph/graph.ba.go
index 7847689..e9a8540 100644
--- a/binapi/graph/graph.ba.go
+++ b/binapi/graph/graph.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/graph.api.json
 
diff --git a/binapi/graph/graph_rpc.ba.go b/binapi/graph/graph_rpc.ba.go
index d799e4f..32f049b 100644
--- a/binapi/graph/graph_rpc.ba.go
+++ b/binapi/graph/graph_rpc.ba.go
@@ -53,6 +53,10 @@ func (c *serviceClient_GraphNodeGetClient) Recv() (*GraphNodeDetails, error) {
 	case *GraphNodeDetails:
 		return m, nil
 	case *GraphNodeGetReply:
+		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)
diff --git a/binapi/gre/gre.ba.go b/binapi/gre/gre.ba.go
index 08a225d..fa14909 100644
--- a/binapi/gre/gre.ba.go
+++ b/binapi/gre/gre.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/gre.api.json
 
diff --git a/binapi/gre/gre_rpc.ba.go b/binapi/gre/gre_rpc.ba.go
index f68ef46..11edd63 100644
--- a/binapi/gre/gre_rpc.ba.go
+++ b/binapi/gre/gre_rpc.ba.go
@@ -67,6 +67,10 @@ func (c *serviceClient_GreTunnelDumpClient) Recv() (*GreTunnelDetails, error) {
 	case *GreTunnelDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/gso/gso.ba.go b/binapi/gso/gso.ba.go
index 3c16c00..b7fcd21 100644
--- a/binapi/gso/gso.ba.go
+++ b/binapi/gso/gso.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/gso.api.json
 
diff --git a/binapi/gtpu/gtpu.ba.go b/binapi/gtpu/gtpu.ba.go
index 0d5b315..b347951 100644
--- a/binapi/gtpu/gtpu.ba.go
+++ b/binapi/gtpu/gtpu.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/gtpu.api.json
 
diff --git a/binapi/gtpu/gtpu_rpc.ba.go b/binapi/gtpu/gtpu_rpc.ba.go
index 6f5bd95..c7b0f12 100644
--- a/binapi/gtpu/gtpu_rpc.ba.go
+++ b/binapi/gtpu/gtpu_rpc.ba.go
@@ -79,6 +79,10 @@ func (c *serviceClient_GtpuTunnelDumpClient) Recv() (*GtpuTunnelDetails, error)
 	case *GtpuTunnelDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/http_static/http_static.ba.go b/binapi/http_static/http_static.ba.go
index 2530887..fb635bb 100644
--- a/binapi/http_static/http_static.ba.go
+++ b/binapi/http_static/http_static.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/http_static.api.json
 
diff --git a/binapi/igmp/igmp.ba.go b/binapi/igmp/igmp.ba.go
index 3521d21..289bba8 100644
--- a/binapi/igmp/igmp.ba.go
+++ b/binapi/igmp/igmp.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/igmp.api.json
 
diff --git a/binapi/igmp/igmp_rpc.ba.go b/binapi/igmp/igmp_rpc.ba.go
index 3cda04c..641e2db 100644
--- a/binapi/igmp/igmp_rpc.ba.go
+++ b/binapi/igmp/igmp_rpc.ba.go
@@ -74,6 +74,10 @@ func (c *serviceClient_IgmpDumpClient) Recv() (*IgmpDetails, error) {
 	case *IgmpDetails:
 		return m, nil
 	case *vpe.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)
@@ -122,6 +126,10 @@ func (c *serviceClient_IgmpGroupPrefixDumpClient) Recv() (*IgmpGroupPrefixDetail
 	case *IgmpGroupPrefixDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/ikev2/ikev2.ba.go b/binapi/ikev2/ikev2.ba.go
index b5fa62e..0816fcb 100644
--- a/binapi/ikev2/ikev2.ba.go
+++ b/binapi/ikev2/ikev2.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/ikev2.api.json
 
diff --git a/binapi/ikev2/ikev2_rpc.ba.go b/binapi/ikev2/ikev2_rpc.ba.go
index 24b6a29..b09d700 100644
--- a/binapi/ikev2/ikev2_rpc.ba.go
+++ b/binapi/ikev2/ikev2_rpc.ba.go
@@ -81,6 +81,10 @@ func (c *serviceClient_Ikev2ChildSaDumpClient) Recv() (*Ikev2ChildSaDetails, err
 	case *Ikev2ChildSaDetails:
 		return m, nil
 	case *vpe.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)
@@ -192,6 +196,10 @@ func (c *serviceClient_Ikev2ProfileDumpClient) Recv() (*Ikev2ProfileDetails, err
 	case *Ikev2ProfileDetails:
 		return m, nil
 	case *vpe.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)
@@ -285,6 +293,10 @@ func (c *serviceClient_Ikev2SaDumpClient) Recv() (*Ikev2SaDetails, error) {
 	case *Ikev2SaDetails:
 		return m, nil
 	case *vpe.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)
@@ -387,6 +399,10 @@ func (c *serviceClient_Ikev2TrafficSelectorDumpClient) Recv() (*Ikev2TrafficSele
 	case *Ikev2TrafficSelectorDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/ikev2_types/ikev2_types.ba.go b/binapi/ikev2_types/ikev2_types.ba.go
index 57cdacf..ca41d71 100644
--- a/binapi/ikev2_types/ikev2_types.ba.go
+++ b/binapi/ikev2_types/ikev2_types.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/ikev2_types.api.json
 
diff --git a/binapi/interface/interface.ba.go b/binapi/interface/interface.ba.go
index 54d8062..4c593b6 100644
--- a/binapi/interface/interface.ba.go
+++ b/binapi/interface/interface.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/interface.api.json
 
diff --git a/binapi/interface/interface_rpc.ba.go b/binapi/interface/interface_rpc.ba.go
index b4cecf9..b00a7c2 100644
--- a/binapi/interface/interface_rpc.ba.go
+++ b/binapi/interface/interface_rpc.ba.go
@@ -211,6 +211,10 @@ func (c *serviceClient_SwInterfaceDumpClient) Recv() (*SwInterfaceDetails, error
 	case *SwInterfaceDetails:
 		return m, nil
 	case *vpe.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)
@@ -268,6 +272,10 @@ func (c *serviceClient_SwInterfaceRxPlacementDumpClient) Recv() (*SwInterfaceRxP
 	case *SwInterfaceRxPlacementDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/interface_types/interface_types.ba.go b/binapi/interface_types/interface_types.ba.go
index b90fbd9..5e81238 100644
--- a/binapi/interface_types/interface_types.ba.go
+++ b/binapi/interface_types/interface_types.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/interface_types.api.json
 
diff --git a/binapi/ioam_cache/ioam_cache.ba.go b/binapi/ioam_cache/ioam_cache.ba.go
index 24824ce..1cdc04a 100644
--- a/binapi/ioam_cache/ioam_cache.ba.go
+++ b/binapi/ioam_cache/ioam_cache.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/ioam_cache.api.json
 
diff --git a/binapi/ioam_export/ioam_export.ba.go b/binapi/ioam_export/ioam_export.ba.go
index 58296bd..c537325 100644
--- a/binapi/ioam_export/ioam_export.ba.go
+++ b/binapi/ioam_export/ioam_export.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/ioam_export.api.json
 
diff --git a/binapi/ioam_vxlan_gpe/ioam_vxlan_gpe.ba.go b/binapi/ioam_vxlan_gpe/ioam_vxlan_gpe.ba.go
index 44f8a1c..fb3570a 100644
--- a/binapi/ioam_vxlan_gpe/ioam_vxlan_gpe.ba.go
+++ b/binapi/ioam_vxlan_gpe/ioam_vxlan_gpe.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/ioam_vxlan_gpe.api.json
 
diff --git a/binapi/ip/ip.ba.go b/binapi/ip/ip.ba.go
index fa9d1a0..beb9382 100644
--- a/binapi/ip/ip.ba.go
+++ b/binapi/ip/ip.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/ip.api.json
 
diff --git a/binapi/ip/ip_rpc.ba.go b/binapi/ip/ip_rpc.ba.go
index 6429f0c..d40089b 100644
--- a/binapi/ip/ip_rpc.ba.go
+++ b/binapi/ip/ip_rpc.ba.go
@@ -114,6 +114,10 @@ func (c *serviceClient_IPAddressDumpClient) Recv() (*IPAddressDetails, error) {
 	case *IPAddressDetails:
 		return m, nil
 	case *vpe.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)
@@ -162,6 +166,10 @@ func (c *serviceClient_IPContainerProxyDumpClient) Recv() (*IPContainerProxyDeta
 	case *IPContainerProxyDetails:
 		return m, nil
 	case *vpe.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)
@@ -201,6 +209,10 @@ func (c *serviceClient_IPDumpClient) Recv() (*IPDetails, error) {
 	case *IPDetails:
 		return m, nil
 	case *vpe.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)
@@ -249,6 +261,10 @@ func (c *serviceClient_IPMrouteDumpClient) Recv() (*IPMrouteDetails, error) {
 	case *IPMrouteDetails:
 		return m, nil
 	case *vpe.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)
@@ -288,6 +304,10 @@ func (c *serviceClient_IPMtableDumpClient) Recv() (*IPMtableDetails, error) {
 	case *IPMtableDetails:
 		return m, nil
 	case *vpe.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)
@@ -324,6 +344,10 @@ func (c *serviceClient_IPPathMtuGetClient) Recv() (*IPPathMtuDetails, error) {
 	case *IPPathMtuDetails:
 		return m, nil
 	case *IPPathMtuGetReply:
+		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)
@@ -408,6 +432,10 @@ func (c *serviceClient_IPPuntRedirectDumpClient) Recv() (*IPPuntRedirectDetails,
 	case *IPPuntRedirectDetails:
 		return m, nil
 	case *vpe.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)
@@ -492,6 +520,10 @@ func (c *serviceClient_IPRouteDumpClient) Recv() (*IPRouteDetails, error) {
 	case *IPRouteDetails:
 		return m, nil
 	case *vpe.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)
@@ -549,6 +581,10 @@ func (c *serviceClient_IPRouteV2DumpClient) Recv() (*IPRouteV2Details, error) {
 	case *IPRouteV2Details:
 		return m, nil
 	case *vpe.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)
@@ -615,6 +651,10 @@ func (c *serviceClient_IPTableDumpClient) Recv() (*IPTableDetails, error) {
 	case *IPTableDetails:
 		return m, nil
 	case *vpe.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)
@@ -681,6 +721,10 @@ func (c *serviceClient_IPUnnumberedDumpClient) Recv() (*IPUnnumberedDetails, err
 	case *IPUnnumberedDetails:
 		return m, nil
 	case *vpe.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)
@@ -720,6 +764,10 @@ func (c *serviceClient_MfibSignalDumpClient) Recv() (*MfibSignalDetails, error)
 	case *MfibSignalDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/ip6_nd/ip6_nd.ba.go b/binapi/ip6_nd/ip6_nd.ba.go
index 0f1f660..3f0a77d 100644
--- a/binapi/ip6_nd/ip6_nd.ba.go
+++ b/binapi/ip6_nd/ip6_nd.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/ip6_nd.api.json
 
diff --git a/binapi/ip6_nd/ip6_nd_rpc.ba.go b/binapi/ip6_nd/ip6_nd_rpc.ba.go
index 24e345f..983f8b6 100644
--- a/binapi/ip6_nd/ip6_nd_rpc.ba.go
+++ b/binapi/ip6_nd/ip6_nd_rpc.ba.go
@@ -71,6 +71,10 @@ func (c *serviceClient_IP6ndProxyDumpClient) Recv() (*IP6ndProxyDetails, error)
 	case *IP6ndProxyDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/ip_neighbor/ip_neighbor.ba.go b/binapi/ip_neighbor/ip_neighbor.ba.go
index b06cb7e..ae3e319 100644
--- a/binapi/ip_neighbor/ip_neighbor.ba.go
+++ b/binapi/ip_neighbor/ip_neighbor.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/ip_neighbor.api.json
 
diff --git a/binapi/ip_neighbor/ip_neighbor_rpc.ba.go b/binapi/ip_neighbor/ip_neighbor_rpc.ba.go
index 2ecde5e..727c12f 100644
--- a/binapi/ip_neighbor/ip_neighbor_rpc.ba.go
+++ b/binapi/ip_neighbor/ip_neighbor_rpc.ba.go
@@ -82,6 +82,10 @@ func (c *serviceClient_IPNeighborDumpClient) Recv() (*IPNeighborDetails, error)
 	case *IPNeighborDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/ip_types/ip_types.ba.go b/binapi/ip_types/ip_types.ba.go
index d03b0db..bebbd57 100644
--- a/binapi/ip_types/ip_types.ba.go
+++ b/binapi/ip_types/ip_types.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/ip_types.api.json
 
diff --git a/binapi/ipfix_export/ipfix_export.ba.go b/binapi/ipfix_export/ipfix_export.ba.go
index 19a818d..8c08ff3 100644
--- a/binapi/ipfix_export/ipfix_export.ba.go
+++ b/binapi/ipfix_export/ipfix_export.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/ipfix_export.api.json
 
diff --git a/binapi/ipfix_export/ipfix_export_rpc.ba.go b/binapi/ipfix_export/ipfix_export_rpc.ba.go
index d577393..bd4fc13 100644
--- a/binapi/ipfix_export/ipfix_export_rpc.ba.go
+++ b/binapi/ipfix_export/ipfix_export_rpc.ba.go
@@ -63,6 +63,10 @@ func (c *serviceClient_IpfixClassifyStreamDumpClient) Recv() (*IpfixClassifyStre
 	case *IpfixClassifyStreamDetails:
 		return m, nil
 	case *vpe.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)
@@ -111,6 +115,10 @@ func (c *serviceClient_IpfixClassifyTableDumpClient) Recv() (*IpfixClassifyTable
 	case *IpfixClassifyTableDetails:
 		return m, nil
 	case *vpe.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)
@@ -150,6 +158,10 @@ func (c *serviceClient_IpfixExporterDumpClient) Recv() (*IpfixExporterDetails, e
 	case *IpfixExporterDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/ipip/ipip.ba.go b/binapi/ipip/ipip.ba.go
index 3b54e95..fda9a87 100644
--- a/binapi/ipip/ipip.ba.go
+++ b/binapi/ipip/ipip.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/ipip.api.json
 
diff --git a/binapi/ipip/ipip_rpc.ba.go b/binapi/ipip/ipip_rpc.ba.go
index 37b8821..318b4c5 100644
--- a/binapi/ipip/ipip_rpc.ba.go
+++ b/binapi/ipip/ipip_rpc.ba.go
@@ -97,6 +97,10 @@ func (c *serviceClient_IpipTunnelDumpClient) Recv() (*IpipTunnelDetails, error)
 	case *IpipTunnelDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/ipsec/ipsec.ba.go b/binapi/ipsec/ipsec.ba.go
index 6479df4..45f49b0 100644
--- a/binapi/ipsec/ipsec.ba.go
+++ b/binapi/ipsec/ipsec.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/ipsec.api.json
 
diff --git a/binapi/ipsec/ipsec_rpc.ba.go b/binapi/ipsec/ipsec_rpc.ba.go
index 2779873..faecda6 100644
--- a/binapi/ipsec/ipsec_rpc.ba.go
+++ b/binapi/ipsec/ipsec_rpc.ba.go
@@ -77,6 +77,10 @@ func (c *serviceClient_IpsecBackendDumpClient) Recv() (*IpsecBackendDetails, err
 	case *IpsecBackendDetails:
 		return m, nil
 	case *vpe.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)
@@ -143,6 +147,10 @@ func (c *serviceClient_IpsecItfDumpClient) Recv() (*IpsecItfDetails, error) {
 	case *IpsecItfDetails:
 		return m, nil
 	case *vpe.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)
@@ -182,6 +190,10 @@ func (c *serviceClient_IpsecSaDumpClient) Recv() (*IpsecSaDetails, error) {
 	case *IpsecSaDetails:
 		return m, nil
 	case *vpe.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)
@@ -221,6 +233,10 @@ func (c *serviceClient_IpsecSaV2DumpClient) Recv() (*IpsecSaV2Details, error) {
 	case *IpsecSaV2Details:
 		return m, nil
 	case *vpe.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)
@@ -260,6 +276,10 @@ func (c *serviceClient_IpsecSaV3DumpClient) Recv() (*IpsecSaV3Details, error) {
 	case *IpsecSaV3Details:
 		return m, nil
 	case *vpe.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)
@@ -353,6 +373,10 @@ func (c *serviceClient_IpsecSpdDumpClient) Recv() (*IpsecSpdDetails, error) {
 	case *IpsecSpdDetails:
 		return m, nil
 	case *vpe.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)
@@ -401,6 +425,10 @@ func (c *serviceClient_IpsecSpdInterfaceDumpClient) Recv() (*IpsecSpdInterfaceDe
 	case *IpsecSpdInterfaceDetails:
 		return m, nil
 	case *vpe.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)
@@ -440,6 +468,10 @@ func (c *serviceClient_IpsecSpdsDumpClient) Recv() (*IpsecSpdsDetails, error) {
 	case *IpsecSpdsDetails:
 		return m, nil
 	case *vpe.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)
@@ -488,6 +520,10 @@ func (c *serviceClient_IpsecTunnelProtectDumpClient) Recv() (*IpsecTunnelProtect
 	case *IpsecTunnelProtectDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/ipsec_types/ipsec_types.ba.go b/binapi/ipsec_types/ipsec_types.ba.go
index 5dd5e1d..69ad685 100644
--- a/binapi/ipsec_types/ipsec_types.ba.go
+++ b/binapi/ipsec_types/ipsec_types.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/ipsec_types.api.json
 
diff --git a/binapi/l2/l2.ba.go b/binapi/l2/l2.ba.go
index 0977911..3edaede 100644
--- a/binapi/l2/l2.ba.go
+++ b/binapi/l2/l2.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/l2.api.json
 
diff --git a/binapi/l2/l2_rpc.ba.go b/binapi/l2/l2_rpc.ba.go
index fa2b72b..588abdd 100644
--- a/binapi/l2/l2_rpc.ba.go
+++ b/binapi/l2/l2_rpc.ba.go
@@ -95,6 +95,10 @@ func (c *serviceClient_BdIPMacDumpClient) Recv() (*BdIPMacDetails, error) {
 	case *BdIPMacDetails:
 		return m, nil
 	case *vpe.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)
@@ -152,6 +156,10 @@ func (c *serviceClient_BridgeDomainDumpClient) Recv() (*BridgeDomainDetails, err
 	case *BridgeDomainDetails:
 		return m, nil
 	case *vpe.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)
@@ -254,6 +262,10 @@ func (c *serviceClient_L2FibTableDumpClient) Recv() (*L2FibTableDetails, error)
 	case *L2FibTableDetails:
 		return m, nil
 	case *vpe.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)
@@ -338,6 +350,10 @@ func (c *serviceClient_L2XconnectDumpClient) Recv() (*L2XconnectDetails, error)
 	case *L2XconnectDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/l2e/l2e.ba.go b/binapi/l2e/l2e.ba.go
index b676d69..19fd9c0 100644
--- a/binapi/l2e/l2e.ba.go
+++ b/binapi/l2e/l2e.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/l2e.api.json
 
diff --git a/binapi/l2tp/l2tp.ba.go b/binapi/l2tp/l2tp.ba.go
index 6eb3508..86c74c0 100644
--- a/binapi/l2tp/l2tp.ba.go
+++ b/binapi/l2tp/l2tp.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/l2tp.api.json
 
diff --git a/binapi/l2tp/l2tp_rpc.ba.go b/binapi/l2tp/l2tp_rpc.ba.go
index e82ae3d..0ba01f2 100644
--- a/binapi/l2tp/l2tp_rpc.ba.go
+++ b/binapi/l2tp/l2tp_rpc.ba.go
@@ -97,6 +97,10 @@ func (c *serviceClient_SwIfL2tpv3TunnelDumpClient) Recv() (*SwIfL2tpv3TunnelDeta
 	case *SwIfL2tpv3TunnelDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/l3xc/l3xc.ba.go b/binapi/l3xc/l3xc.ba.go
index c2eedf9..8833aca 100644
--- a/binapi/l3xc/l3xc.ba.go
+++ b/binapi/l3xc/l3xc.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/l3xc.api.json
 
diff --git a/binapi/l3xc/l3xc_rpc.ba.go b/binapi/l3xc/l3xc_rpc.ba.go
index d463513..06176cb 100644
--- a/binapi/l3xc/l3xc_rpc.ba.go
+++ b/binapi/l3xc/l3xc_rpc.ba.go
@@ -69,6 +69,10 @@ func (c *serviceClient_L3xcDumpClient) Recv() (*L3xcDetails, error) {
 	case *L3xcDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/lacp/lacp.ba.go b/binapi/lacp/lacp.ba.go
index 050bc30..80ffa13 100644
--- a/binapi/lacp/lacp.ba.go
+++ b/binapi/lacp/lacp.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/lacp.api.json
 
diff --git a/binapi/lacp/lacp_rpc.ba.go b/binapi/lacp/lacp_rpc.ba.go
index 8a288f2..cce2bd6 100644
--- a/binapi/lacp/lacp_rpc.ba.go
+++ b/binapi/lacp/lacp_rpc.ba.go
@@ -57,6 +57,10 @@ func (c *serviceClient_SwInterfaceLacpDumpClient) Recv() (*SwInterfaceLacpDetail
 	case *SwInterfaceLacpDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/lb/lb.ba.go b/binapi/lb/lb.ba.go
index e93f032..7820241 100644
--- a/binapi/lb/lb.ba.go
+++ b/binapi/lb/lb.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/lb.api.json
 
diff --git a/binapi/lb/lb_rpc.ba.go b/binapi/lb/lb_rpc.ba.go
index fe0dd7b..a6034e9 100644
--- a/binapi/lb/lb_rpc.ba.go
+++ b/binapi/lb/lb_rpc.ba.go
@@ -100,6 +100,10 @@ func (c *serviceClient_LbAsDumpClient) Recv() (*LbAsDetails, error) {
 	case *LbAsDetails:
 		return m, nil
 	case *vpe.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)
@@ -157,6 +161,10 @@ func (c *serviceClient_LbVipDumpClient) Recv() (*LbVipDetails, error) {
 	case *LbVipDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/lb_types/lb_types.ba.go b/binapi/lb_types/lb_types.ba.go
index 6ec8134..5a3e6b0 100644
--- a/binapi/lb_types/lb_types.ba.go
+++ b/binapi/lb_types/lb_types.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/lb_types.api.json
 
diff --git a/binapi/lcp/lcp.ba.go b/binapi/lcp/lcp.ba.go
index 063c0d4..783b45a 100644
--- a/binapi/lcp/lcp.ba.go
+++ b/binapi/lcp/lcp.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/lcp.api.json
 
diff --git a/binapi/lcp/lcp_rpc.ba.go b/binapi/lcp/lcp_rpc.ba.go
index 8faa2e8..4015410 100644
--- a/binapi/lcp/lcp_rpc.ba.go
+++ b/binapi/lcp/lcp_rpc.ba.go
@@ -95,6 +95,10 @@ func (c *serviceClient_LcpItfPairGetClient) Recv() (*LcpItfPairDetails, error) {
 	case *LcpItfPairDetails:
 		return m, nil
 	case *LcpItfPairGetReply:
+		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)
diff --git a/binapi/lisp/lisp.ba.go b/binapi/lisp/lisp.ba.go
index 184f683..5a16ee0 100644
--- a/binapi/lisp/lisp.ba.go
+++ b/binapi/lisp/lisp.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/lisp.api.json
 
diff --git a/binapi/lisp/lisp_rpc.ba.go b/binapi/lisp/lisp_rpc.ba.go
index 511de34..a675dc7 100644
--- a/binapi/lisp/lisp_rpc.ba.go
+++ b/binapi/lisp/lisp_rpc.ba.go
@@ -176,6 +176,10 @@ func (c *serviceClient_LispEidTableDumpClient) Recv() (*LispEidTableDetails, err
 	case *LispEidTableDetails:
 		return m, nil
 	case *vpe.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)
@@ -215,6 +219,10 @@ func (c *serviceClient_LispEidTableMapDumpClient) Recv() (*LispEidTableMapDetail
 	case *LispEidTableMapDetails:
 		return m, nil
 	case *vpe.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)
@@ -254,6 +262,10 @@ func (c *serviceClient_LispEidTableVniDumpClient) Recv() (*LispEidTableVniDetail
 	case *LispEidTableVniDetails:
 		return m, nil
 	case *vpe.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)
@@ -311,6 +323,10 @@ func (c *serviceClient_LispLocatorDumpClient) Recv() (*LispLocatorDetails, error
 	case *LispLocatorDetails:
 		return m, nil
 	case *vpe.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)
@@ -350,6 +366,10 @@ func (c *serviceClient_LispLocatorSetDumpClient) Recv() (*LispLocatorSetDetails,
 	case *LispLocatorSetDetails:
 		return m, nil
 	case *vpe.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)
@@ -407,6 +427,10 @@ func (c *serviceClient_LispMapResolverDumpClient) Recv() (*LispMapResolverDetail
 	case *LispMapResolverDetails:
 		return m, nil
 	case *vpe.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)
@@ -446,6 +470,10 @@ func (c *serviceClient_LispMapServerDumpClient) Recv() (*LispMapServerDetails, e
 	case *LispMapServerDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/lisp_gpe/lisp_gpe.ba.go b/binapi/lisp_gpe/lisp_gpe.ba.go
index 9379fbf..16127e7 100644
--- a/binapi/lisp_gpe/lisp_gpe.ba.go
+++ b/binapi/lisp_gpe/lisp_gpe.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/lisp_gpe.api.json
 
diff --git a/binapi/lisp_gpe/lisp_gpe_rpc.ba.go b/binapi/lisp_gpe/lisp_gpe_rpc.ba.go
index 872c8cd..3279fc4 100644
--- a/binapi/lisp_gpe/lisp_gpe_rpc.ba.go
+++ b/binapi/lisp_gpe/lisp_gpe_rpc.ba.go
@@ -111,6 +111,10 @@ func (c *serviceClient_GpeFwdEntryPathDumpClient) Recv() (*GpeFwdEntryPathDetail
 	case *GpeFwdEntryPathDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/lisp_types/lisp_types.ba.go b/binapi/lisp_types/lisp_types.ba.go
index b6a1b97..6c9f14d 100644
--- a/binapi/lisp_types/lisp_types.ba.go
+++ b/binapi/lisp_types/lisp_types.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/lisp_types.api.json
 
diff --git a/binapi/lldp/lldp.ba.go b/binapi/lldp/lldp.ba.go
index 0d210fc..25dabb6 100644
--- a/binapi/lldp/lldp.ba.go
+++ b/binapi/lldp/lldp.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/lldp.api.json
 
diff --git a/binapi/mactime/mactime.ba.go b/binapi/mactime/mactime.ba.go
index cc3c06c..5cc1c63 100644
--- a/binapi/mactime/mactime.ba.go
+++ b/binapi/mactime/mactime.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/mactime.api.json
 
diff --git a/binapi/mactime/mactime_rpc.ba.go b/binapi/mactime/mactime_rpc.ba.go
index ddde52b..42efc05 100644
--- a/binapi/mactime/mactime_rpc.ba.go
+++ b/binapi/mactime/mactime_rpc.ba.go
@@ -68,6 +68,10 @@ func (c *serviceClient_MactimeDumpClient) Recv() (*MactimeDetails, error) {
 	case *MactimeDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/map/map.ba.go b/binapi/map/map.ba.go
index 7457841..0fd122e 100644
--- a/binapi/map/map.ba.go
+++ b/binapi/map/map.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/map.api.json
 
diff --git a/binapi/map/map_rpc.ba.go b/binapi/map/map_rpc.ba.go
index 06bb1d8..8fcb99b 100644
--- a/binapi/map/map_rpc.ba.go
+++ b/binapi/map/map_rpc.ba.go
@@ -99,6 +99,10 @@ func (c *serviceClient_MapDomainDumpClient) Recv() (*MapDomainDetails, error) {
 	case *MapDomainDetails:
 		return m, nil
 	case *vpe.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)
@@ -135,6 +139,10 @@ func (c *serviceClient_MapDomainsGetClient) Recv() (*MapDomainDetails, error) {
 	case *MapDomainDetails:
 		return m, nil
 	case *MapDomainsGetReply:
+		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)
@@ -255,6 +263,10 @@ func (c *serviceClient_MapRuleDumpClient) Recv() (*MapRuleDetails, error) {
 	case *MapRuleDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/mdata/mdata.ba.go b/binapi/mdata/mdata.ba.go
index 946c2d0..75d1e3b 100644
--- a/binapi/mdata/mdata.ba.go
+++ b/binapi/mdata/mdata.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/mdata.api.json
 
diff --git a/binapi/memclnt/memclnt.ba.go b/binapi/memclnt/memclnt.ba.go
index 1f2fc75..64e7021 100644
--- a/binapi/memclnt/memclnt.ba.go
+++ b/binapi/memclnt/memclnt.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/memclnt.api.json
 
diff --git a/binapi/memclnt/memclnt_rpc.ba.go b/binapi/memclnt/memclnt_rpc.ba.go
index ef4a1a4..03d32ef 100644
--- a/binapi/memclnt/memclnt_rpc.ba.go
+++ b/binapi/memclnt/memclnt_rpc.ba.go
@@ -87,6 +87,10 @@ func (c *serviceClient) MemclntReadTimeout(ctx context.Context, in *MemclntReadT
 	if err != nil {
 		return err
 	}
+	err = stream.Close()
+	if err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -99,6 +103,10 @@ func (c *serviceClient) MemclntRxThreadSuspend(ctx context.Context, in *MemclntR
 	if err != nil {
 		return err
 	}
+	err = stream.Close()
+	if err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -120,6 +128,10 @@ func (c *serviceClient) RxThreadExit(ctx context.Context, in *RxThreadExit) erro
 	if err != nil {
 		return err
 	}
+	err = stream.Close()
+	if err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -159,5 +171,9 @@ func (c *serviceClient) TracePluginMsgIds(ctx context.Context, in *TracePluginMs
 	if err != nil {
 		return err
 	}
+	err = stream.Close()
+	if err != nil {
+		return err
+	}
 	return nil
 }
diff --git a/binapi/memif/memif.ba.go b/binapi/memif/memif.ba.go
index dedc6c6..7eb741d 100644
--- a/binapi/memif/memif.ba.go
+++ b/binapi/memif/memif.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/memif.api.json
 
diff --git a/binapi/memif/memif_rpc.ba.go b/binapi/memif/memif_rpc.ba.go
index bc1c0e4..c4cd3b1 100644
--- a/binapi/memif/memif_rpc.ba.go
+++ b/binapi/memif/memif_rpc.ba.go
@@ -79,6 +79,10 @@ func (c *serviceClient_MemifDumpClient) Recv() (*MemifDetails, error) {
 	case *MemifDetails:
 		return m, nil
 	case *vpe.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)
@@ -127,6 +131,10 @@ func (c *serviceClient_MemifSocketFilenameDumpClient) Recv() (*MemifSocketFilena
 	case *MemifSocketFilenameDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/mfib_types/mfib_types.ba.go b/binapi/mfib_types/mfib_types.ba.go
index 6928592..2fbf87e 100644
--- a/binapi/mfib_types/mfib_types.ba.go
+++ b/binapi/mfib_types/mfib_types.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/mfib_types.api.json
 
diff --git a/binapi/mpls/mpls.ba.go b/binapi/mpls/mpls.ba.go
index 5f88146..3a2344d 100644
--- a/binapi/mpls/mpls.ba.go
+++ b/binapi/mpls/mpls.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/mpls.api.json
 
diff --git a/binapi/mpls/mpls_rpc.ba.go b/binapi/mpls/mpls_rpc.ba.go
index bfd6559..ebde142 100644
--- a/binapi/mpls/mpls_rpc.ba.go
+++ b/binapi/mpls/mpls_rpc.ba.go
@@ -82,6 +82,10 @@ func (c *serviceClient_MplsRouteDumpClient) Recv() (*MplsRouteDetails, error) {
 	case *MplsRouteDetails:
 		return m, nil
 	case *vpe.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)
@@ -130,6 +134,10 @@ func (c *serviceClient_MplsTableDumpClient) Recv() (*MplsTableDetails, error) {
 	case *MplsTableDetails:
 		return m, nil
 	case *vpe.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)
@@ -178,6 +186,10 @@ func (c *serviceClient_MplsTunnelDumpClient) Recv() (*MplsTunnelDetails, error)
 	case *MplsTunnelDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/mss_clamp/mss_clamp.ba.go b/binapi/mss_clamp/mss_clamp.ba.go
index b44cc09..95aa9e7 100644
--- a/binapi/mss_clamp/mss_clamp.ba.go
+++ b/binapi/mss_clamp/mss_clamp.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/mss_clamp.api.json
 
diff --git a/binapi/mss_clamp/mss_clamp_rpc.ba.go b/binapi/mss_clamp/mss_clamp_rpc.ba.go
index 7353d86..5ec6a24 100644
--- a/binapi/mss_clamp/mss_clamp_rpc.ba.go
+++ b/binapi/mss_clamp/mss_clamp_rpc.ba.go
@@ -63,6 +63,10 @@ func (c *serviceClient_MssClampGetClient) Recv() (*MssClampDetails, error) {
 	case *MssClampDetails:
 		return m, nil
 	case *MssClampGetReply:
+		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)
diff --git a/binapi/nat44_ed/nat44_ed.ba.go b/binapi/nat44_ed/nat44_ed.ba.go
index 7e22eeb..1bcc9fa 100644
--- a/binapi/nat44_ed/nat44_ed.ba.go
+++ b/binapi/nat44_ed/nat44_ed.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/nat44_ed.api.json
 
diff --git a/binapi/nat44_ed/nat44_ed_rpc.ba.go b/binapi/nat44_ed/nat44_ed_rpc.ba.go
index 6560a27..0df7b2c 100644
--- a/binapi/nat44_ed/nat44_ed_rpc.ba.go
+++ b/binapi/nat44_ed/nat44_ed_rpc.ba.go
@@ -158,6 +158,10 @@ func (c *serviceClient_Nat44AddressDumpClient) Recv() (*Nat44AddressDetails, err
 	case *Nat44AddressDetails:
 		return m, nil
 	case *vpe.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)
@@ -260,6 +264,10 @@ func (c *serviceClient_Nat44IdentityMappingDumpClient) Recv() (*Nat44IdentityMap
 	case *Nat44IdentityMappingDetails:
 		return m, nil
 	case *vpe.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)
@@ -317,6 +325,10 @@ func (c *serviceClient_Nat44InterfaceAddrDumpClient) Recv() (*Nat44InterfaceAddr
 	case *Nat44InterfaceAddrDetails:
 		return m, nil
 	case *vpe.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)
@@ -356,6 +368,10 @@ func (c *serviceClient_Nat44InterfaceDumpClient) Recv() (*Nat44InterfaceDetails,
 	case *Nat44InterfaceDetails:
 		return m, nil
 	case *vpe.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)
@@ -395,6 +411,10 @@ func (c *serviceClient_Nat44InterfaceOutputFeatureDumpClient) Recv() (*Nat44Inte
 	case *Nat44InterfaceOutputFeatureDetails:
 		return m, nil
 	case *vpe.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)
@@ -443,6 +463,10 @@ func (c *serviceClient_Nat44LbStaticMappingDumpClient) Recv() (*Nat44LbStaticMap
 	case *Nat44LbStaticMappingDetails:
 		return m, nil
 	case *vpe.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)
@@ -518,6 +542,10 @@ func (c *serviceClient_Nat44StaticMappingDumpClient) Recv() (*Nat44StaticMapping
 	case *Nat44StaticMappingDetails:
 		return m, nil
 	case *vpe.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)
@@ -557,6 +585,10 @@ func (c *serviceClient_Nat44UserDumpClient) Recv() (*Nat44UserDetails, error) {
 	case *Nat44UserDetails:
 		return m, nil
 	case *vpe.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)
@@ -596,6 +628,10 @@ func (c *serviceClient_Nat44UserSessionDumpClient) Recv() (*Nat44UserSessionDeta
 	case *Nat44UserSessionDetails:
 		return m, nil
 	case *vpe.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)
@@ -797,6 +833,10 @@ func (c *serviceClient_NatWorkerDumpClient) Recv() (*NatWorkerDetails, error) {
 	case *NatWorkerDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/nat44_ei/nat44_ei.ba.go b/binapi/nat44_ei/nat44_ei.ba.go
index d1faa82..8140424 100644
--- a/binapi/nat44_ei/nat44_ei.ba.go
+++ b/binapi/nat44_ei/nat44_ei.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/nat44_ei.api.json
 
diff --git a/binapi/nat44_ei/nat44_ei_rpc.ba.go b/binapi/nat44_ei/nat44_ei_rpc.ba.go
index d225dab..a20c60f 100644
--- a/binapi/nat44_ei/nat44_ei_rpc.ba.go
+++ b/binapi/nat44_ei/nat44_ei_rpc.ba.go
@@ -128,6 +128,10 @@ func (c *serviceClient_Nat44EiAddressDumpClient) Recv() (*Nat44EiAddressDetails,
 	case *Nat44EiAddressDetails:
 		return m, nil
 	case *vpe.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)
@@ -266,6 +270,10 @@ func (c *serviceClient_Nat44EiIdentityMappingDumpClient) Recv() (*Nat44EiIdentit
 	case *Nat44EiIdentityMappingDetails:
 		return m, nil
 	case *vpe.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)
@@ -323,6 +331,10 @@ func (c *serviceClient_Nat44EiInterfaceAddrDumpClient) Recv() (*Nat44EiInterface
 	case *Nat44EiInterfaceAddrDetails:
 		return m, nil
 	case *vpe.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)
@@ -362,6 +374,10 @@ func (c *serviceClient_Nat44EiInterfaceDumpClient) Recv() (*Nat44EiInterfaceDeta
 	case *Nat44EiInterfaceDetails:
 		return m, nil
 	case *vpe.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)
@@ -401,6 +417,10 @@ func (c *serviceClient_Nat44EiInterfaceOutputFeatureDumpClient) Recv() (*Nat44Ei
 	case *Nat44EiInterfaceOutputFeatureDetails:
 		return m, nil
 	case *vpe.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)
@@ -530,6 +550,10 @@ func (c *serviceClient_Nat44EiStaticMappingDumpClient) Recv() (*Nat44EiStaticMap
 	case *Nat44EiStaticMappingDetails:
 		return m, nil
 	case *vpe.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)
@@ -569,6 +593,10 @@ func (c *serviceClient_Nat44EiUserDumpClient) Recv() (*Nat44EiUserDetails, error
 	case *Nat44EiUserDetails:
 		return m, nil
 	case *vpe.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)
@@ -608,6 +636,10 @@ func (c *serviceClient_Nat44EiUserSessionDumpClient) Recv() (*Nat44EiUserSession
 	case *Nat44EiUserSessionDetails:
 		return m, nil
 	case *vpe.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)
@@ -647,6 +679,10 @@ func (c *serviceClient_Nat44EiWorkerDumpClient) Recv() (*Nat44EiWorkerDetails, e
 	case *Nat44EiWorkerDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/nat64/nat64.ba.go b/binapi/nat64/nat64.ba.go
index c7c813b..766cb0c 100644
--- a/binapi/nat64/nat64.ba.go
+++ b/binapi/nat64/nat64.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/nat64.api.json
 
diff --git a/binapi/nat64/nat64_rpc.ba.go b/binapi/nat64/nat64_rpc.ba.go
index e103890..baa2ec9 100644
--- a/binapi/nat64/nat64_rpc.ba.go
+++ b/binapi/nat64/nat64_rpc.ba.go
@@ -114,6 +114,10 @@ func (c *serviceClient_Nat64BibDumpClient) Recv() (*Nat64BibDetails, error) {
 	case *Nat64BibDetails:
 		return m, nil
 	case *vpe.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)
@@ -162,6 +166,10 @@ func (c *serviceClient_Nat64InterfaceDumpClient) Recv() (*Nat64InterfaceDetails,
 	case *Nat64InterfaceDetails:
 		return m, nil
 	case *vpe.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)
@@ -210,6 +218,10 @@ func (c *serviceClient_Nat64PoolAddrDumpClient) Recv() (*Nat64PoolAddrDetails, e
 	case *Nat64PoolAddrDetails:
 		return m, nil
 	case *vpe.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)
@@ -249,6 +261,10 @@ func (c *serviceClient_Nat64PrefixDumpClient) Recv() (*Nat64PrefixDetails, error
 	case *Nat64PrefixDetails:
 		return m, nil
 	case *vpe.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)
@@ -297,6 +313,10 @@ func (c *serviceClient_Nat64StDumpClient) Recv() (*Nat64StDetails, error) {
 	case *Nat64StDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/nat66/nat66.ba.go b/binapi/nat66/nat66.ba.go
index fd5e5e7..7b9cf36 100644
--- a/binapi/nat66/nat66.ba.go
+++ b/binapi/nat66/nat66.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/nat66.api.json
 
diff --git a/binapi/nat66/nat66_rpc.ba.go b/binapi/nat66/nat66_rpc.ba.go
index 5d4f938..76675df 100644
--- a/binapi/nat66/nat66_rpc.ba.go
+++ b/binapi/nat66/nat66_rpc.ba.go
@@ -79,6 +79,10 @@ func (c *serviceClient_Nat66InterfaceDumpClient) Recv() (*Nat66InterfaceDetails,
 	case *Nat66InterfaceDetails:
 		return m, nil
 	case *vpe.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)
@@ -127,6 +131,10 @@ func (c *serviceClient_Nat66StaticMappingDumpClient) Recv() (*Nat66StaticMapping
 	case *Nat66StaticMappingDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/nat_types/nat_types.ba.go b/binapi/nat_types/nat_types.ba.go
index 324e8fc..e78f290 100644
--- a/binapi/nat_types/nat_types.ba.go
+++ b/binapi/nat_types/nat_types.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/nat_types.api.json
 
diff --git a/binapi/nsh/nsh.ba.go b/binapi/nsh/nsh.ba.go
index 539ac69..9e9549d 100644
--- a/binapi/nsh/nsh.ba.go
+++ b/binapi/nsh/nsh.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/nsh.api.json
 
diff --git a/binapi/nsh/nsh_rpc.ba.go b/binapi/nsh/nsh_rpc.ba.go
index db79b4f..d7dd6aa 100644
--- a/binapi/nsh/nsh_rpc.ba.go
+++ b/binapi/nsh/nsh_rpc.ba.go
@@ -78,6 +78,10 @@ func (c *serviceClient_NshEntryDumpClient) Recv() (*NshEntryDetails, error) {
 	case *NshEntryDetails:
 		return m, nil
 	case *vpe.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)
@@ -117,6 +121,10 @@ func (c *serviceClient_NshMapDumpClient) Recv() (*NshMapDetails, error) {
 	case *NshMapDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/nsim/nsim.ba.go b/binapi/nsim/nsim.ba.go
index 5a193a3..4a6fa39 100644
--- a/binapi/nsim/nsim.ba.go
+++ b/binapi/nsim/nsim.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/nsim.api.json
 
diff --git a/binapi/oddbuf/oddbuf.ba.go b/binapi/oddbuf/oddbuf.ba.go
index 64150f5..cab5b78 100644
--- a/binapi/oddbuf/oddbuf.ba.go
+++ b/binapi/oddbuf/oddbuf.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/oddbuf.api.json
 
diff --git a/binapi/one/one.ba.go b/binapi/one/one.ba.go
index 05557c4..8e786a6 100644
--- a/binapi/one/one.ba.go
+++ b/binapi/one/one.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/one.api.json
 
diff --git a/binapi/one/one_rpc.ba.go b/binapi/one/one_rpc.ba.go
index 2ef9c5e..9d9ac2f 100644
--- a/binapi/one/one_rpc.ba.go
+++ b/binapi/one/one_rpc.ba.go
@@ -218,6 +218,10 @@ func (c *serviceClient_OneEidTableDumpClient) Recv() (*OneEidTableDetails, error
 	case *OneEidTableDetails:
 		return m, nil
 	case *vpe.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)
@@ -257,6 +261,10 @@ func (c *serviceClient_OneEidTableMapDumpClient) Recv() (*OneEidTableMapDetails,
 	case *OneEidTableMapDetails:
 		return m, nil
 	case *vpe.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)
@@ -296,6 +304,10 @@ func (c *serviceClient_OneEidTableVniDumpClient) Recv() (*OneEidTableVniDetails,
 	case *OneEidTableVniDetails:
 		return m, nil
 	case *vpe.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)
@@ -407,6 +419,10 @@ func (c *serviceClient_OneLocatorDumpClient) Recv() (*OneLocatorDetails, error)
 	case *OneLocatorDetails:
 		return m, nil
 	case *vpe.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)
@@ -446,6 +462,10 @@ func (c *serviceClient_OneLocatorSetDumpClient) Recv() (*OneLocatorSetDetails, e
 	case *OneLocatorSetDetails:
 		return m, nil
 	case *vpe.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)
@@ -521,6 +541,10 @@ func (c *serviceClient_OneMapResolverDumpClient) Recv() (*OneMapResolverDetails,
 	case *OneMapResolverDetails:
 		return m, nil
 	case *vpe.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)
@@ -560,6 +584,10 @@ func (c *serviceClient_OneMapServerDumpClient) Recv() (*OneMapServerDetails, err
 	case *OneMapServerDetails:
 		return m, nil
 	case *vpe.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)
@@ -680,6 +708,10 @@ func (c *serviceClient_OneStatsDumpClient) Recv() (*OneStatsDetails, error) {
 	case *OneStatsDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/p2p_ethernet/p2p_ethernet.ba.go b/binapi/p2p_ethernet/p2p_ethernet.ba.go
index 88c2ab5..6a6efed 100644
--- a/binapi/p2p_ethernet/p2p_ethernet.ba.go
+++ b/binapi/p2p_ethernet/p2p_ethernet.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/p2p_ethernet.api.json
 
diff --git a/binapi/pci_types/pci_types.ba.go b/binapi/pci_types/pci_types.ba.go
index 3096037..3a72bac 100644
--- a/binapi/pci_types/pci_types.ba.go
+++ b/binapi/pci_types/pci_types.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/pci_types.api.json
 
diff --git a/binapi/pg/pg.ba.go b/binapi/pg/pg.ba.go
index ea8c094..ae18acb 100644
--- a/binapi/pg/pg.ba.go
+++ b/binapi/pg/pg.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/pg.api.json
 
diff --git a/binapi/pipe/pipe.ba.go b/binapi/pipe/pipe.ba.go
index ffba695..e20a04d 100644
--- a/binapi/pipe/pipe.ba.go
+++ b/binapi/pipe/pipe.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/pipe.api.json
 
diff --git a/binapi/pipe/pipe_rpc.ba.go b/binapi/pipe/pipe_rpc.ba.go
index 34fbf54..29db1a0 100644
--- a/binapi/pipe/pipe_rpc.ba.go
+++ b/binapi/pipe/pipe_rpc.ba.go
@@ -77,6 +77,10 @@ func (c *serviceClient_PipeDumpClient) Recv() (*PipeDetails, error) {
 	case *PipeDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/pnat/pnat.ba.go b/binapi/pnat/pnat.ba.go
index 47163a0..07a4c21 100644
--- a/binapi/pnat/pnat.ba.go
+++ b/binapi/pnat/pnat.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/pnat.api.json
 
diff --git a/binapi/pnat/pnat_rpc.ba.go b/binapi/pnat/pnat_rpc.ba.go
index 036861a..958bc50 100644
--- a/binapi/pnat/pnat_rpc.ba.go
+++ b/binapi/pnat/pnat_rpc.ba.go
@@ -94,6 +94,10 @@ func (c *serviceClient_PnatBindingsGetClient) Recv() (*PnatBindingsDetails, erro
 	case *PnatBindingsDetails:
 		return m, nil
 	case *PnatBindingsGetReply:
+		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)
@@ -130,6 +134,10 @@ func (c *serviceClient_PnatInterfacesGetClient) Recv() (*PnatInterfacesDetails,
 	case *PnatInterfacesDetails:
 		return m, nil
 	case *PnatInterfacesGetReply:
+		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)
diff --git a/binapi/policer/policer.ba.go b/binapi/policer/policer.ba.go
index afab15b..31ef6e8 100644
--- a/binapi/policer/policer.ba.go
+++ b/binapi/policer/policer.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/policer.api.json
 
diff --git a/binapi/policer/policer_rpc.ba.go b/binapi/policer/policer_rpc.ba.go
index 7ae3a0e..f5e0f89 100644
--- a/binapi/policer/policer_rpc.ba.go
+++ b/binapi/policer/policer_rpc.ba.go
@@ -78,6 +78,10 @@ func (c *serviceClient_PolicerDumpClient) Recv() (*PolicerDetails, error) {
 	case *PolicerDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/policer_types/policer_types.ba.go b/binapi/policer_types/policer_types.ba.go
index 48e33d8..e7e3f42 100644
--- a/binapi/policer_types/policer_types.ba.go
+++ b/binapi/policer_types/policer_types.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/policer_types.api.json
 
diff --git a/binapi/pot/pot.ba.go b/binapi/pot/pot.ba.go
index fe937ba..fc3bbd6 100644
--- a/binapi/pot/pot.ba.go
+++ b/binapi/pot/pot.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/pot.api.json
 
diff --git a/binapi/pot/pot_rpc.ba.go b/binapi/pot/pot_rpc.ba.go
index ea975fd..a468870 100644
--- a/binapi/pot/pot_rpc.ba.go
+++ b/binapi/pot/pot_rpc.ba.go
@@ -87,6 +87,10 @@ func (c *serviceClient_PotProfileShowConfigDumpClient) Recv() (*PotProfileShowCo
 	case *PotProfileShowConfigDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/pppoe/pppoe.ba.go b/binapi/pppoe/pppoe.ba.go
index 7b19cae..c32a4b8 100644
--- a/binapi/pppoe/pppoe.ba.go
+++ b/binapi/pppoe/pppoe.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/pppoe.api.json
 
diff --git a/binapi/pppoe/pppoe_rpc.ba.go b/binapi/pppoe/pppoe_rpc.ba.go
index 778e7a7..bb5517e 100644
--- a/binapi/pppoe/pppoe_rpc.ba.go
+++ b/binapi/pppoe/pppoe_rpc.ba.go
@@ -77,6 +77,10 @@ func (c *serviceClient_PppoeSessionDumpClient) Recv() (*PppoeSessionDetails, err
 	case *PppoeSessionDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/punt/punt.ba.go b/binapi/punt/punt.ba.go
index cee4393..da3ad13 100644
--- a/binapi/punt/punt.ba.go
+++ b/binapi/punt/punt.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/punt.api.json
 
diff --git a/binapi/punt/punt_rpc.ba.go b/binapi/punt/punt_rpc.ba.go
index b27fbd4..d244955 100644
--- a/binapi/punt/punt_rpc.ba.go
+++ b/binapi/punt/punt_rpc.ba.go
@@ -61,6 +61,10 @@ func (c *serviceClient_PuntReasonDumpClient) Recv() (*PuntReasonDetails, error)
 	case *PuntReasonDetails:
 		return m, nil
 	case *vpe.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)
@@ -109,6 +113,10 @@ func (c *serviceClient_PuntSocketDumpClient) Recv() (*PuntSocketDetails, error)
 	case *PuntSocketDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/qos/qos.ba.go b/binapi/qos/qos.ba.go
index f5fbe43..715b6e8 100644
--- a/binapi/qos/qos.ba.go
+++ b/binapi/qos/qos.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/qos.api.json
 
diff --git a/binapi/qos/qos_rpc.ba.go b/binapi/qos/qos_rpc.ba.go
index 9ad1b1d..825dc72 100644
--- a/binapi/qos/qos_rpc.ba.go
+++ b/binapi/qos/qos_rpc.ba.go
@@ -74,6 +74,10 @@ func (c *serviceClient_QosEgressMapDumpClient) Recv() (*QosEgressMapDetails, err
 	case *QosEgressMapDetails:
 		return m, nil
 	case *vpe.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)
@@ -122,6 +126,10 @@ func (c *serviceClient_QosMarkDumpClient) Recv() (*QosMarkDetails, error) {
 	case *QosMarkDetails:
 		return m, nil
 	case *vpe.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)
@@ -170,6 +178,10 @@ func (c *serviceClient_QosRecordDumpClient) Recv() (*QosRecordDetails, error) {
 	case *QosRecordDetails:
 		return m, nil
 	case *vpe.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)
@@ -218,6 +230,10 @@ func (c *serviceClient_QosStoreDumpClient) Recv() (*QosStoreDetails, error) {
 	case *QosStoreDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/rd_cp/rd_cp.ba.go b/binapi/rd_cp/rd_cp.ba.go
index 4484184..fbb8960 100644
--- a/binapi/rd_cp/rd_cp.ba.go
+++ b/binapi/rd_cp/rd_cp.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/rd_cp.api.json
 
diff --git a/binapi/rdma/rdma.ba.go b/binapi/rdma/rdma.ba.go
index c5d54f0..1c0f377 100644
--- a/binapi/rdma/rdma.ba.go
+++ b/binapi/rdma/rdma.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/rdma.api.json
 
diff --git a/binapi/session/session.ba.go b/binapi/session/session.ba.go
index a53915c..ede6836 100644
--- a/binapi/session/session.ba.go
+++ b/binapi/session/session.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/session.api.json
 
diff --git a/binapi/session/session_rpc.ba.go b/binapi/session/session_rpc.ba.go
index 58593a0..cba5890 100644
--- a/binapi/session/session_rpc.ba.go
+++ b/binapi/session/session_rpc.ba.go
@@ -157,6 +157,10 @@ func (c *serviceClient_SessionRulesDumpClient) Recv() (*SessionRulesDetails, err
 	case *SessionRulesDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/span/span.ba.go b/binapi/span/span.ba.go
index 437ab7f..6e1cb38 100644
--- a/binapi/span/span.ba.go
+++ b/binapi/span/span.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/span.api.json
 
diff --git a/binapi/span/span_rpc.ba.go b/binapi/span/span_rpc.ba.go
index 1452be8..6cbfb67 100644
--- a/binapi/span/span_rpc.ba.go
+++ b/binapi/span/span_rpc.ba.go
@@ -58,6 +58,10 @@ func (c *serviceClient_SwInterfaceSpanDumpClient) Recv() (*SwInterfaceSpanDetail
 	case *SwInterfaceSpanDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/sr/sr.ba.go b/binapi/sr/sr.ba.go
index 514031d..e6c1bde 100644
--- a/binapi/sr/sr.ba.go
+++ b/binapi/sr/sr.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/sr.api.json
 
diff --git a/binapi/sr/sr_rpc.ba.go b/binapi/sr/sr_rpc.ba.go
index a47b8a4..236f44a 100644
--- a/binapi/sr/sr_rpc.ba.go
+++ b/binapi/sr/sr_rpc.ba.go
@@ -76,6 +76,10 @@ func (c *serviceClient_SrLocalsidsDumpClient) Recv() (*SrLocalsidsDetails, error
 	case *SrLocalsidsDetails:
 		return m, nil
 	case *vpe.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)
@@ -115,6 +119,10 @@ func (c *serviceClient_SrPoliciesDumpClient) Recv() (*SrPoliciesDetails, error)
 	case *SrPoliciesDetails:
 		return m, nil
 	case *vpe.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)
@@ -154,6 +162,10 @@ func (c *serviceClient_SrPoliciesWithSlIndexDumpClient) Recv() (*SrPoliciesWithS
 	case *SrPoliciesWithSlIndexDetails:
 		return m, nil
 	case *vpe.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)
@@ -247,6 +259,10 @@ func (c *serviceClient_SrSteeringPolDumpClient) Recv() (*SrSteeringPolDetails, e
 	case *SrSteeringPolDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/sr_mpls/sr_mpls.ba.go b/binapi/sr_mpls/sr_mpls.ba.go
index fb1ab1c..ea764d4 100644
--- a/binapi/sr_mpls/sr_mpls.ba.go
+++ b/binapi/sr_mpls/sr_mpls.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/sr_mpls.api.json
 
diff --git a/binapi/sr_types/sr_types.ba.go b/binapi/sr_types/sr_types.ba.go
index fb5ec11..a802a43 100644
--- a/binapi/sr_types/sr_types.ba.go
+++ b/binapi/sr_types/sr_types.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/sr_types.api.json
 
diff --git a/binapi/stn/stn.ba.go b/binapi/stn/stn.ba.go
index 58dd14e..5ceb0b7 100644
--- a/binapi/stn/stn.ba.go
+++ b/binapi/stn/stn.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/stn.api.json
 
diff --git a/binapi/stn/stn_rpc.ba.go b/binapi/stn/stn_rpc.ba.go
index c3dacf8..475894b 100644
--- a/binapi/stn/stn_rpc.ba.go
+++ b/binapi/stn/stn_rpc.ba.go
@@ -67,6 +67,10 @@ func (c *serviceClient_StnRulesDumpClient) Recv() (*StnRulesDetails, error) {
 	case *StnRulesDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/svs/svs.ba.go b/binapi/svs/svs.ba.go
index c55307f..a743282 100644
--- a/binapi/svs/svs.ba.go
+++ b/binapi/svs/svs.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/svs.api.json
 
diff --git a/binapi/svs/svs_rpc.ba.go b/binapi/svs/svs_rpc.ba.go
index 4d344a1..ef13882 100644
--- a/binapi/svs/svs_rpc.ba.go
+++ b/binapi/svs/svs_rpc.ba.go
@@ -61,6 +61,10 @@ func (c *serviceClient_SvsDumpClient) Recv() (*SvsDetails, error) {
 	case *SvsDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/syslog/syslog.ba.go b/binapi/syslog/syslog.ba.go
index db84f1d..4c2a34a 100644
--- a/binapi/syslog/syslog.ba.go
+++ b/binapi/syslog/syslog.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/syslog.api.json
 
diff --git a/binapi/tapv2/tapv2.ba.go b/binapi/tapv2/tapv2.ba.go
index c281080..c13df7d 100644
--- a/binapi/tapv2/tapv2.ba.go
+++ b/binapi/tapv2/tapv2.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/tapv2.api.json
 
diff --git a/binapi/tapv2/tapv2_rpc.ba.go b/binapi/tapv2/tapv2_rpc.ba.go
index 3b58f9d..e7144ba 100644
--- a/binapi/tapv2/tapv2_rpc.ba.go
+++ b/binapi/tapv2/tapv2_rpc.ba.go
@@ -59,6 +59,10 @@ func (c *serviceClient_SwInterfaceTapV2DumpClient) Recv() (*SwInterfaceTapV2Deta
 	case *SwInterfaceTapV2Details:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/tcp/tcp.ba.go b/binapi/tcp/tcp.ba.go
index 211790f..51a8a05 100644
--- a/binapi/tcp/tcp.ba.go
+++ b/binapi/tcp/tcp.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/tcp.api.json
 
diff --git a/binapi/teib/teib.ba.go b/binapi/teib/teib.ba.go
index 9bb3f0a..193eb9d 100644
--- a/binapi/teib/teib.ba.go
+++ b/binapi/teib/teib.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/teib.api.json
 
diff --git a/binapi/teib/teib_rpc.ba.go b/binapi/teib/teib_rpc.ba.go
index 87fcdcd..74d71b4 100644
--- a/binapi/teib/teib_rpc.ba.go
+++ b/binapi/teib/teib_rpc.ba.go
@@ -58,6 +58,10 @@ func (c *serviceClient_TeibDumpClient) Recv() (*TeibDetails, error) {
 	case *TeibDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/tls_openssl/tls_openssl.ba.go b/binapi/tls_openssl/tls_openssl.ba.go
index 19b5861..c3ca5d2 100644
--- a/binapi/tls_openssl/tls_openssl.ba.go
+++ b/binapi/tls_openssl/tls_openssl.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/tls_openssl.api.json
 
diff --git a/binapi/trace/trace.ba.go b/binapi/trace/trace.ba.go
index a5327d0..55ee586 100644
--- a/binapi/trace/trace.ba.go
+++ b/binapi/trace/trace.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/trace.api.json
 
diff --git a/binapi/tracedump/tracedump.ba.go b/binapi/tracedump/tracedump.ba.go
index e6f1552..86712eb 100644
--- a/binapi/tracedump/tracedump.ba.go
+++ b/binapi/tracedump/tracedump.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/tracedump.api.json
 
diff --git a/binapi/tracedump/tracedump_rpc.ba.go b/binapi/tracedump/tracedump_rpc.ba.go
index 07be1af..acc6449 100644
--- a/binapi/tracedump/tracedump_rpc.ba.go
+++ b/binapi/tracedump/tracedump_rpc.ba.go
@@ -74,6 +74,10 @@ func (c *serviceClient_TraceDumpClient) Recv() (*TraceDetails, error) {
 	case *TraceDetails:
 		return m, nil
 	case *TraceDumpReply:
+		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)
diff --git a/binapi/tunnel_types/tunnel_types.ba.go b/binapi/tunnel_types/tunnel_types.ba.go
index 5c009e7..ba4d57d 100644
--- a/binapi/tunnel_types/tunnel_types.ba.go
+++ b/binapi/tunnel_types/tunnel_types.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/tunnel_types.api.json
 
diff --git a/binapi/udp/udp.ba.go b/binapi/udp/udp.ba.go
index bc4fd87..75203a7 100644
--- a/binapi/udp/udp.ba.go
+++ b/binapi/udp/udp.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/udp.api.json
 
diff --git a/binapi/udp/udp_rpc.ba.go b/binapi/udp/udp_rpc.ba.go
index 0b17c63..d2a8bd0 100644
--- a/binapi/udp/udp_rpc.ba.go
+++ b/binapi/udp/udp_rpc.ba.go
@@ -77,6 +77,10 @@ func (c *serviceClient_UDPEncapDumpClient) Recv() (*UDPEncapDetails, error) {
 	case *UDPEncapDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/udp_ping/udp_ping.ba.go b/binapi/udp_ping/udp_ping.ba.go
index 9d014df..6a944ea 100644
--- a/binapi/udp_ping/udp_ping.ba.go
+++ b/binapi/udp_ping/udp_ping.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/udp_ping.api.json
 
diff --git a/binapi/urpf/urpf.ba.go b/binapi/urpf/urpf.ba.go
index fffe5b5..6c90124 100644
--- a/binapi/urpf/urpf.ba.go
+++ b/binapi/urpf/urpf.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/urpf.api.json
 
diff --git a/binapi/vhost_user/vhost_user.ba.go b/binapi/vhost_user/vhost_user.ba.go
index 79e4525..fdd3bd3 100644
--- a/binapi/vhost_user/vhost_user.ba.go
+++ b/binapi/vhost_user/vhost_user.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/vhost_user.api.json
 
diff --git a/binapi/vhost_user/vhost_user_rpc.ba.go b/binapi/vhost_user/vhost_user_rpc.ba.go
index 5c7531f..c985c1b 100644
--- a/binapi/vhost_user/vhost_user_rpc.ba.go
+++ b/binapi/vhost_user/vhost_user_rpc.ba.go
@@ -107,6 +107,10 @@ func (c *serviceClient_SwInterfaceVhostUserDumpClient) Recv() (*SwInterfaceVhost
 	case *SwInterfaceVhostUserDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/virtio/virtio.ba.go b/binapi/virtio/virtio.ba.go
index 3124aef..903e550 100644
--- a/binapi/virtio/virtio.ba.go
+++ b/binapi/virtio/virtio.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/virtio.api.json
 
diff --git a/binapi/virtio/virtio_rpc.ba.go b/binapi/virtio/virtio_rpc.ba.go
index 22716e1..0dde254 100644
--- a/binapi/virtio/virtio_rpc.ba.go
+++ b/binapi/virtio/virtio_rpc.ba.go
@@ -60,6 +60,10 @@ func (c *serviceClient_SwInterfaceVirtioPciDumpClient) Recv() (*SwInterfaceVirti
 	case *SwInterfaceVirtioPciDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/virtio_types/virtio_types.ba.go b/binapi/virtio_types/virtio_types.ba.go
index 884f129..17dfa15 100644
--- a/binapi/virtio_types/virtio_types.ba.go
+++ b/binapi/virtio_types/virtio_types.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/virtio_types.api.json
 
diff --git a/binapi/vmxnet3/vmxnet3.ba.go b/binapi/vmxnet3/vmxnet3.ba.go
index 0ddcb0d..efbbddf 100644
--- a/binapi/vmxnet3/vmxnet3.ba.go
+++ b/binapi/vmxnet3/vmxnet3.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/vmxnet3.api.json
 
diff --git a/binapi/vmxnet3/vmxnet3_rpc.ba.go b/binapi/vmxnet3/vmxnet3_rpc.ba.go
index e8bcdc6..eabc00c 100644
--- a/binapi/vmxnet3/vmxnet3_rpc.ba.go
+++ b/binapi/vmxnet3/vmxnet3_rpc.ba.go
@@ -60,6 +60,10 @@ func (c *serviceClient_SwVmxnet3InterfaceDumpClient) Recv() (*SwVmxnet3Interface
 	case *SwVmxnet3InterfaceDetails:
 		return m, nil
 	case *vpe.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)
@@ -117,6 +121,10 @@ func (c *serviceClient_Vmxnet3DumpClient) Recv() (*Vmxnet3Details, error) {
 	case *Vmxnet3Details:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/vpe/vpe.ba.go b/binapi/vpe/vpe.ba.go
index 504a870..f87d623 100644
--- a/binapi/vpe/vpe.ba.go
+++ b/binapi/vpe/vpe.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/vpe.api.json
 
diff --git a/binapi/vpe/vpe_rpc.ba.go b/binapi/vpe/vpe_rpc.ba.go
index fd3901b..557a397 100644
--- a/binapi/vpe/vpe_rpc.ba.go
+++ b/binapi/vpe/vpe_rpc.ba.go
@@ -149,6 +149,10 @@ func (c *serviceClient_LogDumpClient) Recv() (*LogDetails, error) {
 	case *LogDetails:
 		return m, nil
 	case *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)
diff --git a/binapi/vpe_types/vpe_types.ba.go b/binapi/vpe_types/vpe_types.ba.go
index f14d5ab..64e988f 100644
--- a/binapi/vpe_types/vpe_types.ba.go
+++ b/binapi/vpe_types/vpe_types.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/vpe_types.api.json
 
diff --git a/binapi/vrrp/vrrp.ba.go b/binapi/vrrp/vrrp.ba.go
index 97e1d8a..25e1f43 100644
--- a/binapi/vrrp/vrrp.ba.go
+++ b/binapi/vrrp/vrrp.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/vrrp.api.json
 
diff --git a/binapi/vrrp/vrrp_rpc.ba.go b/binapi/vrrp/vrrp_rpc.ba.go
index fa4f455..023854a 100644
--- a/binapi/vrrp/vrrp_rpc.ba.go
+++ b/binapi/vrrp/vrrp_rpc.ba.go
@@ -73,6 +73,10 @@ func (c *serviceClient_VrrpVrDumpClient) Recv() (*VrrpVrDetails, error) {
 	case *VrrpVrDetails:
 		return m, nil
 	case *vpe.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)
@@ -112,6 +116,10 @@ func (c *serviceClient_VrrpVrPeerDumpClient) Recv() (*VrrpVrPeerDetails, error)
 	case *VrrpVrPeerDetails:
 		return m, nil
 	case *vpe.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)
@@ -178,6 +186,10 @@ func (c *serviceClient_VrrpVrTrackIfDumpClient) Recv() (*VrrpVrTrackIfDetails, e
 	case *VrrpVrTrackIfDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/vxlan/vxlan.ba.go b/binapi/vxlan/vxlan.ba.go
index e3c72c5..a8d538a 100644
--- a/binapi/vxlan/vxlan.ba.go
+++ b/binapi/vxlan/vxlan.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/vxlan.api.json
 
diff --git a/binapi/vxlan/vxlan_rpc.ba.go b/binapi/vxlan/vxlan_rpc.ba.go
index 97729ba..8aa61f9 100644
--- a/binapi/vxlan/vxlan_rpc.ba.go
+++ b/binapi/vxlan/vxlan_rpc.ba.go
@@ -108,6 +108,10 @@ func (c *serviceClient_VxlanTunnelDumpClient) Recv() (*VxlanTunnelDetails, error
 	case *VxlanTunnelDetails:
 		return m, nil
 	case *vpe.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)
@@ -147,6 +151,10 @@ func (c *serviceClient_VxlanTunnelV2DumpClient) Recv() (*VxlanTunnelV2Details, e
 	case *VxlanTunnelV2Details:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/vxlan_gbp/vxlan_gbp.ba.go b/binapi/vxlan_gbp/vxlan_gbp.ba.go
index b5df3e0..a645148 100644
--- a/binapi/vxlan_gbp/vxlan_gbp.ba.go
+++ b/binapi/vxlan_gbp/vxlan_gbp.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/vxlan_gbp.api.json
 
diff --git a/binapi/vxlan_gbp/vxlan_gbp_rpc.ba.go b/binapi/vxlan_gbp/vxlan_gbp_rpc.ba.go
index c86edb9..90aec0e 100644
--- a/binapi/vxlan_gbp/vxlan_gbp_rpc.ba.go
+++ b/binapi/vxlan_gbp/vxlan_gbp_rpc.ba.go
@@ -77,6 +77,10 @@ func (c *serviceClient_VxlanGbpTunnelDumpClient) Recv() (*VxlanGbpTunnelDetails,
 	case *VxlanGbpTunnelDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/vxlan_gpe/vxlan_gpe.ba.go b/binapi/vxlan_gpe/vxlan_gpe.ba.go
index dc51a82..ceca0fd 100644
--- a/binapi/vxlan_gpe/vxlan_gpe.ba.go
+++ b/binapi/vxlan_gpe/vxlan_gpe.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/vxlan_gpe.api.json
 
diff --git a/binapi/vxlan_gpe/vxlan_gpe_rpc.ba.go b/binapi/vxlan_gpe/vxlan_gpe_rpc.ba.go
index 787a053..c5010c7 100644
--- a/binapi/vxlan_gpe/vxlan_gpe_rpc.ba.go
+++ b/binapi/vxlan_gpe/vxlan_gpe_rpc.ba.go
@@ -77,6 +77,10 @@ func (c *serviceClient_VxlanGpeTunnelDumpClient) Recv() (*VxlanGpeTunnelDetails,
 	case *VxlanGpeTunnelDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapi/vxlan_gpe_ioam_export/vxlan_gpe_ioam_export.ba.go b/binapi/vxlan_gpe_ioam_export/vxlan_gpe_ioam_export.ba.go
index 984d82e..26653c4 100644
--- a/binapi/vxlan_gpe_ioam_export/vxlan_gpe_ioam_export.ba.go
+++ b/binapi/vxlan_gpe_ioam_export/vxlan_gpe_ioam_export.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/vxlan_gpe_ioam_export.api.json
 
diff --git a/binapi/wireguard/wireguard.ba.go b/binapi/wireguard/wireguard.ba.go
index d8ed366..21ff4de 100644
--- a/binapi/wireguard/wireguard.ba.go
+++ b/binapi/wireguard/wireguard.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.3.5-56-gc0da1f2-dirty
+//  binapi-generator: v0.4.0-dev
 //  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/wireguard.api.json
 
diff --git a/binapi/wireguard/wireguard_rpc.ba.go b/binapi/wireguard/wireguard_rpc.ba.go
index 77b9097..9d3a024 100644
--- a/binapi/wireguard/wireguard_rpc.ba.go
+++ b/binapi/wireguard/wireguard_rpc.ba.go
@@ -80,6 +80,10 @@ func (c *serviceClient_WireguardInterfaceDumpClient) Recv() (*WireguardInterface
 	case *WireguardInterfaceDetails:
 		return m, nil
 	case *vpe.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)
@@ -137,6 +141,10 @@ func (c *serviceClient_WireguardPeersDumpClient) Recv() (*WireguardPeersDetails,
 	case *WireguardPeersDetails:
 		return m, nil
 	case *vpe.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)
diff --git a/binapigen/gen_rpc.go b/binapigen/gen_rpc.go
index a5974c3..fa123f0 100644
--- a/binapigen/gen_rpc.go
+++ b/binapigen/gen_rpc.go
@@ -152,6 +152,8 @@ func genService(g *GenFile, svc *Service) {
 			g.P("	case *", msgDetails.GoIdent, ":")
 			g.P("		return m, nil")
 			g.P("	case *", msgReply.GoIdent, ":")
+			g.P("		err = c.Stream.Close()")
+			g.P("		if err != nil { return nil, err }")
 			g.P("		return nil, ", ioPkg.Ident("EOF"))
 			g.P("	default:")
 			g.P("		return nil, ", fmtPkg.Ident("Errorf"), "(\"unexpected message: %T %v\", m, m)")
@@ -174,6 +176,8 @@ func genService(g *GenFile, svc *Service) {
 			g.P("if err != nil { return err }")
 			g.P("err = stream.SendMsg(in)")
 			g.P("if err != nil { return err }")
+			g.P("err = stream.Close()")
+			g.P("if err != nil { return err }")
 			g.P("return nil")
 		}
 		g.P("}")
diff --git a/core/channel.go b/core/channel.go
index 4cb5761..1086c36 100644
--- a/core/channel.go
+++ b/core/channel.go
@@ -19,6 +19,7 @@ import (
 	"fmt"
 	"reflect"
 	"strings"
+	"sync/atomic"
 	"time"
 
 	"github.com/sirupsen/logrus"
@@ -109,17 +110,26 @@ type Channel struct {
 	receiveReplyTimeout time.Duration // maximum time that we wait for receiver to consume reply
 }
 
-func newChannel(id uint16, conn *Connection, codec MessageCodec, identifier MessageIdentifier, reqSize, replySize int) *Channel {
-	return &Channel{
-		id:                  id,
-		conn:                conn,
-		msgCodec:            codec,
-		msgIdentifier:       identifier,
-		reqChan:             make(chan *vppRequest, reqSize),
-		replyChan:           make(chan *vppReply, replySize),
+func (c *Connection) newChannel(reqChanBufSize, replyChanBufSize int) *Channel {
+	// create new channel
+	chID := uint16(atomic.AddUint32(&c.maxChannelID, 1) & 0x7fff)
+	channel := &Channel{
+		id:                  chID,
+		conn:                c,
+		msgCodec:            c.codec,
+		msgIdentifier:       c,
+		reqChan:             make(chan *vppRequest, reqChanBufSize),
+		replyChan:           make(chan *vppReply, replyChanBufSize),
 		replyTimeout:        DefaultReplyTimeout,
 		receiveReplyTimeout: ReplyChannelTimeout,
 	}
+
+	// store API channel within the client
+	c.channelsLock.Lock()
+	c.channels[chID] = channel
+	c.channelsLock.Unlock()
+
+	return channel
 }
 
 func (ch *Channel) GetID() uint16 {
diff --git a/core/connection.go b/core/connection.go
index ee5a06b..935693e 100644
--- a/core/connection.go
+++ b/core/connection.go
@@ -245,14 +245,7 @@ func (c *Connection) newAPIChannel(reqChanBufSize, replyChanBufSize int) (*Chann
 		return nil, errors.New("nil connection passed in")
 	}
 
-	// create new channel
-	chID := uint16(atomic.AddUint32(&c.maxChannelID, 1) & 0x7fff)
-	channel := newChannel(chID, c, c.codec, c, reqChanBufSize, replyChanBufSize)
-
-	// store API channel within the client
-	c.channelsLock.Lock()
-	c.channels[chID] = channel
-	c.channelsLock.Unlock()
+	channel := c.newChannel(reqChanBufSize, replyChanBufSize)
 
 	// start watching on the request channel
 	go c.watchRequests(channel)
diff --git a/core/stream.go b/core/stream.go
index 3d417f1..363cc9f 100644
--- a/core/stream.go
+++ b/core/stream.go
@@ -20,14 +20,12 @@ import (
 	"fmt"
 	"reflect"
 	"sync"
-	"sync/atomic"
 	"time"
 
 	"git.fd.io/govpp.git/api"
 )
 
 type Stream struct {
-	id      uint32
 	conn    *Connection
 	ctx     context.Context
 	channel *Channel
@@ -57,15 +55,9 @@ func (c *Connection) NewStream(ctx context.Context, options ...api.StreamOption)
 	for _, option := range options {
 		option(s)
 	}
-	// create and store a new channel
-	s.id = atomic.AddUint32(&c.maxChannelID, 1) & 0x7fff
-	s.channel = newChannel(uint16(s.id), c, c.codec, c, s.requestSize, s.replySize)
-	s.channel.SetReplyTimeout(s.replyTimeout)
 
-	// store API channel within the client
-	c.channelsLock.Lock()
-	c.channels[uint16(s.id)] = s.channel
-	c.channelsLock.Unlock()
+	s.channel = c.newChannel(s.requestSize, s.replySize)
+	s.channel.SetReplyTimeout(s.replyTimeout)
 
 	// Channel.watchRequests are not started here intentionally, because
 	// requests are sent directly by SendMsg.