X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=binapi%2Fl2%2Fl2.ba.go;h=cb62c25bf7d084fa6e4ca76463fb901de75c1e99;hb=1c622180f9be043d5be6c631975182f5cbf9c722;hp=0eb75f2e2919951894c5f89c9de3caca3b125fea;hpb=d1f24d37bd447b64e402298bb8eb2479681facf9;p=govpp.git

diff --git a/binapi/l2/l2.ba.go b/binapi/l2/l2.ba.go
index 0eb75f2..cb62c25 100644
--- a/binapi/l2/l2.ba.go
+++ b/binapi/l2/l2.ba.go
@@ -1,7 +1,7 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.4.0-dev
-//  VPP:              20.05-release
+//  binapi-generator: v0.5.0-dev
+//  VPP:              21.06-release
 // source: /usr/share/vpp/api/core/l2.api.json
 
 // Package l2 contains generated bindings for API file l2.api.
@@ -9,17 +9,18 @@
 // Contents:
 //   3 enums
 //   3 structs
-//  54 messages
+//  62 messages
 //
 package l2
 
 import (
+	"strconv"
+
 	api "git.fd.io/govpp.git/api"
 	ethernet_types "git.fd.io/govpp.git/binapi/ethernet_types"
 	interface_types "git.fd.io/govpp.git/binapi/interface_types"
 	ip_types "git.fd.io/govpp.git/binapi/ip_types"
 	codec "git.fd.io/govpp.git/codec"
-	"strconv"
 )
 
 // This is a compile-time assertion to ensure that this generated file
@@ -30,8 +31,8 @@ const _ = api.GoVppAPIPackageIsVersion2
 
 const (
 	APIFile    = "l2"
-	APIVersion = "3.0.0"
-	VersionCrc = 0x58ce8a6b
+	APIVersion = "3.1.0"
+	VersionCrc = 0xfc6b8fd2
 )
 
 // BdFlags defines enum 'bd_flags'.
@@ -185,16 +186,15 @@ type BdIPMacAddDel struct {
 
 func (m *BdIPMacAddDel) Reset()               { *m = BdIPMacAddDel{} }
 func (*BdIPMacAddDel) GetMessageName() string { return "bd_ip_mac_add_del" }
-func (*BdIPMacAddDel) GetCrcString() string   { return "5f2b84e2" }
+func (*BdIPMacAddDel) GetCrcString() string   { return "0257c869" }
 func (*BdIPMacAddDel) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
 
-func (m *BdIPMacAddDel) Size() int {
+func (m *BdIPMacAddDel) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 1      // m.IsAdd
 	size += 4      // m.Entry.BdID
 	size += 1      // m.Entry.IP.Af
@@ -203,16 +203,14 @@ func (m *BdIPMacAddDel) Size() int {
 	return size
 }
 func (m *BdIPMacAddDel) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
+	buf := codec.NewBuffer(b)
 	buf.EncodeBool(m.IsAdd)
-	buf.EncodeUint32(uint32(m.Entry.BdID))
+	buf.EncodeUint32(m.Entry.BdID)
 	buf.EncodeUint8(uint8(m.Entry.IP.Af))
-	buf.EncodeBytes(m.Entry.IP.Un.XXX_UnionData[:], 0)
+	buf.EncodeBytes(m.Entry.IP.Un.XXX_UnionData[:], 16)
 	buf.EncodeBytes(m.Entry.Mac[:], 6)
 	return buf.Bytes(), nil
 }
@@ -238,27 +236,24 @@ func (*BdIPMacAddDelReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-func (m *BdIPMacAddDelReply) Size() int {
+func (m *BdIPMacAddDelReply) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.Retval
 	return size
 }
 func (m *BdIPMacAddDelReply) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.Retval))
+	buf := codec.NewBuffer(b)
+	buf.EncodeInt32(m.Retval)
 	return buf.Bytes(), nil
 }
 func (m *BdIPMacAddDelReply) Unmarshal(b []byte) error {
 	buf := codec.NewBuffer(b)
-	m.Retval = int32(buf.DecodeUint32())
+	m.Retval = buf.DecodeInt32()
 	return nil
 }
 
@@ -269,16 +264,15 @@ type BdIPMacDetails struct {
 
 func (m *BdIPMacDetails) Reset()               { *m = BdIPMacDetails{} }
 func (*BdIPMacDetails) GetMessageName() string { return "bd_ip_mac_details" }
-func (*BdIPMacDetails) GetCrcString() string   { return "a52f8044" }
+func (*BdIPMacDetails) GetCrcString() string   { return "545af86a" }
 func (*BdIPMacDetails) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-func (m *BdIPMacDetails) Size() int {
+func (m *BdIPMacDetails) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4      // m.Entry.BdID
 	size += 1      // m.Entry.IP.Af
 	size += 1 * 16 // m.Entry.IP.Un
@@ -286,15 +280,13 @@ func (m *BdIPMacDetails) Size() int {
 	return size
 }
 func (m *BdIPMacDetails) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.Entry.BdID))
+	buf := codec.NewBuffer(b)
+	buf.EncodeUint32(m.Entry.BdID)
 	buf.EncodeUint8(uint8(m.Entry.IP.Af))
-	buf.EncodeBytes(m.Entry.IP.Un.XXX_UnionData[:], 0)
+	buf.EncodeBytes(m.Entry.IP.Un.XXX_UnionData[:], 16)
 	buf.EncodeBytes(m.Entry.Mac[:], 6)
 	return buf.Bytes(), nil
 }
@@ -319,22 +311,19 @@ func (*BdIPMacDump) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
 
-func (m *BdIPMacDump) Size() int {
+func (m *BdIPMacDump) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.BdID
 	return size
 }
 func (m *BdIPMacDump) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.BdID))
+	buf := codec.NewBuffer(b)
+	buf.EncodeUint32(m.BdID)
 	return buf.Bytes(), nil
 }
 func (m *BdIPMacDump) Unmarshal(b []byte) error {
@@ -355,22 +344,19 @@ func (*BdIPMacFlush) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
 
-func (m *BdIPMacFlush) Size() int {
+func (m *BdIPMacFlush) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.BdID
 	return size
 }
 func (m *BdIPMacFlush) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.BdID))
+	buf := codec.NewBuffer(b)
+	buf.EncodeUint32(m.BdID)
 	return buf.Bytes(), nil
 }
 func (m *BdIPMacFlush) Unmarshal(b []byte) error {
@@ -391,27 +377,24 @@ func (*BdIPMacFlushReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-func (m *BdIPMacFlushReply) Size() int {
+func (m *BdIPMacFlushReply) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.Retval
 	return size
 }
 func (m *BdIPMacFlushReply) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.Retval))
+	buf := codec.NewBuffer(b)
+	buf.EncodeInt32(m.Retval)
 	return buf.Bytes(), nil
 }
 func (m *BdIPMacFlushReply) Unmarshal(b []byte) error {
 	buf := codec.NewBuffer(b)
-	m.Retval = int32(buf.DecodeUint32())
+	m.Retval = buf.DecodeInt32()
 	return nil
 }
 
@@ -436,11 +419,10 @@ func (*BridgeDomainAddDel) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
 
-func (m *BridgeDomainAddDel) Size() int {
+func (m *BridgeDomainAddDel) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4  // m.BdID
 	size += 1  // m.Flood
 	size += 1  // m.UuFlood
@@ -454,20 +436,18 @@ func (m *BridgeDomainAddDel) Size() int {
 	return size
 }
 func (m *BridgeDomainAddDel) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.BdID))
+	buf := codec.NewBuffer(b)
+	buf.EncodeUint32(m.BdID)
 	buf.EncodeBool(m.Flood)
 	buf.EncodeBool(m.UuFlood)
 	buf.EncodeBool(m.Forward)
 	buf.EncodeBool(m.Learn)
 	buf.EncodeBool(m.ArpTerm)
 	buf.EncodeBool(m.ArpUfwd)
-	buf.EncodeUint8(uint8(m.MacAge))
+	buf.EncodeUint8(m.MacAge)
 	buf.EncodeString(m.BdTag, 64)
 	buf.EncodeBool(m.IsAdd)
 	return buf.Bytes(), nil
@@ -499,27 +479,24 @@ func (*BridgeDomainAddDelReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-func (m *BridgeDomainAddDelReply) Size() int {
+func (m *BridgeDomainAddDelReply) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.Retval
 	return size
 }
 func (m *BridgeDomainAddDelReply) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.Retval))
+	buf := codec.NewBuffer(b)
+	buf.EncodeInt32(m.Retval)
 	return buf.Bytes(), nil
 }
 func (m *BridgeDomainAddDelReply) Unmarshal(b []byte) error {
 	buf := codec.NewBuffer(b)
-	m.Retval = int32(buf.DecodeUint32())
+	m.Retval = buf.DecodeInt32()
 	return nil
 }
 
@@ -542,16 +519,15 @@ type BridgeDomainDetails struct {
 
 func (m *BridgeDomainDetails) Reset()               { *m = BridgeDomainDetails{} }
 func (*BridgeDomainDetails) GetMessageName() string { return "bridge_domain_details" }
-func (*BridgeDomainDetails) GetCrcString() string   { return "979f549d" }
+func (*BridgeDomainDetails) GetCrcString() string   { return "0fa506fd" }
 func (*BridgeDomainDetails) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-func (m *BridgeDomainDetails) Size() int {
+func (m *BridgeDomainDetails) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4  // m.BdID
 	size += 1  // m.Flood
 	size += 1  // m.UuFlood
@@ -577,32 +553,30 @@ func (m *BridgeDomainDetails) Size() int {
 	return size
 }
 func (m *BridgeDomainDetails) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.BdID))
+	buf := codec.NewBuffer(b)
+	buf.EncodeUint32(m.BdID)
 	buf.EncodeBool(m.Flood)
 	buf.EncodeBool(m.UuFlood)
 	buf.EncodeBool(m.Forward)
 	buf.EncodeBool(m.Learn)
 	buf.EncodeBool(m.ArpTerm)
 	buf.EncodeBool(m.ArpUfwd)
-	buf.EncodeUint8(uint8(m.MacAge))
+	buf.EncodeUint8(m.MacAge)
 	buf.EncodeString(m.BdTag, 64)
 	buf.EncodeUint32(uint32(m.BviSwIfIndex))
 	buf.EncodeUint32(uint32(m.UuFwdSwIfIndex))
 	buf.EncodeUint32(uint32(len(m.SwIfDetails)))
 	for j0 := 0; j0 < len(m.SwIfDetails); j0++ {
-		var v0 BridgeDomainSwIf
+		var v0 BridgeDomainSwIf // SwIfDetails
 		if j0 < len(m.SwIfDetails) {
 			v0 = m.SwIfDetails[j0]
 		}
-		buf.EncodeUint32(uint32(v0.Context))
+		buf.EncodeUint32(v0.Context)
 		buf.EncodeUint32(uint32(v0.SwIfIndex))
-		buf.EncodeUint8(uint8(v0.Shg))
+		buf.EncodeUint8(v0.Shg)
 	}
 	return buf.Bytes(), nil
 }
@@ -620,7 +594,7 @@ func (m *BridgeDomainDetails) Unmarshal(b []byte) error {
 	m.BviSwIfIndex = interface_types.InterfaceIndex(buf.DecodeUint32())
 	m.UuFwdSwIfIndex = interface_types.InterfaceIndex(buf.DecodeUint32())
 	m.NSwIfs = buf.DecodeUint32()
-	m.SwIfDetails = make([]BridgeDomainSwIf, int(m.NSwIfs))
+	m.SwIfDetails = make([]BridgeDomainSwIf, m.NSwIfs)
 	for j0 := 0; j0 < len(m.SwIfDetails); j0++ {
 		m.SwIfDetails[j0].Context = buf.DecodeUint32()
 		m.SwIfDetails[j0].SwIfIndex = interface_types.InterfaceIndex(buf.DecodeUint32())
@@ -631,8 +605,8 @@ func (m *BridgeDomainDetails) Unmarshal(b []byte) error {
 
 // BridgeDomainDump defines message 'bridge_domain_dump'.
 type BridgeDomainDump struct {
-	BdID      uint32                         `binapi:"u32,name=bd_id,default=%!s(float64=4.294967295e+09)" json:"bd_id,omitempty"`
-	SwIfIndex interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index,default=%!s(float64=4.294967295e+09)" json:"sw_if_index,omitempty"`
+	BdID      uint32                         `binapi:"u32,name=bd_id,default=4294967295" json:"bd_id,omitempty"`
+	SwIfIndex interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index,default=4294967295" json:"sw_if_index,omitempty"`
 }
 
 func (m *BridgeDomainDump) Reset()               { *m = BridgeDomainDump{} }
@@ -642,23 +616,20 @@ func (*BridgeDomainDump) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
 
-func (m *BridgeDomainDump) Size() int {
+func (m *BridgeDomainDump) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.BdID
 	size += 4 // m.SwIfIndex
 	return size
 }
 func (m *BridgeDomainDump) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.BdID))
+	buf := codec.NewBuffer(b)
+	buf.EncodeUint32(m.BdID)
 	buf.EncodeUint32(uint32(m.SwIfIndex))
 	return buf.Bytes(), nil
 }
@@ -669,6 +640,148 @@ func (m *BridgeDomainDump) Unmarshal(b []byte) error {
 	return nil
 }
 
+// BridgeDomainSetDefaultLearnLimit defines message 'bridge_domain_set_default_learn_limit'.
+type BridgeDomainSetDefaultLearnLimit struct {
+	LearnLimit uint32 `binapi:"u32,name=learn_limit" json:"learn_limit,omitempty"`
+}
+
+func (m *BridgeDomainSetDefaultLearnLimit) Reset() { *m = BridgeDomainSetDefaultLearnLimit{} }
+func (*BridgeDomainSetDefaultLearnLimit) GetMessageName() string {
+	return "bridge_domain_set_default_learn_limit"
+}
+func (*BridgeDomainSetDefaultLearnLimit) GetCrcString() string { return "f097ffce" }
+func (*BridgeDomainSetDefaultLearnLimit) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
+
+func (m *BridgeDomainSetDefaultLearnLimit) Size() (size int) {
+	if m == nil {
+		return 0
+	}
+	size += 4 // m.LearnLimit
+	return size
+}
+func (m *BridgeDomainSetDefaultLearnLimit) Marshal(b []byte) ([]byte, error) {
+	if b == nil {
+		b = make([]byte, m.Size())
+	}
+	buf := codec.NewBuffer(b)
+	buf.EncodeUint32(m.LearnLimit)
+	return buf.Bytes(), nil
+}
+func (m *BridgeDomainSetDefaultLearnLimit) Unmarshal(b []byte) error {
+	buf := codec.NewBuffer(b)
+	m.LearnLimit = buf.DecodeUint32()
+	return nil
+}
+
+// BridgeDomainSetDefaultLearnLimitReply defines message 'bridge_domain_set_default_learn_limit_reply'.
+type BridgeDomainSetDefaultLearnLimitReply struct {
+	Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"`
+}
+
+func (m *BridgeDomainSetDefaultLearnLimitReply) Reset() { *m = BridgeDomainSetDefaultLearnLimitReply{} }
+func (*BridgeDomainSetDefaultLearnLimitReply) GetMessageName() string {
+	return "bridge_domain_set_default_learn_limit_reply"
+}
+func (*BridgeDomainSetDefaultLearnLimitReply) GetCrcString() string { return "e8d4e804" }
+func (*BridgeDomainSetDefaultLearnLimitReply) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
+
+func (m *BridgeDomainSetDefaultLearnLimitReply) Size() (size int) {
+	if m == nil {
+		return 0
+	}
+	size += 4 // m.Retval
+	return size
+}
+func (m *BridgeDomainSetDefaultLearnLimitReply) Marshal(b []byte) ([]byte, error) {
+	if b == nil {
+		b = make([]byte, m.Size())
+	}
+	buf := codec.NewBuffer(b)
+	buf.EncodeInt32(m.Retval)
+	return buf.Bytes(), nil
+}
+func (m *BridgeDomainSetDefaultLearnLimitReply) Unmarshal(b []byte) error {
+	buf := codec.NewBuffer(b)
+	m.Retval = buf.DecodeInt32()
+	return nil
+}
+
+// BridgeDomainSetLearnLimit defines message 'bridge_domain_set_learn_limit'.
+type BridgeDomainSetLearnLimit struct {
+	BdID       uint32 `binapi:"u32,name=bd_id" json:"bd_id,omitempty"`
+	LearnLimit uint32 `binapi:"u32,name=learn_limit" json:"learn_limit,omitempty"`
+}
+
+func (m *BridgeDomainSetLearnLimit) Reset()               { *m = BridgeDomainSetLearnLimit{} }
+func (*BridgeDomainSetLearnLimit) GetMessageName() string { return "bridge_domain_set_learn_limit" }
+func (*BridgeDomainSetLearnLimit) GetCrcString() string   { return "89c52b5f" }
+func (*BridgeDomainSetLearnLimit) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
+
+func (m *BridgeDomainSetLearnLimit) Size() (size int) {
+	if m == nil {
+		return 0
+	}
+	size += 4 // m.BdID
+	size += 4 // m.LearnLimit
+	return size
+}
+func (m *BridgeDomainSetLearnLimit) Marshal(b []byte) ([]byte, error) {
+	if b == nil {
+		b = make([]byte, m.Size())
+	}
+	buf := codec.NewBuffer(b)
+	buf.EncodeUint32(m.BdID)
+	buf.EncodeUint32(m.LearnLimit)
+	return buf.Bytes(), nil
+}
+func (m *BridgeDomainSetLearnLimit) Unmarshal(b []byte) error {
+	buf := codec.NewBuffer(b)
+	m.BdID = buf.DecodeUint32()
+	m.LearnLimit = buf.DecodeUint32()
+	return nil
+}
+
+// BridgeDomainSetLearnLimitReply defines message 'bridge_domain_set_learn_limit_reply'.
+type BridgeDomainSetLearnLimitReply struct {
+	Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"`
+}
+
+func (m *BridgeDomainSetLearnLimitReply) Reset() { *m = BridgeDomainSetLearnLimitReply{} }
+func (*BridgeDomainSetLearnLimitReply) GetMessageName() string {
+	return "bridge_domain_set_learn_limit_reply"
+}
+func (*BridgeDomainSetLearnLimitReply) GetCrcString() string { return "e8d4e804" }
+func (*BridgeDomainSetLearnLimitReply) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
+
+func (m *BridgeDomainSetLearnLimitReply) Size() (size int) {
+	if m == nil {
+		return 0
+	}
+	size += 4 // m.Retval
+	return size
+}
+func (m *BridgeDomainSetLearnLimitReply) Marshal(b []byte) ([]byte, error) {
+	if b == nil {
+		b = make([]byte, m.Size())
+	}
+	buf := codec.NewBuffer(b)
+	buf.EncodeInt32(m.Retval)
+	return buf.Bytes(), nil
+}
+func (m *BridgeDomainSetLearnLimitReply) Unmarshal(b []byte) error {
+	buf := codec.NewBuffer(b)
+	m.Retval = buf.DecodeInt32()
+	return nil
+}
+
 // BridgeDomainSetMacAge defines message 'bridge_domain_set_mac_age'.
 type BridgeDomainSetMacAge struct {
 	BdID   uint32 `binapi:"u32,name=bd_id" json:"bd_id,omitempty"`
@@ -682,24 +795,21 @@ func (*BridgeDomainSetMacAge) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
 
-func (m *BridgeDomainSetMacAge) Size() int {
+func (m *BridgeDomainSetMacAge) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.BdID
 	size += 1 // m.MacAge
 	return size
 }
 func (m *BridgeDomainSetMacAge) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.BdID))
-	buf.EncodeUint8(uint8(m.MacAge))
+	buf := codec.NewBuffer(b)
+	buf.EncodeUint32(m.BdID)
+	buf.EncodeUint8(m.MacAge)
 	return buf.Bytes(), nil
 }
 func (m *BridgeDomainSetMacAge) Unmarshal(b []byte) error {
@@ -721,27 +831,24 @@ func (*BridgeDomainSetMacAgeReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-func (m *BridgeDomainSetMacAgeReply) Size() int {
+func (m *BridgeDomainSetMacAgeReply) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.Retval
 	return size
 }
 func (m *BridgeDomainSetMacAgeReply) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.Retval))
+	buf := codec.NewBuffer(b)
+	buf.EncodeInt32(m.Retval)
 	return buf.Bytes(), nil
 }
 func (m *BridgeDomainSetMacAgeReply) Unmarshal(b []byte) error {
 	buf := codec.NewBuffer(b)
-	m.Retval = int32(buf.DecodeUint32())
+	m.Retval = buf.DecodeInt32()
 	return nil
 }
 
@@ -759,24 +866,21 @@ func (*BridgeFlags) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
 
-func (m *BridgeFlags) Size() int {
+func (m *BridgeFlags) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.BdID
 	size += 1 // m.IsSet
 	size += 4 // m.Flags
 	return size
 }
 func (m *BridgeFlags) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.BdID))
+	buf := codec.NewBuffer(b)
+	buf.EncodeUint32(m.BdID)
 	buf.EncodeBool(m.IsSet)
 	buf.EncodeUint32(uint32(m.Flags))
 	return buf.Bytes(), nil
@@ -802,29 +906,26 @@ func (*BridgeFlagsReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-func (m *BridgeFlagsReply) Size() int {
+func (m *BridgeFlagsReply) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.Retval
 	size += 4 // m.ResultingFeatureBitmap
 	return size
 }
 func (m *BridgeFlagsReply) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.Retval))
-	buf.EncodeUint32(uint32(m.ResultingFeatureBitmap))
+	buf := codec.NewBuffer(b)
+	buf.EncodeInt32(m.Retval)
+	buf.EncodeUint32(m.ResultingFeatureBitmap)
 	return buf.Bytes(), nil
 }
 func (m *BridgeFlagsReply) Unmarshal(b []byte) error {
 	buf := codec.NewBuffer(b)
-	m.Retval = int32(buf.DecodeUint32())
+	m.Retval = buf.DecodeInt32()
 	m.ResultingFeatureBitmap = buf.DecodeUint32()
 	return nil
 }
@@ -832,7 +933,7 @@ func (m *BridgeFlagsReply) Unmarshal(b []byte) error {
 // BviCreate defines message 'bvi_create'.
 type BviCreate struct {
 	Mac          ethernet_types.MacAddress `binapi:"mac_address,name=mac" json:"mac,omitempty"`
-	UserInstance uint32                    `binapi:"u32,name=user_instance,default=%!s(float64=4.294967295e+09)" json:"user_instance,omitempty"`
+	UserInstance uint32                    `binapi:"u32,name=user_instance,default=4294967295" json:"user_instance,omitempty"`
 }
 
 func (m *BviCreate) Reset()               { *m = BviCreate{} }
@@ -842,24 +943,21 @@ func (*BviCreate) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
 
-func (m *BviCreate) Size() int {
+func (m *BviCreate) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 1 * 6 // m.Mac
 	size += 4     // m.UserInstance
 	return size
 }
 func (m *BviCreate) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
+	buf := codec.NewBuffer(b)
 	buf.EncodeBytes(m.Mac[:], 6)
-	buf.EncodeUint32(uint32(m.UserInstance))
+	buf.EncodeUint32(m.UserInstance)
 	return buf.Bytes(), nil
 }
 func (m *BviCreate) Unmarshal(b []byte) error {
@@ -882,29 +980,26 @@ func (*BviCreateReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-func (m *BviCreateReply) Size() int {
+func (m *BviCreateReply) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.Retval
 	size += 4 // m.SwIfIndex
 	return size
 }
 func (m *BviCreateReply) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.Retval))
+	buf := codec.NewBuffer(b)
+	buf.EncodeInt32(m.Retval)
 	buf.EncodeUint32(uint32(m.SwIfIndex))
 	return buf.Bytes(), nil
 }
 func (m *BviCreateReply) Unmarshal(b []byte) error {
 	buf := codec.NewBuffer(b)
-	m.Retval = int32(buf.DecodeUint32())
+	m.Retval = buf.DecodeInt32()
 	m.SwIfIndex = interface_types.InterfaceIndex(buf.DecodeUint32())
 	return nil
 }
@@ -921,21 +1016,18 @@ func (*BviDelete) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
 
-func (m *BviDelete) Size() int {
+func (m *BviDelete) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.SwIfIndex
 	return size
 }
 func (m *BviDelete) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
+	buf := codec.NewBuffer(b)
 	buf.EncodeUint32(uint32(m.SwIfIndex))
 	return buf.Bytes(), nil
 }
@@ -957,27 +1049,24 @@ func (*BviDeleteReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-func (m *BviDeleteReply) Size() int {
+func (m *BviDeleteReply) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.Retval
 	return size
 }
 func (m *BviDeleteReply) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.Retval))
+	buf := codec.NewBuffer(b)
+	buf.EncodeInt32(m.Retval)
 	return buf.Bytes(), nil
 }
 func (m *BviDeleteReply) Unmarshal(b []byte) error {
 	buf := codec.NewBuffer(b)
-	m.Retval = int32(buf.DecodeUint32())
+	m.Retval = buf.DecodeInt32()
 	return nil
 }
 
@@ -991,16 +1080,15 @@ type L2ArpTermEvent struct {
 
 func (m *L2ArpTermEvent) Reset()               { *m = L2ArpTermEvent{} }
 func (*L2ArpTermEvent) GetMessageName() string { return "l2_arp_term_event" }
-func (*L2ArpTermEvent) GetCrcString() string   { return "85ff71ea" }
+func (*L2ArpTermEvent) GetCrcString() string   { return "6963e07a" }
 func (*L2ArpTermEvent) GetMessageType() api.MessageType {
 	return api.EventMessage
 }
 
-func (m *L2ArpTermEvent) Size() int {
+func (m *L2ArpTermEvent) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4      // m.PID
 	size += 1      // m.IP.Af
 	size += 1 * 16 // m.IP.Un
@@ -1009,15 +1097,13 @@ func (m *L2ArpTermEvent) Size() int {
 	return size
 }
 func (m *L2ArpTermEvent) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.PID))
+	buf := codec.NewBuffer(b)
+	buf.EncodeUint32(m.PID)
 	buf.EncodeUint8(uint8(m.IP.Af))
-	buf.EncodeBytes(m.IP.Un.XXX_UnionData[:], 0)
+	buf.EncodeBytes(m.IP.Un.XXX_UnionData[:], 16)
 	buf.EncodeUint32(uint32(m.SwIfIndex))
 	buf.EncodeBytes(m.Mac[:], 6)
 	return buf.Bytes(), nil
@@ -1042,20 +1128,17 @@ func (*L2FibClearTable) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
 
-func (m *L2FibClearTable) Size() int {
+func (m *L2FibClearTable) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	return size
 }
 func (m *L2FibClearTable) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
+	buf := codec.NewBuffer(b)
 	return buf.Bytes(), nil
 }
 func (m *L2FibClearTable) Unmarshal(b []byte) error {
@@ -1074,27 +1157,24 @@ func (*L2FibClearTableReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-func (m *L2FibClearTableReply) Size() int {
+func (m *L2FibClearTableReply) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.Retval
 	return size
 }
 func (m *L2FibClearTableReply) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.Retval))
+	buf := codec.NewBuffer(b)
+	buf.EncodeInt32(m.Retval)
 	return buf.Bytes(), nil
 }
 func (m *L2FibClearTableReply) Unmarshal(b []byte) error {
 	buf := codec.NewBuffer(b)
-	m.Retval = int32(buf.DecodeUint32())
+	m.Retval = buf.DecodeInt32()
 	return nil
 }
 
@@ -1110,16 +1190,15 @@ type L2FibTableDetails struct {
 
 func (m *L2FibTableDetails) Reset()               { *m = L2FibTableDetails{} }
 func (*L2FibTableDetails) GetMessageName() string { return "l2_fib_table_details" }
-func (*L2FibTableDetails) GetCrcString() string   { return "e8d2fc72" }
+func (*L2FibTableDetails) GetCrcString() string   { return "a44ef6b8" }
 func (*L2FibTableDetails) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-func (m *L2FibTableDetails) Size() int {
+func (m *L2FibTableDetails) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4     // m.BdID
 	size += 1 * 6 // m.Mac
 	size += 4     // m.SwIfIndex
@@ -1129,13 +1208,11 @@ func (m *L2FibTableDetails) Size() int {
 	return size
 }
 func (m *L2FibTableDetails) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.BdID))
+	buf := codec.NewBuffer(b)
+	buf.EncodeUint32(m.BdID)
 	buf.EncodeBytes(m.Mac[:], 6)
 	buf.EncodeUint32(uint32(m.SwIfIndex))
 	buf.EncodeBool(m.StaticMac)
@@ -1166,22 +1243,19 @@ func (*L2FibTableDump) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
 
-func (m *L2FibTableDump) Size() int {
+func (m *L2FibTableDump) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.BdID
 	return size
 }
 func (m *L2FibTableDump) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.BdID))
+	buf := codec.NewBuffer(b)
+	buf.EncodeUint32(m.BdID)
 	return buf.Bytes(), nil
 }
 func (m *L2FibTableDump) Unmarshal(b []byte) error {
@@ -1204,26 +1278,23 @@ func (*L2Flags) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
 
-func (m *L2Flags) Size() int {
+func (m *L2Flags) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.SwIfIndex
 	size += 1 // m.IsSet
 	size += 4 // m.FeatureBitmap
 	return size
 }
 func (m *L2Flags) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
+	buf := codec.NewBuffer(b)
 	buf.EncodeUint32(uint32(m.SwIfIndex))
 	buf.EncodeBool(m.IsSet)
-	buf.EncodeUint32(uint32(m.FeatureBitmap))
+	buf.EncodeUint32(m.FeatureBitmap)
 	return buf.Bytes(), nil
 }
 func (m *L2Flags) Unmarshal(b []byte) error {
@@ -1247,29 +1318,26 @@ func (*L2FlagsReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-func (m *L2FlagsReply) Size() int {
+func (m *L2FlagsReply) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.Retval
 	size += 4 // m.ResultingFeatureBitmap
 	return size
 }
 func (m *L2FlagsReply) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.Retval))
-	buf.EncodeUint32(uint32(m.ResultingFeatureBitmap))
+	buf := codec.NewBuffer(b)
+	buf.EncodeInt32(m.Retval)
+	buf.EncodeUint32(m.ResultingFeatureBitmap)
 	return buf.Bytes(), nil
 }
 func (m *L2FlagsReply) Unmarshal(b []byte) error {
 	buf := codec.NewBuffer(b)
-	m.Retval = int32(buf.DecodeUint32())
+	m.Retval = buf.DecodeInt32()
 	m.ResultingFeatureBitmap = buf.DecodeUint32()
 	return nil
 }
@@ -1287,22 +1355,19 @@ func (*L2InterfaceEfpFilter) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
 
-func (m *L2InterfaceEfpFilter) Size() int {
+func (m *L2InterfaceEfpFilter) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.SwIfIndex
 	size += 1 // m.EnableDisable
 	return size
 }
 func (m *L2InterfaceEfpFilter) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
+	buf := codec.NewBuffer(b)
 	buf.EncodeUint32(uint32(m.SwIfIndex))
 	buf.EncodeBool(m.EnableDisable)
 	return buf.Bytes(), nil
@@ -1326,27 +1391,24 @@ func (*L2InterfaceEfpFilterReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-func (m *L2InterfaceEfpFilterReply) Size() int {
+func (m *L2InterfaceEfpFilterReply) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.Retval
 	return size
 }
 func (m *L2InterfaceEfpFilterReply) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.Retval))
+	buf := codec.NewBuffer(b)
+	buf.EncodeInt32(m.Retval)
 	return buf.Bytes(), nil
 }
 func (m *L2InterfaceEfpFilterReply) Unmarshal(b []byte) error {
 	buf := codec.NewBuffer(b)
-	m.Retval = int32(buf.DecodeUint32())
+	m.Retval = buf.DecodeInt32()
 	return nil
 }
 
@@ -1363,16 +1425,15 @@ type L2InterfacePbbTagRewrite struct {
 
 func (m *L2InterfacePbbTagRewrite) Reset()               { *m = L2InterfacePbbTagRewrite{} }
 func (*L2InterfacePbbTagRewrite) GetMessageName() string { return "l2_interface_pbb_tag_rewrite" }
-func (*L2InterfacePbbTagRewrite) GetCrcString() string   { return "612efa5a" }
+func (*L2InterfacePbbTagRewrite) GetCrcString() string   { return "38e802a8" }
 func (*L2InterfacePbbTagRewrite) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
 
-func (m *L2InterfacePbbTagRewrite) Size() int {
+func (m *L2InterfacePbbTagRewrite) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4     // m.SwIfIndex
 	size += 4     // m.VtrOp
 	size += 2     // m.OuterTag
@@ -1383,19 +1444,17 @@ func (m *L2InterfacePbbTagRewrite) Size() int {
 	return size
 }
 func (m *L2InterfacePbbTagRewrite) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
+	buf := codec.NewBuffer(b)
 	buf.EncodeUint32(uint32(m.SwIfIndex))
-	buf.EncodeUint32(uint32(m.VtrOp))
-	buf.EncodeUint16(uint16(m.OuterTag))
+	buf.EncodeUint32(m.VtrOp)
+	buf.EncodeUint16(m.OuterTag)
 	buf.EncodeBytes(m.BDmac[:], 6)
 	buf.EncodeBytes(m.BSmac[:], 6)
-	buf.EncodeUint16(uint16(m.BVlanid))
-	buf.EncodeUint32(uint32(m.ISid))
+	buf.EncodeUint16(m.BVlanid)
+	buf.EncodeUint32(m.ISid)
 	return buf.Bytes(), nil
 }
 func (m *L2InterfacePbbTagRewrite) Unmarshal(b []byte) error {
@@ -1424,27 +1483,24 @@ func (*L2InterfacePbbTagRewriteReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-func (m *L2InterfacePbbTagRewriteReply) Size() int {
+func (m *L2InterfacePbbTagRewriteReply) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.Retval
 	return size
 }
 func (m *L2InterfacePbbTagRewriteReply) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.Retval))
+	buf := codec.NewBuffer(b)
+	buf.EncodeInt32(m.Retval)
 	return buf.Bytes(), nil
 }
 func (m *L2InterfacePbbTagRewriteReply) Unmarshal(b []byte) error {
 	buf := codec.NewBuffer(b)
-	m.Retval = int32(buf.DecodeUint32())
+	m.Retval = buf.DecodeInt32()
 	return nil
 }
 
@@ -1464,11 +1520,10 @@ func (*L2InterfaceVlanTagRewrite) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
 
-func (m *L2InterfaceVlanTagRewrite) Size() int {
+func (m *L2InterfaceVlanTagRewrite) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.SwIfIndex
 	size += 4 // m.VtrOp
 	size += 4 // m.PushDot1q
@@ -1477,17 +1532,15 @@ func (m *L2InterfaceVlanTagRewrite) Size() int {
 	return size
 }
 func (m *L2InterfaceVlanTagRewrite) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
+	buf := codec.NewBuffer(b)
 	buf.EncodeUint32(uint32(m.SwIfIndex))
-	buf.EncodeUint32(uint32(m.VtrOp))
-	buf.EncodeUint32(uint32(m.PushDot1q))
-	buf.EncodeUint32(uint32(m.Tag1))
-	buf.EncodeUint32(uint32(m.Tag2))
+	buf.EncodeUint32(m.VtrOp)
+	buf.EncodeUint32(m.PushDot1q)
+	buf.EncodeUint32(m.Tag1)
+	buf.EncodeUint32(m.Tag2)
 	return buf.Bytes(), nil
 }
 func (m *L2InterfaceVlanTagRewrite) Unmarshal(b []byte) error {
@@ -1514,27 +1567,24 @@ func (*L2InterfaceVlanTagRewriteReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-func (m *L2InterfaceVlanTagRewriteReply) Size() int {
+func (m *L2InterfaceVlanTagRewriteReply) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.Retval
 	return size
 }
 func (m *L2InterfaceVlanTagRewriteReply) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.Retval))
+	buf := codec.NewBuffer(b)
+	buf.EncodeInt32(m.Retval)
 	return buf.Bytes(), nil
 }
 func (m *L2InterfaceVlanTagRewriteReply) Unmarshal(b []byte) error {
 	buf := codec.NewBuffer(b)
-	m.Retval = int32(buf.DecodeUint32())
+	m.Retval = buf.DecodeInt32()
 	return nil
 }
 
@@ -1547,16 +1597,15 @@ type L2MacsEvent struct {
 
 func (m *L2MacsEvent) Reset()               { *m = L2MacsEvent{} }
 func (*L2MacsEvent) GetMessageName() string { return "l2_macs_event" }
-func (*L2MacsEvent) GetCrcString() string   { return "2eadfc8b" }
+func (*L2MacsEvent) GetCrcString() string   { return "44b8fd64" }
 func (*L2MacsEvent) GetMessageType() api.MessageType {
 	return api.EventMessage
 }
 
-func (m *L2MacsEvent) Size() int {
+func (m *L2MacsEvent) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.PID
 	size += 4 // m.NMacs
 	for j1 := 0; j1 < len(m.Mac); j1++ {
@@ -1573,23 +1622,21 @@ func (m *L2MacsEvent) Size() int {
 	return size
 }
 func (m *L2MacsEvent) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.PID))
+	buf := codec.NewBuffer(b)
+	buf.EncodeUint32(m.PID)
 	buf.EncodeUint32(uint32(len(m.Mac)))
 	for j0 := 0; j0 < len(m.Mac); j0++ {
-		var v0 MacEntry
+		var v0 MacEntry // Mac
 		if j0 < len(m.Mac) {
 			v0 = m.Mac[j0]
 		}
 		buf.EncodeUint32(uint32(v0.SwIfIndex))
 		buf.EncodeBytes(v0.MacAddr[:], 6)
 		buf.EncodeUint32(uint32(v0.Action))
-		buf.EncodeUint8(uint8(v0.Flags))
+		buf.EncodeUint8(v0.Flags)
 	}
 	return buf.Bytes(), nil
 }
@@ -1597,7 +1644,7 @@ func (m *L2MacsEvent) Unmarshal(b []byte) error {
 	buf := codec.NewBuffer(b)
 	m.PID = buf.DecodeUint32()
 	m.NMacs = buf.DecodeUint32()
-	m.Mac = make([]MacEntry, int(m.NMacs))
+	m.Mac = make([]MacEntry, m.NMacs)
 	for j0 := 0; j0 < len(m.Mac); j0++ {
 		m.Mac[j0].SwIfIndex = interface_types.InterfaceIndex(buf.DecodeUint32())
 		copy(m.Mac[j0].MacAddr[:], buf.DecodeBytes(6))
@@ -1616,28 +1663,25 @@ type L2PatchAddDel struct {
 
 func (m *L2PatchAddDel) Reset()               { *m = L2PatchAddDel{} }
 func (*L2PatchAddDel) GetMessageName() string { return "l2_patch_add_del" }
-func (*L2PatchAddDel) GetCrcString() string   { return "522f3445" }
+func (*L2PatchAddDel) GetCrcString() string   { return "a1f6a6f3" }
 func (*L2PatchAddDel) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
 
-func (m *L2PatchAddDel) Size() int {
+func (m *L2PatchAddDel) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.RxSwIfIndex
 	size += 4 // m.TxSwIfIndex
 	size += 1 // m.IsAdd
 	return size
 }
 func (m *L2PatchAddDel) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
+	buf := codec.NewBuffer(b)
 	buf.EncodeUint32(uint32(m.RxSwIfIndex))
 	buf.EncodeUint32(uint32(m.TxSwIfIndex))
 	buf.EncodeBool(m.IsAdd)
@@ -1663,27 +1707,24 @@ func (*L2PatchAddDelReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-func (m *L2PatchAddDelReply) Size() int {
+func (m *L2PatchAddDelReply) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.Retval
 	return size
 }
 func (m *L2PatchAddDelReply) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.Retval))
+	buf := codec.NewBuffer(b)
+	buf.EncodeInt32(m.Retval)
 	return buf.Bytes(), nil
 }
 func (m *L2PatchAddDelReply) Unmarshal(b []byte) error {
 	buf := codec.NewBuffer(b)
-	m.Retval = int32(buf.DecodeUint32())
+	m.Retval = buf.DecodeInt32()
 	return nil
 }
 
@@ -1695,27 +1736,24 @@ type L2XconnectDetails struct {
 
 func (m *L2XconnectDetails) Reset()               { *m = L2XconnectDetails{} }
 func (*L2XconnectDetails) GetMessageName() string { return "l2_xconnect_details" }
-func (*L2XconnectDetails) GetCrcString() string   { return "c8aa6b37" }
+func (*L2XconnectDetails) GetCrcString() string   { return "472b6b67" }
 func (*L2XconnectDetails) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-func (m *L2XconnectDetails) Size() int {
+func (m *L2XconnectDetails) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.RxSwIfIndex
 	size += 4 // m.TxSwIfIndex
 	return size
 }
 func (m *L2XconnectDetails) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
+	buf := codec.NewBuffer(b)
 	buf.EncodeUint32(uint32(m.RxSwIfIndex))
 	buf.EncodeUint32(uint32(m.TxSwIfIndex))
 	return buf.Bytes(), nil
@@ -1737,20 +1775,17 @@ func (*L2XconnectDump) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
 
-func (m *L2XconnectDump) Size() int {
+func (m *L2XconnectDump) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	return size
 }
 func (m *L2XconnectDump) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
+	buf := codec.NewBuffer(b)
 	return buf.Bytes(), nil
 }
 func (m *L2XconnectDump) Unmarshal(b []byte) error {
@@ -1770,16 +1805,15 @@ type L2fibAddDel struct {
 
 func (m *L2fibAddDel) Reset()               { *m = L2fibAddDel{} }
 func (*L2fibAddDel) GetMessageName() string { return "l2fib_add_del" }
-func (*L2fibAddDel) GetCrcString() string   { return "f29d796c" }
+func (*L2fibAddDel) GetCrcString() string   { return "eddda487" }
 func (*L2fibAddDel) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
 
-func (m *L2fibAddDel) Size() int {
+func (m *L2fibAddDel) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 1 * 6 // m.Mac
 	size += 4     // m.BdID
 	size += 4     // m.SwIfIndex
@@ -1790,14 +1824,12 @@ func (m *L2fibAddDel) Size() int {
 	return size
 }
 func (m *L2fibAddDel) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
+	buf := codec.NewBuffer(b)
 	buf.EncodeBytes(m.Mac[:], 6)
-	buf.EncodeUint32(uint32(m.BdID))
+	buf.EncodeUint32(m.BdID)
 	buf.EncodeUint32(uint32(m.SwIfIndex))
 	buf.EncodeBool(m.IsAdd)
 	buf.EncodeBool(m.StaticMac)
@@ -1829,27 +1861,24 @@ func (*L2fibAddDelReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-func (m *L2fibAddDelReply) Size() int {
+func (m *L2fibAddDelReply) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.Retval
 	return size
 }
 func (m *L2fibAddDelReply) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.Retval))
+	buf := codec.NewBuffer(b)
+	buf.EncodeInt32(m.Retval)
 	return buf.Bytes(), nil
 }
 func (m *L2fibAddDelReply) Unmarshal(b []byte) error {
 	buf := codec.NewBuffer(b)
-	m.Retval = int32(buf.DecodeUint32())
+	m.Retval = buf.DecodeInt32()
 	return nil
 }
 
@@ -1863,20 +1892,17 @@ func (*L2fibFlushAll) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
 
-func (m *L2fibFlushAll) Size() int {
+func (m *L2fibFlushAll) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	return size
 }
 func (m *L2fibFlushAll) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
+	buf := codec.NewBuffer(b)
 	return buf.Bytes(), nil
 }
 func (m *L2fibFlushAll) Unmarshal(b []byte) error {
@@ -1895,27 +1921,24 @@ func (*L2fibFlushAllReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-func (m *L2fibFlushAllReply) Size() int {
+func (m *L2fibFlushAllReply) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.Retval
 	return size
 }
 func (m *L2fibFlushAllReply) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.Retval))
+	buf := codec.NewBuffer(b)
+	buf.EncodeInt32(m.Retval)
 	return buf.Bytes(), nil
 }
 func (m *L2fibFlushAllReply) Unmarshal(b []byte) error {
 	buf := codec.NewBuffer(b)
-	m.Retval = int32(buf.DecodeUint32())
+	m.Retval = buf.DecodeInt32()
 	return nil
 }
 
@@ -1931,22 +1954,19 @@ func (*L2fibFlushBd) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
 
-func (m *L2fibFlushBd) Size() int {
+func (m *L2fibFlushBd) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.BdID
 	return size
 }
 func (m *L2fibFlushBd) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.BdID))
+	buf := codec.NewBuffer(b)
+	buf.EncodeUint32(m.BdID)
 	return buf.Bytes(), nil
 }
 func (m *L2fibFlushBd) Unmarshal(b []byte) error {
@@ -1967,27 +1987,24 @@ func (*L2fibFlushBdReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-func (m *L2fibFlushBdReply) Size() int {
+func (m *L2fibFlushBdReply) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.Retval
 	return size
 }
 func (m *L2fibFlushBdReply) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.Retval))
+	buf := codec.NewBuffer(b)
+	buf.EncodeInt32(m.Retval)
 	return buf.Bytes(), nil
 }
 func (m *L2fibFlushBdReply) Unmarshal(b []byte) error {
 	buf := codec.NewBuffer(b)
-	m.Retval = int32(buf.DecodeUint32())
+	m.Retval = buf.DecodeInt32()
 	return nil
 }
 
@@ -2003,21 +2020,18 @@ func (*L2fibFlushInt) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
 
-func (m *L2fibFlushInt) Size() int {
+func (m *L2fibFlushInt) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.SwIfIndex
 	return size
 }
 func (m *L2fibFlushInt) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
+	buf := codec.NewBuffer(b)
 	buf.EncodeUint32(uint32(m.SwIfIndex))
 	return buf.Bytes(), nil
 }
@@ -2039,27 +2053,90 @@ func (*L2fibFlushIntReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-func (m *L2fibFlushIntReply) Size() int {
+func (m *L2fibFlushIntReply) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.Retval
 	return size
 }
 func (m *L2fibFlushIntReply) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.Retval))
+	buf := codec.NewBuffer(b)
+	buf.EncodeInt32(m.Retval)
 	return buf.Bytes(), nil
 }
 func (m *L2fibFlushIntReply) Unmarshal(b []byte) error {
 	buf := codec.NewBuffer(b)
-	m.Retval = int32(buf.DecodeUint32())
+	m.Retval = buf.DecodeInt32()
+	return nil
+}
+
+// L2fibSetScanDelay defines message 'l2fib_set_scan_delay'.
+type L2fibSetScanDelay struct {
+	ScanDelay uint16 `binapi:"u16,name=scan_delay,default=10" json:"scan_delay,omitempty"`
+}
+
+func (m *L2fibSetScanDelay) Reset()               { *m = L2fibSetScanDelay{} }
+func (*L2fibSetScanDelay) GetMessageName() string { return "l2fib_set_scan_delay" }
+func (*L2fibSetScanDelay) GetCrcString() string   { return "a3b968a4" }
+func (*L2fibSetScanDelay) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
+
+func (m *L2fibSetScanDelay) Size() (size int) {
+	if m == nil {
+		return 0
+	}
+	size += 2 // m.ScanDelay
+	return size
+}
+func (m *L2fibSetScanDelay) Marshal(b []byte) ([]byte, error) {
+	if b == nil {
+		b = make([]byte, m.Size())
+	}
+	buf := codec.NewBuffer(b)
+	buf.EncodeUint16(m.ScanDelay)
+	return buf.Bytes(), nil
+}
+func (m *L2fibSetScanDelay) Unmarshal(b []byte) error {
+	buf := codec.NewBuffer(b)
+	m.ScanDelay = buf.DecodeUint16()
+	return nil
+}
+
+// L2fibSetScanDelayReply defines message 'l2fib_set_scan_delay_reply'.
+type L2fibSetScanDelayReply struct {
+	Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"`
+}
+
+func (m *L2fibSetScanDelayReply) Reset()               { *m = L2fibSetScanDelayReply{} }
+func (*L2fibSetScanDelayReply) GetMessageName() string { return "l2fib_set_scan_delay_reply" }
+func (*L2fibSetScanDelayReply) GetCrcString() string   { return "e8d4e804" }
+func (*L2fibSetScanDelayReply) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
+
+func (m *L2fibSetScanDelayReply) Size() (size int) {
+	if m == nil {
+		return 0
+	}
+	size += 4 // m.Retval
+	return size
+}
+func (m *L2fibSetScanDelayReply) Marshal(b []byte) ([]byte, error) {
+	if b == nil {
+		b = make([]byte, m.Size())
+	}
+	buf := codec.NewBuffer(b)
+	buf.EncodeInt32(m.Retval)
+	return buf.Bytes(), nil
+}
+func (m *L2fibSetScanDelayReply) Unmarshal(b []byte) error {
+	buf := codec.NewBuffer(b)
+	m.Retval = buf.DecodeInt32()
 	return nil
 }
 
@@ -2074,16 +2151,15 @@ type SwInterfaceSetL2Bridge struct {
 
 func (m *SwInterfaceSetL2Bridge) Reset()               { *m = SwInterfaceSetL2Bridge{} }
 func (*SwInterfaceSetL2Bridge) GetMessageName() string { return "sw_interface_set_l2_bridge" }
-func (*SwInterfaceSetL2Bridge) GetCrcString() string   { return "2e483cd0" }
+func (*SwInterfaceSetL2Bridge) GetCrcString() string   { return "d0678b13" }
 func (*SwInterfaceSetL2Bridge) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
 
-func (m *SwInterfaceSetL2Bridge) Size() int {
+func (m *SwInterfaceSetL2Bridge) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.RxSwIfIndex
 	size += 4 // m.BdID
 	size += 4 // m.PortType
@@ -2092,16 +2168,14 @@ func (m *SwInterfaceSetL2Bridge) Size() int {
 	return size
 }
 func (m *SwInterfaceSetL2Bridge) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
+	buf := codec.NewBuffer(b)
 	buf.EncodeUint32(uint32(m.RxSwIfIndex))
-	buf.EncodeUint32(uint32(m.BdID))
+	buf.EncodeUint32(m.BdID)
 	buf.EncodeUint32(uint32(m.PortType))
-	buf.EncodeUint8(uint8(m.Shg))
+	buf.EncodeUint8(m.Shg)
 	buf.EncodeBool(m.Enable)
 	return buf.Bytes(), nil
 }
@@ -2129,27 +2203,24 @@ func (*SwInterfaceSetL2BridgeReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-func (m *SwInterfaceSetL2BridgeReply) Size() int {
+func (m *SwInterfaceSetL2BridgeReply) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.Retval
 	return size
 }
 func (m *SwInterfaceSetL2BridgeReply) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.Retval))
+	buf := codec.NewBuffer(b)
+	buf.EncodeInt32(m.Retval)
 	return buf.Bytes(), nil
 }
 func (m *SwInterfaceSetL2BridgeReply) Unmarshal(b []byte) error {
 	buf := codec.NewBuffer(b)
-	m.Retval = int32(buf.DecodeUint32())
+	m.Retval = buf.DecodeInt32()
 	return nil
 }
 
@@ -2162,28 +2233,25 @@ type SwInterfaceSetL2Xconnect struct {
 
 func (m *SwInterfaceSetL2Xconnect) Reset()               { *m = SwInterfaceSetL2Xconnect{} }
 func (*SwInterfaceSetL2Xconnect) GetMessageName() string { return "sw_interface_set_l2_xconnect" }
-func (*SwInterfaceSetL2Xconnect) GetCrcString() string   { return "1aaa2dbb" }
+func (*SwInterfaceSetL2Xconnect) GetCrcString() string   { return "4fa28a85" }
 func (*SwInterfaceSetL2Xconnect) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
 
-func (m *SwInterfaceSetL2Xconnect) Size() int {
+func (m *SwInterfaceSetL2Xconnect) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.RxSwIfIndex
 	size += 4 // m.TxSwIfIndex
 	size += 1 // m.Enable
 	return size
 }
 func (m *SwInterfaceSetL2Xconnect) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
+	buf := codec.NewBuffer(b)
 	buf.EncodeUint32(uint32(m.RxSwIfIndex))
 	buf.EncodeUint32(uint32(m.TxSwIfIndex))
 	buf.EncodeBool(m.Enable)
@@ -2211,34 +2279,31 @@ func (*SwInterfaceSetL2XconnectReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-func (m *SwInterfaceSetL2XconnectReply) Size() int {
+func (m *SwInterfaceSetL2XconnectReply) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.Retval
 	return size
 }
 func (m *SwInterfaceSetL2XconnectReply) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.Retval))
+	buf := codec.NewBuffer(b)
+	buf.EncodeInt32(m.Retval)
 	return buf.Bytes(), nil
 }
 func (m *SwInterfaceSetL2XconnectReply) Unmarshal(b []byte) error {
 	buf := codec.NewBuffer(b)
-	m.Retval = int32(buf.DecodeUint32())
+	m.Retval = buf.DecodeInt32()
 	return nil
 }
 
 // SwInterfaceSetVpath defines message 'sw_interface_set_vpath'.
 type SwInterfaceSetVpath struct {
 	SwIfIndex interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index" json:"sw_if_index,omitempty"`
-	Enable    bool                           `binapi:"bool,name=enable,default=%!s(float64=4.294967295e+09)" json:"enable,omitempty"`
+	Enable    bool                           `binapi:"bool,name=enable,default=4.294967295e+09" json:"enable,omitempty"`
 }
 
 func (m *SwInterfaceSetVpath) Reset()               { *m = SwInterfaceSetVpath{} }
@@ -2248,22 +2313,19 @@ func (*SwInterfaceSetVpath) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
 
-func (m *SwInterfaceSetVpath) Size() int {
+func (m *SwInterfaceSetVpath) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.SwIfIndex
 	size += 1 // m.Enable
 	return size
 }
 func (m *SwInterfaceSetVpath) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
+	buf := codec.NewBuffer(b)
 	buf.EncodeUint32(uint32(m.SwIfIndex))
 	buf.EncodeBool(m.Enable)
 	return buf.Bytes(), nil
@@ -2287,27 +2349,24 @@ func (*SwInterfaceSetVpathReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-func (m *SwInterfaceSetVpathReply) Size() int {
+func (m *SwInterfaceSetVpathReply) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.Retval
 	return size
 }
 func (m *SwInterfaceSetVpathReply) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.Retval))
+	buf := codec.NewBuffer(b)
+	buf.EncodeInt32(m.Retval)
 	return buf.Bytes(), nil
 }
 func (m *SwInterfaceSetVpathReply) Unmarshal(b []byte) error {
 	buf := codec.NewBuffer(b)
-	m.Retval = int32(buf.DecodeUint32())
+	m.Retval = buf.DecodeInt32()
 	return nil
 }
 
@@ -2324,24 +2383,21 @@ func (*WantL2ArpTermEvents) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
 
-func (m *WantL2ArpTermEvents) Size() int {
+func (m *WantL2ArpTermEvents) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 1 // m.Enable
 	size += 4 // m.PID
 	return size
 }
 func (m *WantL2ArpTermEvents) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
+	buf := codec.NewBuffer(b)
 	buf.EncodeBool(m.Enable)
-	buf.EncodeUint32(uint32(m.PID))
+	buf.EncodeUint32(m.PID)
 	return buf.Bytes(), nil
 }
 func (m *WantL2ArpTermEvents) Unmarshal(b []byte) error {
@@ -2363,35 +2419,33 @@ func (*WantL2ArpTermEventsReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-func (m *WantL2ArpTermEventsReply) Size() int {
+func (m *WantL2ArpTermEventsReply) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.Retval
 	return size
 }
 func (m *WantL2ArpTermEventsReply) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.Retval))
+	buf := codec.NewBuffer(b)
+	buf.EncodeInt32(m.Retval)
 	return buf.Bytes(), nil
 }
 func (m *WantL2ArpTermEventsReply) Unmarshal(b []byte) error {
 	buf := codec.NewBuffer(b)
-	m.Retval = int32(buf.DecodeUint32())
+	m.Retval = buf.DecodeInt32()
 	return nil
 }
 
 // WantL2MacsEvents defines message 'want_l2_macs_events'.
+// Deprecated: the message will be removed in the future versions
 type WantL2MacsEvents struct {
-	LearnLimit     uint32 `binapi:"u32,name=learn_limit,default=%!s(float64=1000)" json:"learn_limit,omitempty"`
-	ScanDelay      uint8  `binapi:"u8,name=scan_delay,default=%!s(float64=10)" json:"scan_delay,omitempty"`
-	MaxMacsInEvent uint8  `binapi:"u8,name=max_macs_in_event,default=%!s(float64=10)" json:"max_macs_in_event,omitempty"`
+	LearnLimit     uint32 `binapi:"u32,name=learn_limit,default=1000" json:"learn_limit,omitempty"`
+	ScanDelay      uint8  `binapi:"u8,name=scan_delay,default=10" json:"scan_delay,omitempty"`
+	MaxMacsInEvent uint8  `binapi:"u8,name=max_macs_in_event,default=10" json:"max_macs_in_event,omitempty"`
 	EnableDisable  bool   `binapi:"bool,name=enable_disable,default=true" json:"enable_disable,omitempty"`
 	PID            uint32 `binapi:"u32,name=pid" json:"pid,omitempty"`
 }
@@ -2403,11 +2457,10 @@ func (*WantL2MacsEvents) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
 
-func (m *WantL2MacsEvents) Size() int {
+func (m *WantL2MacsEvents) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.LearnLimit
 	size += 1 // m.ScanDelay
 	size += 1 // m.MaxMacsInEvent
@@ -2416,17 +2469,15 @@ func (m *WantL2MacsEvents) Size() int {
 	return size
 }
 func (m *WantL2MacsEvents) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.LearnLimit))
-	buf.EncodeUint8(uint8(m.ScanDelay))
-	buf.EncodeUint8(uint8(m.MaxMacsInEvent))
+	buf := codec.NewBuffer(b)
+	buf.EncodeUint32(m.LearnLimit)
+	buf.EncodeUint8(m.ScanDelay)
+	buf.EncodeUint8(m.MaxMacsInEvent)
 	buf.EncodeBool(m.EnableDisable)
-	buf.EncodeUint32(uint32(m.PID))
+	buf.EncodeUint32(m.PID)
 	return buf.Bytes(), nil
 }
 func (m *WantL2MacsEvents) Unmarshal(b []byte) error {
@@ -2439,7 +2490,82 @@ func (m *WantL2MacsEvents) Unmarshal(b []byte) error {
 	return nil
 }
 
+// WantL2MacsEvents2 defines message 'want_l2_macs_events2'.
+type WantL2MacsEvents2 struct {
+	MaxMacsInEvent uint8  `binapi:"u8,name=max_macs_in_event,default=10" json:"max_macs_in_event,omitempty"`
+	EnableDisable  bool   `binapi:"bool,name=enable_disable,default=true" json:"enable_disable,omitempty"`
+	PID            uint32 `binapi:"u32,name=pid" json:"pid,omitempty"`
+}
+
+func (m *WantL2MacsEvents2) Reset()               { *m = WantL2MacsEvents2{} }
+func (*WantL2MacsEvents2) GetMessageName() string { return "want_l2_macs_events2" }
+func (*WantL2MacsEvents2) GetCrcString() string   { return "cc1377b0" }
+func (*WantL2MacsEvents2) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
+
+func (m *WantL2MacsEvents2) Size() (size int) {
+	if m == nil {
+		return 0
+	}
+	size += 1 // m.MaxMacsInEvent
+	size += 1 // m.EnableDisable
+	size += 4 // m.PID
+	return size
+}
+func (m *WantL2MacsEvents2) Marshal(b []byte) ([]byte, error) {
+	if b == nil {
+		b = make([]byte, m.Size())
+	}
+	buf := codec.NewBuffer(b)
+	buf.EncodeUint8(m.MaxMacsInEvent)
+	buf.EncodeBool(m.EnableDisable)
+	buf.EncodeUint32(m.PID)
+	return buf.Bytes(), nil
+}
+func (m *WantL2MacsEvents2) Unmarshal(b []byte) error {
+	buf := codec.NewBuffer(b)
+	m.MaxMacsInEvent = buf.DecodeUint8()
+	m.EnableDisable = buf.DecodeBool()
+	m.PID = buf.DecodeUint32()
+	return nil
+}
+
+// WantL2MacsEvents2Reply defines message 'want_l2_macs_events2_reply'.
+type WantL2MacsEvents2Reply struct {
+	Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"`
+}
+
+func (m *WantL2MacsEvents2Reply) Reset()               { *m = WantL2MacsEvents2Reply{} }
+func (*WantL2MacsEvents2Reply) GetMessageName() string { return "want_l2_macs_events2_reply" }
+func (*WantL2MacsEvents2Reply) GetCrcString() string   { return "e8d4e804" }
+func (*WantL2MacsEvents2Reply) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
+
+func (m *WantL2MacsEvents2Reply) Size() (size int) {
+	if m == nil {
+		return 0
+	}
+	size += 4 // m.Retval
+	return size
+}
+func (m *WantL2MacsEvents2Reply) Marshal(b []byte) ([]byte, error) {
+	if b == nil {
+		b = make([]byte, m.Size())
+	}
+	buf := codec.NewBuffer(b)
+	buf.EncodeInt32(m.Retval)
+	return buf.Bytes(), nil
+}
+func (m *WantL2MacsEvents2Reply) Unmarshal(b []byte) error {
+	buf := codec.NewBuffer(b)
+	m.Retval = buf.DecodeInt32()
+	return nil
+}
+
 // WantL2MacsEventsReply defines message 'want_l2_macs_events_reply'.
+// Deprecated: the message will be removed in the future versions
 type WantL2MacsEventsReply struct {
 	Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"`
 }
@@ -2451,42 +2577,43 @@ func (*WantL2MacsEventsReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-func (m *WantL2MacsEventsReply) Size() int {
+func (m *WantL2MacsEventsReply) Size() (size int) {
 	if m == nil {
 		return 0
 	}
-	var size int
 	size += 4 // m.Retval
 	return size
 }
 func (m *WantL2MacsEventsReply) Marshal(b []byte) ([]byte, error) {
-	var buf *codec.Buffer
 	if b == nil {
-		buf = codec.NewBuffer(make([]byte, m.Size()))
-	} else {
-		buf = codec.NewBuffer(b)
+		b = make([]byte, m.Size())
 	}
-	buf.EncodeUint32(uint32(m.Retval))
+	buf := codec.NewBuffer(b)
+	buf.EncodeInt32(m.Retval)
 	return buf.Bytes(), nil
 }
 func (m *WantL2MacsEventsReply) Unmarshal(b []byte) error {
 	buf := codec.NewBuffer(b)
-	m.Retval = int32(buf.DecodeUint32())
+	m.Retval = buf.DecodeInt32()
 	return nil
 }
 
 func init() { file_l2_binapi_init() }
 func file_l2_binapi_init() {
-	api.RegisterMessage((*BdIPMacAddDel)(nil), "bd_ip_mac_add_del_5f2b84e2")
+	api.RegisterMessage((*BdIPMacAddDel)(nil), "bd_ip_mac_add_del_0257c869")
 	api.RegisterMessage((*BdIPMacAddDelReply)(nil), "bd_ip_mac_add_del_reply_e8d4e804")
-	api.RegisterMessage((*BdIPMacDetails)(nil), "bd_ip_mac_details_a52f8044")
+	api.RegisterMessage((*BdIPMacDetails)(nil), "bd_ip_mac_details_545af86a")
 	api.RegisterMessage((*BdIPMacDump)(nil), "bd_ip_mac_dump_c25fdce6")
 	api.RegisterMessage((*BdIPMacFlush)(nil), "bd_ip_mac_flush_c25fdce6")
 	api.RegisterMessage((*BdIPMacFlushReply)(nil), "bd_ip_mac_flush_reply_e8d4e804")
 	api.RegisterMessage((*BridgeDomainAddDel)(nil), "bridge_domain_add_del_600b7170")
 	api.RegisterMessage((*BridgeDomainAddDelReply)(nil), "bridge_domain_add_del_reply_e8d4e804")
-	api.RegisterMessage((*BridgeDomainDetails)(nil), "bridge_domain_details_979f549d")
+	api.RegisterMessage((*BridgeDomainDetails)(nil), "bridge_domain_details_0fa506fd")
 	api.RegisterMessage((*BridgeDomainDump)(nil), "bridge_domain_dump_74396a43")
+	api.RegisterMessage((*BridgeDomainSetDefaultLearnLimit)(nil), "bridge_domain_set_default_learn_limit_f097ffce")
+	api.RegisterMessage((*BridgeDomainSetDefaultLearnLimitReply)(nil), "bridge_domain_set_default_learn_limit_reply_e8d4e804")
+	api.RegisterMessage((*BridgeDomainSetLearnLimit)(nil), "bridge_domain_set_learn_limit_89c52b5f")
+	api.RegisterMessage((*BridgeDomainSetLearnLimitReply)(nil), "bridge_domain_set_learn_limit_reply_e8d4e804")
 	api.RegisterMessage((*BridgeDomainSetMacAge)(nil), "bridge_domain_set_mac_age_b537ad7b")
 	api.RegisterMessage((*BridgeDomainSetMacAgeReply)(nil), "bridge_domain_set_mac_age_reply_e8d4e804")
 	api.RegisterMessage((*BridgeFlags)(nil), "bridge_flags_1b0c5fbd")
@@ -2495,25 +2622,25 @@ func file_l2_binapi_init() {
 	api.RegisterMessage((*BviCreateReply)(nil), "bvi_create_reply_5383d31f")
 	api.RegisterMessage((*BviDelete)(nil), "bvi_delete_f9e6675e")
 	api.RegisterMessage((*BviDeleteReply)(nil), "bvi_delete_reply_e8d4e804")
-	api.RegisterMessage((*L2ArpTermEvent)(nil), "l2_arp_term_event_85ff71ea")
+	api.RegisterMessage((*L2ArpTermEvent)(nil), "l2_arp_term_event_6963e07a")
 	api.RegisterMessage((*L2FibClearTable)(nil), "l2_fib_clear_table_51077d14")
 	api.RegisterMessage((*L2FibClearTableReply)(nil), "l2_fib_clear_table_reply_e8d4e804")
-	api.RegisterMessage((*L2FibTableDetails)(nil), "l2_fib_table_details_e8d2fc72")
+	api.RegisterMessage((*L2FibTableDetails)(nil), "l2_fib_table_details_a44ef6b8")
 	api.RegisterMessage((*L2FibTableDump)(nil), "l2_fib_table_dump_c25fdce6")
 	api.RegisterMessage((*L2Flags)(nil), "l2_flags_fc41cfe8")
 	api.RegisterMessage((*L2FlagsReply)(nil), "l2_flags_reply_29b2a2b3")
 	api.RegisterMessage((*L2InterfaceEfpFilter)(nil), "l2_interface_efp_filter_5501adee")
 	api.RegisterMessage((*L2InterfaceEfpFilterReply)(nil), "l2_interface_efp_filter_reply_e8d4e804")
-	api.RegisterMessage((*L2InterfacePbbTagRewrite)(nil), "l2_interface_pbb_tag_rewrite_612efa5a")
+	api.RegisterMessage((*L2InterfacePbbTagRewrite)(nil), "l2_interface_pbb_tag_rewrite_38e802a8")
 	api.RegisterMessage((*L2InterfacePbbTagRewriteReply)(nil), "l2_interface_pbb_tag_rewrite_reply_e8d4e804")
 	api.RegisterMessage((*L2InterfaceVlanTagRewrite)(nil), "l2_interface_vlan_tag_rewrite_62cc0bbc")
 	api.RegisterMessage((*L2InterfaceVlanTagRewriteReply)(nil), "l2_interface_vlan_tag_rewrite_reply_e8d4e804")
-	api.RegisterMessage((*L2MacsEvent)(nil), "l2_macs_event_2eadfc8b")
-	api.RegisterMessage((*L2PatchAddDel)(nil), "l2_patch_add_del_522f3445")
+	api.RegisterMessage((*L2MacsEvent)(nil), "l2_macs_event_44b8fd64")
+	api.RegisterMessage((*L2PatchAddDel)(nil), "l2_patch_add_del_a1f6a6f3")
 	api.RegisterMessage((*L2PatchAddDelReply)(nil), "l2_patch_add_del_reply_e8d4e804")
-	api.RegisterMessage((*L2XconnectDetails)(nil), "l2_xconnect_details_c8aa6b37")
+	api.RegisterMessage((*L2XconnectDetails)(nil), "l2_xconnect_details_472b6b67")
 	api.RegisterMessage((*L2XconnectDump)(nil), "l2_xconnect_dump_51077d14")
-	api.RegisterMessage((*L2fibAddDel)(nil), "l2fib_add_del_f29d796c")
+	api.RegisterMessage((*L2fibAddDel)(nil), "l2fib_add_del_eddda487")
 	api.RegisterMessage((*L2fibAddDelReply)(nil), "l2fib_add_del_reply_e8d4e804")
 	api.RegisterMessage((*L2fibFlushAll)(nil), "l2fib_flush_all_51077d14")
 	api.RegisterMessage((*L2fibFlushAllReply)(nil), "l2fib_flush_all_reply_e8d4e804")
@@ -2521,15 +2648,19 @@ func file_l2_binapi_init() {
 	api.RegisterMessage((*L2fibFlushBdReply)(nil), "l2fib_flush_bd_reply_e8d4e804")
 	api.RegisterMessage((*L2fibFlushInt)(nil), "l2fib_flush_int_f9e6675e")
 	api.RegisterMessage((*L2fibFlushIntReply)(nil), "l2fib_flush_int_reply_e8d4e804")
-	api.RegisterMessage((*SwInterfaceSetL2Bridge)(nil), "sw_interface_set_l2_bridge_2e483cd0")
+	api.RegisterMessage((*L2fibSetScanDelay)(nil), "l2fib_set_scan_delay_a3b968a4")
+	api.RegisterMessage((*L2fibSetScanDelayReply)(nil), "l2fib_set_scan_delay_reply_e8d4e804")
+	api.RegisterMessage((*SwInterfaceSetL2Bridge)(nil), "sw_interface_set_l2_bridge_d0678b13")
 	api.RegisterMessage((*SwInterfaceSetL2BridgeReply)(nil), "sw_interface_set_l2_bridge_reply_e8d4e804")
-	api.RegisterMessage((*SwInterfaceSetL2Xconnect)(nil), "sw_interface_set_l2_xconnect_1aaa2dbb")
+	api.RegisterMessage((*SwInterfaceSetL2Xconnect)(nil), "sw_interface_set_l2_xconnect_4fa28a85")
 	api.RegisterMessage((*SwInterfaceSetL2XconnectReply)(nil), "sw_interface_set_l2_xconnect_reply_e8d4e804")
 	api.RegisterMessage((*SwInterfaceSetVpath)(nil), "sw_interface_set_vpath_ae6cfcfb")
 	api.RegisterMessage((*SwInterfaceSetVpathReply)(nil), "sw_interface_set_vpath_reply_e8d4e804")
 	api.RegisterMessage((*WantL2ArpTermEvents)(nil), "want_l2_arp_term_events_3ec6d6c2")
 	api.RegisterMessage((*WantL2ArpTermEventsReply)(nil), "want_l2_arp_term_events_reply_e8d4e804")
 	api.RegisterMessage((*WantL2MacsEvents)(nil), "want_l2_macs_events_9aabdfde")
+	api.RegisterMessage((*WantL2MacsEvents2)(nil), "want_l2_macs_events2_cc1377b0")
+	api.RegisterMessage((*WantL2MacsEvents2Reply)(nil), "want_l2_macs_events2_reply_e8d4e804")
 	api.RegisterMessage((*WantL2MacsEventsReply)(nil), "want_l2_macs_events_reply_e8d4e804")
 }
 
@@ -2546,6 +2677,10 @@ func AllMessages() []api.Message {
 		(*BridgeDomainAddDelReply)(nil),
 		(*BridgeDomainDetails)(nil),
 		(*BridgeDomainDump)(nil),
+		(*BridgeDomainSetDefaultLearnLimit)(nil),
+		(*BridgeDomainSetDefaultLearnLimitReply)(nil),
+		(*BridgeDomainSetLearnLimit)(nil),
+		(*BridgeDomainSetLearnLimitReply)(nil),
 		(*BridgeDomainSetMacAge)(nil),
 		(*BridgeDomainSetMacAgeReply)(nil),
 		(*BridgeFlags)(nil),
@@ -2580,6 +2715,8 @@ func AllMessages() []api.Message {
 		(*L2fibFlushBdReply)(nil),
 		(*L2fibFlushInt)(nil),
 		(*L2fibFlushIntReply)(nil),
+		(*L2fibSetScanDelay)(nil),
+		(*L2fibSetScanDelayReply)(nil),
 		(*SwInterfaceSetL2Bridge)(nil),
 		(*SwInterfaceSetL2BridgeReply)(nil),
 		(*SwInterfaceSetL2Xconnect)(nil),
@@ -2589,6 +2726,8 @@ func AllMessages() []api.Message {
 		(*WantL2ArpTermEvents)(nil),
 		(*WantL2ArpTermEventsReply)(nil),
 		(*WantL2MacsEvents)(nil),
+		(*WantL2MacsEvents2)(nil),
+		(*WantL2MacsEvents2Reply)(nil),
 		(*WantL2MacsEventsReply)(nil),
 	}
 }