1 files changed, 73 insertions, 39 deletions

diff --git a/examples/bin_api/tap/tap.go b/examples/bin_api/tap/tap.ba.go
index f7d6745..36f5549 100644
--- a/examples/bin_api/tap/tap.go
+++ b/examples/bin_api/tap/tap.ba.go
@@ -1,15 +1,30 @@
-// Code generated by govpp binapi-generator DO NOT EDIT.
-// Package tap represents the VPP binary API of the 'tap' VPP module.
-// Generated from '../../bin_api/tap.api.json'
+// Code generated by GoVPP binapi-generator. DO NOT EDIT.
+// source: tap.api.json
+
+/*
+Package tap is a generated VPP binary API of the 'tap' VPP module.
+
+It is generated from this file:
+	tap.api.json
+
+It contains these VPP binary API objects:
+	8 messages
+	4 services
+*/
 package tap
 
 import "git.fd.io/govpp.git/api"
+import "github.com/lunixbochs/struc"
+import "bytes"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = struc.Pack
+var _ = bytes.NewBuffer
 
-// VlApiVersion contains version of the API.
-const VlAPIVersion = 0x3a0725de
+/* Messages */
 
 // TapConnect represents the VPP binary API message 'tap_connect'.
-// Generated from '../../bin_api/tap.api.json', line 29:
+// Generated from 'tap.api.json', line 4:
 //
 //            "tap_connect",
 //            [
@@ -99,18 +114,18 @@ type TapConnect struct {
 func (*TapConnect) GetMessageName() string {
 	return "tap_connect"
 }
-func (*TapConnect) GetMessageType() api.MessageType {
-	return api.RequestMessage
-}
 func (*TapConnect) GetCrcString() string {
 	return "9b9c396f"
 }
+func (*TapConnect) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
 func NewTapConnect() api.Message {
 	return &TapConnect{}
 }
 
 // TapConnectReply represents the VPP binary API message 'tap_connect_reply'.
-// Generated from '../../bin_api/tap.api.json', line 100:
+// Generated from 'tap.api.json', line 75:
 //
 //            "tap_connect_reply",
 //            [
@@ -141,18 +156,18 @@ type TapConnectReply struct {
 func (*TapConnectReply) GetMessageName() string {
 	return "tap_connect_reply"
 }
-func (*TapConnectReply) GetMessageType() api.MessageType {
-	return api.ReplyMessage
-}
 func (*TapConnectReply) GetCrcString() string {
 	return "fda5941f"
 }
+func (*TapConnectReply) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
 func NewTapConnectReply() api.Message {
 	return &TapConnectReply{}
 }
 
 // TapModify represents the VPP binary API message 'tap_modify'.
-// Generated from '../../bin_api/tap.api.json', line 122:
+// Generated from 'tap.api.json', line 97:
 //
 //            "tap_modify",
 //            [
@@ -209,18 +224,18 @@ type TapModify struct {
 func (*TapModify) GetMessageName() string {
 	return "tap_modify"
 }
-func (*TapModify) GetMessageType() api.MessageType {
-	return api.RequestMessage
-}
 func (*TapModify) GetCrcString() string {
 	return "8047ae5c"
 }
+func (*TapModify) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
 func NewTapModify() api.Message {
 	return &TapModify{}
 }
 
 // TapModifyReply represents the VPP binary API message 'tap_modify_reply'.
-// Generated from '../../bin_api/tap.api.json', line 166:
+// Generated from 'tap.api.json', line 141:
 //
 //            "tap_modify_reply",
 //            [
@@ -251,18 +266,18 @@ type TapModifyReply struct {
 func (*TapModifyReply) GetMessageName() string {
 	return "tap_modify_reply"
 }
-func (*TapModifyReply) GetMessageType() api.MessageType {
-	return api.ReplyMessage
-}
 func (*TapModifyReply) GetCrcString() string {
 	return "fda5941f"
 }
+func (*TapModifyReply) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
 func NewTapModifyReply() api.Message {
 	return &TapModifyReply{}
 }
 
 // TapDelete represents the VPP binary API message 'tap_delete'.
-// Generated from '../../bin_api/tap.api.json', line 188:
+// Generated from 'tap.api.json', line 163:
 //
 //            "tap_delete",
 //            [
@@ -292,18 +307,18 @@ type TapDelete struct {
 func (*TapDelete) GetMessageName() string {
 	return "tap_delete"
 }
-func (*TapDelete) GetMessageType() api.MessageType {
-	return api.RequestMessage
-}
 func (*TapDelete) GetCrcString() string {
 	return "529cb13f"
 }
+func (*TapDelete) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
 func NewTapDelete() api.Message {
 	return &TapDelete{}
 }
 
 // TapDeleteReply represents the VPP binary API message 'tap_delete_reply'.
-// Generated from '../../bin_api/tap.api.json', line 210:
+// Generated from 'tap.api.json', line 185:
 //
 //            "tap_delete_reply",
 //            [
@@ -329,18 +344,18 @@ type TapDeleteReply struct {
 func (*TapDeleteReply) GetMessageName() string {
 	return "tap_delete_reply"
 }
-func (*TapDeleteReply) GetMessageType() api.MessageType {
-	return api.ReplyMessage
-}
 func (*TapDeleteReply) GetCrcString() string {
 	return "e8d4e804"
 }
+func (*TapDeleteReply) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
 func NewTapDeleteReply() api.Message {
 	return &TapDeleteReply{}
 }
 
 // SwInterfaceTapDump represents the VPP binary API message 'sw_interface_tap_dump'.
-// Generated from '../../bin_api/tap.api.json', line 228:
+// Generated from 'tap.api.json', line 203:
 //
 //            "sw_interface_tap_dump",
 //            [
@@ -359,24 +374,23 @@ func NewTapDeleteReply() api.Message {
 //                "crc": "0x51077d14"
 //            }
 //
-type SwInterfaceTapDump struct {
-}
+type SwInterfaceTapDump struct{}
 
 func (*SwInterfaceTapDump) GetMessageName() string {
 	return "sw_interface_tap_dump"
 }
-func (*SwInterfaceTapDump) GetMessageType() api.MessageType {
-	return api.RequestMessage
-}
 func (*SwInterfaceTapDump) GetCrcString() string {
 	return "51077d14"
 }
+func (*SwInterfaceTapDump) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
 func NewSwInterfaceTapDump() api.Message {
 	return &SwInterfaceTapDump{}
 }
 
 // SwInterfaceTapDetails represents the VPP binary API message 'sw_interface_tap_details'.
-// Generated from '../../bin_api/tap.api.json', line 246:
+// Generated from 'tap.api.json', line 221:
 //
 //            "sw_interface_tap_details",
 //            [
@@ -408,12 +422,32 @@ type SwInterfaceTapDetails struct {
 func (*SwInterfaceTapDetails) GetMessageName() string {
 	return "sw_interface_tap_details"
 }
-func (*SwInterfaceTapDetails) GetMessageType() api.MessageType {
-	return api.ReplyMessage
-}
 func (*SwInterfaceTapDetails) GetCrcString() string {
 	return "76229a57"
 }
+func (*SwInterfaceTapDetails) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
 func NewSwInterfaceTapDetails() api.Message {
 	return &SwInterfaceTapDetails{}
 }
+
+/* Services */
+
+type Services interface {
+	DumpSwInterfaceTap(*SwInterfaceTapDump) (*SwInterfaceTapDetails, error)
+	TapConnect(*TapConnect) (*TapConnectReply, error)
+	TapDelete(*TapDelete) (*TapDeleteReply, error)
+	TapModify(*TapModify) (*TapModifyReply, error)
+}
+
+func init() {
+	api.RegisterMessage((*TapConnect)(nil), "tap.TapConnect")
+	api.RegisterMessage((*TapConnectReply)(nil), "tap.TapConnectReply")
+	api.RegisterMessage((*TapModify)(nil), "tap.TapModify")
+	api.RegisterMessage((*TapModifyReply)(nil), "tap.TapModifyReply")
+	api.RegisterMessage((*TapDelete)(nil), "tap.TapDelete")
+	api.RegisterMessage((*TapDeleteReply)(nil), "tap.TapDeleteReply")
+	api.RegisterMessage((*SwInterfaceTapDump)(nil), "tap.SwInterfaceTapDump")
+	api.RegisterMessage((*SwInterfaceTapDetails)(nil), "tap.SwInterfaceTapDetails")
+}