Prepare release v0.4.0

[govpp.git] / binapi / dhcp / dhcp.ba.go

diff --git a/binapi/dhcp/dhcp.ba.go b/binapi/dhcp/dhcp.ba.go
index cb18b48..be1e087 100644 (file)
--- a/binapi/dhcp/dhcp.ba.go
+++ b/binapi/dhcp/dhcp.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.4.0
+//  VPP:              21.06-release
 // source: /usr/share/vpp/api/plugins/dhcp.api.json
 
 // Package dhcp contains generated bindings for API file dhcp.api.
@@ -14,12 +14,13 @@
 package dhcp
 
 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
@@ -31,7 +32,7 @@ const _ = api.GoVppAPIPackageIsVersion2
 const (
        APIFile    = "dhcp"
        APIVersion = "3.0.1"
-       VersionCrc = 0x96274cae
+       VersionCrc = 0x3cf8291a
 )
 
 // DHCPClientState defines enum 'dhcp_client_state'.
@@ -219,21 +220,18 @@ func (*DHCP6ClientsEnableDisable) GetMessageType() api.MessageType {
        return api.RequestMessage
 }
 
-func (m *DHCP6ClientsEnableDisable) Size() int {
+func (m *DHCP6ClientsEnableDisable) Size() (size int) {
        if m == nil {
                return 0
        }
-       var size int
        size += 1 // m.Enable
        return size
 }
 func (m *DHCP6ClientsEnableDisable) 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)
        return buf.Bytes(), nil
 }
@@ -257,27 +255,24 @@ func (*DHCP6ClientsEnableDisableReply) GetMessageType() api.MessageType {
        return api.ReplyMessage
 }
 
-func (m *DHCP6ClientsEnableDisableReply) Size() int {
+func (m *DHCP6ClientsEnableDisableReply) Size() (size int) {
        if m == nil {
                return 0
        }
-       var size int
        size += 4 // m.Retval
        return size
 }
 func (m *DHCP6ClientsEnableDisableReply) 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 *DHCP6ClientsEnableDisableReply) Unmarshal(b []byte) error {
        buf := codec.NewBuffer(b)
-       m.Retval = int32(buf.DecodeUint32())
+       m.Retval = buf.DecodeInt32()
        return nil
 }
 
@@ -293,27 +288,25 @@ func (*DHCP6DuidLlSet) GetMessageType() api.MessageType {
        return api.RequestMessage
 }
 
-func (m *DHCP6DuidLlSet) Size() int {
+func (m *DHCP6DuidLlSet) Size() (size int) {
        if m == nil {
                return 0
        }
-       var size int
        size += 1 * 10 // m.DuidLl
        return size
 }
 func (m *DHCP6DuidLlSet) 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.EncodeBytes(m.DuidLl[:], 10)
+       buf := codec.NewBuffer(b)
+       buf.EncodeBytes(m.DuidLl, 10)
        return buf.Bytes(), nil
 }
 func (m *DHCP6DuidLlSet) Unmarshal(b []byte) error {
        buf := codec.NewBuffer(b)
-       copy(m.DuidLl[:], buf.DecodeBytes(10))
+       m.DuidLl = make([]byte, 10)
+       copy(m.DuidLl, buf.DecodeBytes(len(m.DuidLl)))
        return nil
 }
 
@@ -329,27 +322,24 @@ func (*DHCP6DuidLlSetReply) GetMessageType() api.MessageType {
        return api.ReplyMessage
 }
 
-func (m *DHCP6DuidLlSetReply) Size() int {
+func (m *DHCP6DuidLlSetReply) Size() (size int) {
        if m == nil {
                return 0
        }
-       var size int
        size += 4 // m.Retval
        return size
 }
 func (m *DHCP6DuidLlSetReply) 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 *DHCP6DuidLlSetReply) Unmarshal(b []byte) error {
        buf := codec.NewBuffer(b)
-       m.Retval = int32(buf.DecodeUint32())
+       m.Retval = buf.DecodeInt32()
        return nil
 }
 
@@ -370,16 +360,15 @@ type DHCP6PdReplyEvent struct {
 
 func (m *DHCP6PdReplyEvent) Reset()               { *m = DHCP6PdReplyEvent{} }
 func (*DHCP6PdReplyEvent) GetMessageName() string { return "dhcp6_pd_reply_event" }
-func (*DHCP6PdReplyEvent) GetCrcString() string   { return "cb3e462b" }
+func (*DHCP6PdReplyEvent) GetCrcString() string   { return "5e878029" }
 func (*DHCP6PdReplyEvent) GetMessageType() api.MessageType {
        return api.EventMessage
 }
 
-func (m *DHCP6PdReplyEvent) Size() int {
+func (m *DHCP6PdReplyEvent) Size() (size int) {
        if m == nil {
                return 0
        }
-       var size int
        size += 4 // m.PID
        size += 4 // m.SwIfIndex
        size += 4 // m.ServerIndex
@@ -404,31 +393,29 @@ func (m *DHCP6PdReplyEvent) Size() int {
        return size
 }
 func (m *DHCP6PdReplyEvent) 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(m.SwIfIndex))
-       buf.EncodeUint32(uint32(m.ServerIndex))
+       buf.EncodeUint32(m.ServerIndex)
        buf.EncodeUint32(uint32(m.MsgType))
-       buf.EncodeUint32(uint32(m.T1))
-       buf.EncodeUint32(uint32(m.T2))
-       buf.EncodeUint16(uint16(m.InnerStatusCode))
-       buf.EncodeUint16(uint16(m.StatusCode))
-       buf.EncodeUint8(uint8(m.Preference))
+       buf.EncodeUint32(m.T1)
+       buf.EncodeUint32(m.T2)
+       buf.EncodeUint16(m.InnerStatusCode)
+       buf.EncodeUint16(m.StatusCode)
+       buf.EncodeUint8(m.Preference)
        buf.EncodeUint32(uint32(len(m.Prefixes)))
        for j0 := 0; j0 < len(m.Prefixes); j0++ {
-               var v0 DHCP6PdPrefixInfo
+               var v0 DHCP6PdPrefixInfo // Prefixes
                if j0 < len(m.Prefixes) {
                        v0 = m.Prefixes[j0]
                }
                buf.EncodeBytes(v0.Prefix.Address[:], 16)
-               buf.EncodeUint8(uint8(v0.Prefix.Len))
-               buf.EncodeUint32(uint32(v0.ValidTime))
-               buf.EncodeUint32(uint32(v0.PreferredTime))
+               buf.EncodeUint8(v0.Prefix.Len)
+               buf.EncodeUint32(v0.ValidTime)
+               buf.EncodeUint32(v0.PreferredTime)
        }
        return buf.Bytes(), nil
 }
@@ -444,7 +431,7 @@ func (m *DHCP6PdReplyEvent) Unmarshal(b []byte) error {
        m.StatusCode = buf.DecodeUint16()
        m.Preference = buf.DecodeUint8()
        m.NPrefixes = buf.DecodeUint32()
-       m.Prefixes = make([]DHCP6PdPrefixInfo, int(m.NPrefixes))
+       m.Prefixes = make([]DHCP6PdPrefixInfo, m.NPrefixes)
        for j0 := 0; j0 < len(m.Prefixes); j0++ {
                copy(m.Prefixes[j0].Prefix.Address[:], buf.DecodeBytes(16))
                m.Prefixes[j0].Prefix.Len = buf.DecodeUint8()
@@ -472,16 +459,15 @@ type DHCP6PdSendClientMessage struct {
 
 func (m *DHCP6PdSendClientMessage) Reset()               { *m = DHCP6PdSendClientMessage{} }
 func (*DHCP6PdSendClientMessage) GetMessageName() string { return "dhcp6_pd_send_client_message" }
-func (*DHCP6PdSendClientMessage) GetCrcString() string   { return "064badb8" }
+func (*DHCP6PdSendClientMessage) GetCrcString() string   { return "3739fd8d" }
 func (*DHCP6PdSendClientMessage) GetMessageType() api.MessageType {
        return api.RequestMessage
 }
 
-func (m *DHCP6PdSendClientMessage) Size() int {
+func (m *DHCP6PdSendClientMessage) Size() (size int) {
        if m == nil {
                return 0
        }
-       var size int
        size += 4 // m.SwIfIndex
        size += 4 // m.ServerIndex
        size += 4 // m.Irt
@@ -507,32 +493,30 @@ func (m *DHCP6PdSendClientMessage) Size() int {
        return size
 }
 func (m *DHCP6PdSendClientMessage) 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.ServerIndex))
-       buf.EncodeUint32(uint32(m.Irt))
-       buf.EncodeUint32(uint32(m.Mrt))
-       buf.EncodeUint32(uint32(m.Mrc))
-       buf.EncodeUint32(uint32(m.Mrd))
+       buf.EncodeUint32(m.ServerIndex)
+       buf.EncodeUint32(m.Irt)
+       buf.EncodeUint32(m.Mrt)
+       buf.EncodeUint32(m.Mrc)
+       buf.EncodeUint32(m.Mrd)
        buf.EncodeBool(m.Stop)
        buf.EncodeUint32(uint32(m.MsgType))
-       buf.EncodeUint32(uint32(m.T1))
-       buf.EncodeUint32(uint32(m.T2))
+       buf.EncodeUint32(m.T1)
+       buf.EncodeUint32(m.T2)
        buf.EncodeUint32(uint32(len(m.Prefixes)))
        for j0 := 0; j0 < len(m.Prefixes); j0++ {
-               var v0 DHCP6PdPrefixInfo
+               var v0 DHCP6PdPrefixInfo // Prefixes
                if j0 < len(m.Prefixes) {
                        v0 = m.Prefixes[j0]
                }
                buf.EncodeBytes(v0.Prefix.Address[:], 16)
-               buf.EncodeUint8(uint8(v0.Prefix.Len))
-               buf.EncodeUint32(uint32(v0.ValidTime))
-               buf.EncodeUint32(uint32(v0.PreferredTime))
+               buf.EncodeUint8(v0.Prefix.Len)
+               buf.EncodeUint32(v0.ValidTime)
+               buf.EncodeUint32(v0.PreferredTime)
        }
        return buf.Bytes(), nil
 }
@@ -549,7 +533,7 @@ func (m *DHCP6PdSendClientMessage) Unmarshal(b []byte) error {
        m.T1 = buf.DecodeUint32()
        m.T2 = buf.DecodeUint32()
        m.NPrefixes = buf.DecodeUint32()
-       m.Prefixes = make([]DHCP6PdPrefixInfo, int(m.NPrefixes))
+       m.Prefixes = make([]DHCP6PdPrefixInfo, m.NPrefixes)
        for j0 := 0; j0 < len(m.Prefixes); j0++ {
                copy(m.Prefixes[j0].Prefix.Address[:], buf.DecodeBytes(16))
                m.Prefixes[j0].Prefix.Len = buf.DecodeUint8()
@@ -573,27 +557,24 @@ func (*DHCP6PdSendClientMessageReply) GetMessageType() api.MessageType {
        return api.ReplyMessage
 }
 
-func (m *DHCP6PdSendClientMessageReply) Size() int {
+func (m *DHCP6PdSendClientMessageReply) Size() (size int) {
        if m == nil {
                return 0
        }
-       var size int
        size += 4 // m.Retval
        return size
 }
 func (m *DHCP6PdSendClientMessageReply) 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 *DHCP6PdSendClientMessageReply) Unmarshal(b []byte) error {
        buf := codec.NewBuffer(b)
-       m.Retval = int32(buf.DecodeUint32())
+       m.Retval = buf.DecodeInt32()
        return nil
 }
 
@@ -614,16 +595,15 @@ type DHCP6ReplyEvent struct {
 
 func (m *DHCP6ReplyEvent) Reset()               { *m = DHCP6ReplyEvent{} }
 func (*DHCP6ReplyEvent) GetMessageName() string { return "dhcp6_reply_event" }
-func (*DHCP6ReplyEvent) GetCrcString() string   { return "9f3af9e5" }
+func (*DHCP6ReplyEvent) GetCrcString() string   { return "85b7b17e" }
 func (*DHCP6ReplyEvent) GetMessageType() api.MessageType {
        return api.EventMessage
 }
 
-func (m *DHCP6ReplyEvent) Size() int {
+func (m *DHCP6ReplyEvent) Size() (size int) {
        if m == nil {
                return 0
        }
-       var size int
        size += 4 // m.PID
        size += 4 // m.SwIfIndex
        size += 4 // m.ServerIndex
@@ -647,30 +627,28 @@ func (m *DHCP6ReplyEvent) Size() int {
        return size
 }
 func (m *DHCP6ReplyEvent) 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(m.SwIfIndex))
-       buf.EncodeUint32(uint32(m.ServerIndex))
+       buf.EncodeUint32(m.ServerIndex)
        buf.EncodeUint32(uint32(m.MsgType))
-       buf.EncodeUint32(uint32(m.T1))
-       buf.EncodeUint32(uint32(m.T2))
-       buf.EncodeUint16(uint16(m.InnerStatusCode))
-       buf.EncodeUint16(uint16(m.StatusCode))
-       buf.EncodeUint8(uint8(m.Preference))
+       buf.EncodeUint32(m.T1)
+       buf.EncodeUint32(m.T2)
+       buf.EncodeUint16(m.InnerStatusCode)
+       buf.EncodeUint16(m.StatusCode)
+       buf.EncodeUint8(m.Preference)
        buf.EncodeUint32(uint32(len(m.Addresses)))
        for j0 := 0; j0 < len(m.Addresses); j0++ {
-               var v0 DHCP6AddressInfo
+               var v0 DHCP6AddressInfo // Addresses
                if j0 < len(m.Addresses) {
                        v0 = m.Addresses[j0]
                }
                buf.EncodeBytes(v0.Address[:], 16)
-               buf.EncodeUint32(uint32(v0.ValidTime))
-               buf.EncodeUint32(uint32(v0.PreferredTime))
+               buf.EncodeUint32(v0.ValidTime)
+               buf.EncodeUint32(v0.PreferredTime)
        }
        return buf.Bytes(), nil
 }
@@ -686,7 +664,7 @@ func (m *DHCP6ReplyEvent) Unmarshal(b []byte) error {
        m.StatusCode = buf.DecodeUint16()
        m.Preference = buf.DecodeUint8()
        m.NAddresses = buf.DecodeUint32()
-       m.Addresses = make([]DHCP6AddressInfo, int(m.NAddresses))
+       m.Addresses = make([]DHCP6AddressInfo, m.NAddresses)
        for j0 := 0; j0 < len(m.Addresses); j0++ {
                copy(m.Addresses[j0].Address[:], buf.DecodeBytes(16))
                m.Addresses[j0].ValidTime = buf.DecodeUint32()
@@ -713,16 +691,15 @@ type DHCP6SendClientMessage struct {
 
 func (m *DHCP6SendClientMessage) Reset()               { *m = DHCP6SendClientMessage{} }
 func (*DHCP6SendClientMessage) GetMessageName() string { return "dhcp6_send_client_message" }
-func (*DHCP6SendClientMessage) GetCrcString() string   { return "f6f14ef0" }
+func (*DHCP6SendClientMessage) GetCrcString() string   { return "f8222476" }
 func (*DHCP6SendClientMessage) GetMessageType() api.MessageType {
        return api.RequestMessage
 }
 
-func (m *DHCP6SendClientMessage) Size() int {
+func (m *DHCP6SendClientMessage) Size() (size int) {
        if m == nil {
                return 0
        }
-       var size int
        size += 4 // m.SwIfIndex
        size += 4 // m.ServerIndex
        size += 4 // m.Irt
@@ -747,31 +724,29 @@ func (m *DHCP6SendClientMessage) Size() int {
        return size
 }
 func (m *DHCP6SendClientMessage) 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.ServerIndex))
-       buf.EncodeUint32(uint32(m.Irt))
-       buf.EncodeUint32(uint32(m.Mrt))
-       buf.EncodeUint32(uint32(m.Mrc))
-       buf.EncodeUint32(uint32(m.Mrd))
+       buf.EncodeUint32(m.ServerIndex)
+       buf.EncodeUint32(m.Irt)
+       buf.EncodeUint32(m.Mrt)
+       buf.EncodeUint32(m.Mrc)
+       buf.EncodeUint32(m.Mrd)
        buf.EncodeBool(m.Stop)
        buf.EncodeUint32(uint32(m.MsgType))
-       buf.EncodeUint32(uint32(m.T1))
-       buf.EncodeUint32(uint32(m.T2))
+       buf.EncodeUint32(m.T1)
+       buf.EncodeUint32(m.T2)
        buf.EncodeUint32(uint32(len(m.Addresses)))
        for j0 := 0; j0 < len(m.Addresses); j0++ {
-               var v0 DHCP6AddressInfo
+               var v0 DHCP6AddressInfo // Addresses
                if j0 < len(m.Addresses) {
                        v0 = m.Addresses[j0]
                }
                buf.EncodeBytes(v0.Address[:], 16)
-               buf.EncodeUint32(uint32(v0.ValidTime))
-               buf.EncodeUint32(uint32(v0.PreferredTime))
+               buf.EncodeUint32(v0.ValidTime)
+               buf.EncodeUint32(v0.PreferredTime)
        }
        return buf.Bytes(), nil
 }
@@ -788,7 +763,7 @@ func (m *DHCP6SendClientMessage) Unmarshal(b []byte) error {
        m.T1 = buf.DecodeUint32()
        m.T2 = buf.DecodeUint32()
        m.NAddresses = buf.DecodeUint32()
-       m.Addresses = make([]DHCP6AddressInfo, int(m.NAddresses))
+       m.Addresses = make([]DHCP6AddressInfo, m.NAddresses)
        for j0 := 0; j0 < len(m.Addresses); j0++ {
                copy(m.Addresses[j0].Address[:], buf.DecodeBytes(16))
                m.Addresses[j0].ValidTime = buf.DecodeUint32()
@@ -809,27 +784,24 @@ func (*DHCP6SendClientMessageReply) GetMessageType() api.MessageType {
        return api.ReplyMessage
 }
 
-func (m *DHCP6SendClientMessageReply) Size() int {
+func (m *DHCP6SendClientMessageReply) Size() (size int) {
        if m == nil {
                return 0
        }
-       var size int
        size += 4 // m.Retval
        return size
 }
 func (m *DHCP6SendClientMessageReply) 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 *DHCP6SendClientMessageReply) Unmarshal(b []byte) error {
        buf := codec.NewBuffer(b)
-       m.Retval = int32(buf.DecodeUint32())
+       m.Retval = buf.DecodeInt32()
        return nil
 }
 
@@ -841,16 +813,15 @@ type DHCPClientConfig struct {
 
 func (m *DHCPClientConfig) Reset()               { *m = DHCPClientConfig{} }
 func (*DHCPClientConfig) GetMessageName() string { return "dhcp_client_config" }
-func (*DHCPClientConfig) GetCrcString() string   { return "959b80a3" }
+func (*DHCPClientConfig) GetCrcString() string   { return "1af013ea" }
 func (*DHCPClientConfig) GetMessageType() api.MessageType {
        return api.RequestMessage
 }
 
-func (m *DHCPClientConfig) Size() int {
+func (m *DHCPClientConfig) Size() (size int) {
        if m == nil {
                return 0
        }
-       var size int
        size += 1      // m.IsAdd
        size += 4      // m.Client.SwIfIndex
        size += 64     // m.Client.Hostname
@@ -862,20 +833,18 @@ func (m *DHCPClientConfig) Size() int {
        return size
 }
 func (m *DHCPClientConfig) 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.Client.SwIfIndex))
        buf.EncodeString(m.Client.Hostname, 64)
-       buf.EncodeBytes(m.Client.ID[:], 64)
+       buf.EncodeBytes(m.Client.ID, 64)
        buf.EncodeBool(m.Client.WantDHCPEvent)
        buf.EncodeBool(m.Client.SetBroadcastFlag)
        buf.EncodeUint8(uint8(m.Client.Dscp))
-       buf.EncodeUint32(uint32(m.Client.PID))
+       buf.EncodeUint32(m.Client.PID)
        return buf.Bytes(), nil
 }
 func (m *DHCPClientConfig) Unmarshal(b []byte) error {
@@ -883,7 +852,8 @@ func (m *DHCPClientConfig) Unmarshal(b []byte) error {
        m.IsAdd = buf.DecodeBool()
        m.Client.SwIfIndex = interface_types.InterfaceIndex(buf.DecodeUint32())
        m.Client.Hostname = buf.DecodeString(64)
-       copy(m.Client.ID[:], buf.DecodeBytes(64))
+       m.Client.ID = make([]byte, 64)
+       copy(m.Client.ID, buf.DecodeBytes(len(m.Client.ID)))
        m.Client.WantDHCPEvent = buf.DecodeBool()
        m.Client.SetBroadcastFlag = buf.DecodeBool()
        m.Client.Dscp = ip_types.IPDscp(buf.DecodeUint8())
@@ -903,27 +873,24 @@ func (*DHCPClientConfigReply) GetMessageType() api.MessageType {
        return api.ReplyMessage
 }
 
-func (m *DHCPClientConfigReply) Size() int {
+func (m *DHCPClientConfigReply) Size() (size int) {
        if m == nil {
                return 0
        }
-       var size int
        size += 4 // m.Retval
        return size
 }
 func (m *DHCPClientConfigReply) 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 *DHCPClientConfigReply) Unmarshal(b []byte) error {
        buf := codec.NewBuffer(b)
-       m.Retval = int32(buf.DecodeUint32())
+       m.Retval = buf.DecodeInt32()
        return nil
 }
 
@@ -935,16 +902,15 @@ type DHCPClientDetails struct {
 
 func (m *DHCPClientDetails) Reset()               { *m = DHCPClientDetails{} }
 func (*DHCPClientDetails) GetMessageName() string { return "dhcp_client_details" }
-func (*DHCPClientDetails) GetCrcString() string   { return "acd82f5a" }
+func (*DHCPClientDetails) GetCrcString() string   { return "3c5cd28a" }
 func (*DHCPClientDetails) GetMessageType() api.MessageType {
        return api.ReplyMessage
 }
 
-func (m *DHCPClientDetails) Size() int {
+func (m *DHCPClientDetails) Size() (size int) {
        if m == nil {
                return 0
        }
-       var size int
        size += 4      // m.Client.SwIfIndex
        size += 64     // m.Client.Hostname
        size += 1 * 64 // m.Client.ID
@@ -975,37 +941,35 @@ func (m *DHCPClientDetails) Size() int {
        return size
 }
 func (m *DHCPClientDetails) 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.Client.SwIfIndex))
        buf.EncodeString(m.Client.Hostname, 64)
-       buf.EncodeBytes(m.Client.ID[:], 64)
+       buf.EncodeBytes(m.Client.ID, 64)
        buf.EncodeBool(m.Client.WantDHCPEvent)
        buf.EncodeBool(m.Client.SetBroadcastFlag)
        buf.EncodeUint8(uint8(m.Client.Dscp))
-       buf.EncodeUint32(uint32(m.Client.PID))
+       buf.EncodeUint32(m.Client.PID)
        buf.EncodeUint32(uint32(m.Lease.SwIfIndex))
        buf.EncodeUint32(uint32(m.Lease.State))
        buf.EncodeBool(m.Lease.IsIPv6)
        buf.EncodeString(m.Lease.Hostname, 64)
-       buf.EncodeUint8(uint8(m.Lease.MaskWidth))
+       buf.EncodeUint8(m.Lease.MaskWidth)
        buf.EncodeUint8(uint8(m.Lease.HostAddress.Af))
-       buf.EncodeBytes(m.Lease.HostAddress.Un.XXX_UnionData[:], 0)
+       buf.EncodeBytes(m.Lease.HostAddress.Un.XXX_UnionData[:], 16)
        buf.EncodeUint8(uint8(m.Lease.RouterAddress.Af))
-       buf.EncodeBytes(m.Lease.RouterAddress.Un.XXX_UnionData[:], 0)
+       buf.EncodeBytes(m.Lease.RouterAddress.Un.XXX_UnionData[:], 16)
        buf.EncodeBytes(m.Lease.HostMac[:], 6)
        buf.EncodeUint8(uint8(len(m.Lease.DomainServer)))
        for j1 := 0; j1 < len(m.Lease.DomainServer); j1++ {
-               var v1 DomainServer
+               var v1 DomainServer // DomainServer
                if j1 < len(m.Lease.DomainServer) {
                        v1 = m.Lease.DomainServer[j1]
                }
                buf.EncodeUint8(uint8(v1.Address.Af))
-               buf.EncodeBytes(v1.Address.Un.XXX_UnionData[:], 0)
+               buf.EncodeBytes(v1.Address.Un.XXX_UnionData[:], 16)
        }
        return buf.Bytes(), nil
 }
@@ -1013,7 +977,8 @@ func (m *DHCPClientDetails) Unmarshal(b []byte) error {
        buf := codec.NewBuffer(b)
        m.Client.SwIfIndex = interface_types.InterfaceIndex(buf.DecodeUint32())
        m.Client.Hostname = buf.DecodeString(64)
-       copy(m.Client.ID[:], buf.DecodeBytes(64))
+       m.Client.ID = make([]byte, 64)
+       copy(m.Client.ID, buf.DecodeBytes(len(m.Client.ID)))
        m.Client.WantDHCPEvent = buf.DecodeBool()
        m.Client.SetBroadcastFlag = buf.DecodeBool()
        m.Client.Dscp = ip_types.IPDscp(buf.DecodeUint8())
@@ -1029,7 +994,7 @@ func (m *DHCPClientDetails) Unmarshal(b []byte) error {
        copy(m.Lease.RouterAddress.Un.XXX_UnionData[:], buf.DecodeBytes(16))
        copy(m.Lease.HostMac[:], buf.DecodeBytes(6))
        m.Lease.Count = buf.DecodeUint8()
-       m.Lease.DomainServer = make([]DomainServer, int(m.Lease.Count))
+       m.Lease.DomainServer = make([]DomainServer, m.Lease.Count)
        for j1 := 0; j1 < len(m.Lease.DomainServer); j1++ {
                m.Lease.DomainServer[j1].Address.Af = ip_types.AddressFamily(buf.DecodeUint8())
                copy(m.Lease.DomainServer[j1].Address.Un.XXX_UnionData[:], buf.DecodeBytes(16))
@@ -1047,20 +1012,17 @@ func (*DHCPClientDump) GetMessageType() api.MessageType {
        return api.RequestMessage
 }
 
-func (m *DHCPClientDump) Size() int {
+func (m *DHCPClientDump) Size() (size int) {
        if m == nil {
                return 0
        }
-       var size int
        return size
 }
 func (m *DHCPClientDump) 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 *DHCPClientDump) Unmarshal(b []byte) error {
@@ -1075,16 +1037,15 @@ type DHCPComplEvent struct {
 
 func (m *DHCPComplEvent) Reset()               { *m = DHCPComplEvent{} }
 func (*DHCPComplEvent) GetMessageName() string { return "dhcp_compl_event" }
-func (*DHCPComplEvent) GetCrcString() string   { return "e908fd1d" }
+func (*DHCPComplEvent) GetCrcString() string   { return "554a44e5" }
 func (*DHCPComplEvent) GetMessageType() api.MessageType {
        return api.EventMessage
 }
 
-func (m *DHCPComplEvent) Size() int {
+func (m *DHCPComplEvent) Size() (size int) {
        if m == nil {
                return 0
        }
-       var size int
        size += 4      // m.PID
        size += 4      // m.Lease.SwIfIndex
        size += 4      // m.Lease.State
@@ -1109,31 +1070,29 @@ func (m *DHCPComplEvent) Size() int {
        return size
 }
 func (m *DHCPComplEvent) 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(m.Lease.SwIfIndex))
        buf.EncodeUint32(uint32(m.Lease.State))
        buf.EncodeBool(m.Lease.IsIPv6)
        buf.EncodeString(m.Lease.Hostname, 64)
-       buf.EncodeUint8(uint8(m.Lease.MaskWidth))
+       buf.EncodeUint8(m.Lease.MaskWidth)
        buf.EncodeUint8(uint8(m.Lease.HostAddress.Af))
-       buf.EncodeBytes(m.Lease.HostAddress.Un.XXX_UnionData[:], 0)
+       buf.EncodeBytes(m.Lease.HostAddress.Un.XXX_UnionData[:], 16)
        buf.EncodeUint8(uint8(m.Lease.RouterAddress.Af))
-       buf.EncodeBytes(m.Lease.RouterAddress.Un.XXX_UnionData[:], 0)
+       buf.EncodeBytes(m.Lease.RouterAddress.Un.XXX_UnionData[:], 16)
        buf.EncodeBytes(m.Lease.HostMac[:], 6)
        buf.EncodeUint8(uint8(len(m.Lease.DomainServer)))
        for j1 := 0; j1 < len(m.Lease.DomainServer); j1++ {
-               var v1 DomainServer
+               var v1 DomainServer // DomainServer
                if j1 < len(m.Lease.DomainServer) {
                        v1 = m.Lease.DomainServer[j1]
                }
                buf.EncodeUint8(uint8(v1.Address.Af))
-               buf.EncodeBytes(v1.Address.Un.XXX_UnionData[:], 0)
+               buf.EncodeBytes(v1.Address.Un.XXX_UnionData[:], 16)
        }
        return buf.Bytes(), nil
 }
@@ -1151,7 +1110,7 @@ func (m *DHCPComplEvent) Unmarshal(b []byte) error {
        copy(m.Lease.RouterAddress.Un.XXX_UnionData[:], buf.DecodeBytes(16))
        copy(m.Lease.HostMac[:], buf.DecodeBytes(6))
        m.Lease.Count = buf.DecodeUint8()
-       m.Lease.DomainServer = make([]DomainServer, int(m.Lease.Count))
+       m.Lease.DomainServer = make([]DomainServer, m.Lease.Count)
        for j1 := 0; j1 < len(m.Lease.DomainServer); j1++ {
                m.Lease.DomainServer[j1].Address.Af = ip_types.AddressFamily(buf.DecodeUint8())
                copy(m.Lease.DomainServer[j1].Address.Un.XXX_UnionData[:], buf.DecodeBytes(16))
@@ -1169,20 +1128,17 @@ func (*DHCPPluginControlPing) GetMessageType() api.MessageType {
        return api.RequestMessage
 }
 
-func (m *DHCPPluginControlPing) Size() int {
+func (m *DHCPPluginControlPing) Size() (size int) {
        if m == nil {
                return 0
        }
-       var size int
        return size
 }
 func (m *DHCPPluginControlPing) 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 *DHCPPluginControlPing) Unmarshal(b []byte) error {
@@ -1203,31 +1159,28 @@ func (*DHCPPluginControlPingReply) GetMessageType() api.MessageType {
        return api.ReplyMessage
 }
 
-func (m *DHCPPluginControlPingReply) Size() int {
+func (m *DHCPPluginControlPingReply) Size() (size int) {
        if m == nil {
                return 0
        }
-       var size int
        size += 4 // m.Retval
        size += 4 // m.ClientIndex
        size += 4 // m.VpePID
        return size
 }
 func (m *DHCPPluginControlPingReply) 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.ClientIndex))
-       buf.EncodeUint32(uint32(m.VpePID))
+       buf := codec.NewBuffer(b)
+       buf.EncodeInt32(m.Retval)
+       buf.EncodeUint32(m.ClientIndex)
+       buf.EncodeUint32(m.VpePID)
        return buf.Bytes(), nil
 }
 func (m *DHCPPluginControlPingReply) Unmarshal(b []byte) error {
        buf := codec.NewBuffer(b)
-       m.Retval = int32(buf.DecodeUint32())
+       m.Retval = buf.DecodeInt32()
        m.ClientIndex = buf.DecodeUint32()
        m.VpePID = buf.DecodeUint32()
        return nil
@@ -1243,20 +1196,17 @@ func (*DHCPPluginGetVersion) GetMessageType() api.MessageType {
        return api.RequestMessage
 }
 
-func (m *DHCPPluginGetVersion) Size() int {
+func (m *DHCPPluginGetVersion) Size() (size int) {
        if m == nil {
                return 0
        }
-       var size int
        return size
 }
 func (m *DHCPPluginGetVersion) 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 *DHCPPluginGetVersion) Unmarshal(b []byte) error {
@@ -1276,24 +1226,21 @@ func (*DHCPPluginGetVersionReply) GetMessageType() api.MessageType {
        return api.ReplyMessage
 }
 
-func (m *DHCPPluginGetVersionReply) Size() int {
+func (m *DHCPPluginGetVersionReply) Size() (size int) {
        if m == nil {
                return 0
        }
-       var size int
        size += 4 // m.Major
        size += 4 // m.Minor
        return size
 }
 func (m *DHCPPluginGetVersionReply) 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.Major))
-       buf.EncodeUint32(uint32(m.Minor))
+       buf := codec.NewBuffer(b)
+       buf.EncodeUint32(m.Major)
+       buf.EncodeUint32(m.Minor)
        return buf.Bytes(), nil
 }
 func (m *DHCPPluginGetVersionReply) Unmarshal(b []byte) error {
@@ -1314,16 +1261,15 @@ type DHCPProxyConfig struct {
 
 func (m *DHCPProxyConfig) Reset()               { *m = DHCPProxyConfig{} }
 func (*DHCPProxyConfig) GetMessageName() string { return "dhcp_proxy_config" }
-func (*DHCPProxyConfig) GetCrcString() string   { return "6767230e" }
+func (*DHCPProxyConfig) GetCrcString() string   { return "4058a689" }
 func (*DHCPProxyConfig) GetMessageType() api.MessageType {
        return api.RequestMessage
 }
 
-func (m *DHCPProxyConfig) Size() int {
+func (m *DHCPProxyConfig) Size() (size int) {
        if m == nil {
                return 0
        }
-       var size int
        size += 4      // m.RxVrfID
        size += 4      // m.ServerVrfID
        size += 1      // m.IsAdd
@@ -1334,19 +1280,17 @@ func (m *DHCPProxyConfig) Size() int {
        return size
 }
 func (m *DHCPProxyConfig) 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.RxVrfID))
-       buf.EncodeUint32(uint32(m.ServerVrfID))
+       buf := codec.NewBuffer(b)
+       buf.EncodeUint32(m.RxVrfID)
+       buf.EncodeUint32(m.ServerVrfID)
        buf.EncodeBool(m.IsAdd)
        buf.EncodeUint8(uint8(m.DHCPServer.Af))
-       buf.EncodeBytes(m.DHCPServer.Un.XXX_UnionData[:], 0)
+       buf.EncodeBytes(m.DHCPServer.Un.XXX_UnionData[:], 16)
        buf.EncodeUint8(uint8(m.DHCPSrcAddress.Af))
-       buf.EncodeBytes(m.DHCPSrcAddress.Un.XXX_UnionData[:], 0)
+       buf.EncodeBytes(m.DHCPSrcAddress.Un.XXX_UnionData[:], 16)
        return buf.Bytes(), nil
 }
 func (m *DHCPProxyConfig) Unmarshal(b []byte) error {
@@ -1373,27 +1317,24 @@ func (*DHCPProxyConfigReply) GetMessageType() api.MessageType {
        return api.ReplyMessage
 }
 
-func (m *DHCPProxyConfigReply) Size() int {
+func (m *DHCPProxyConfigReply) Size() (size int) {
        if m == nil {
                return 0
        }
-       var size int
        size += 4 // m.Retval
        return size
 }
 func (m *DHCPProxyConfigReply) 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 *DHCPProxyConfigReply) Unmarshal(b []byte) error {
        buf := codec.NewBuffer(b)
-       m.Retval = int32(buf.DecodeUint32())
+       m.Retval = buf.DecodeInt32()
        return nil
 }
 
@@ -1412,16 +1353,15 @@ type DHCPProxyDetails struct {
 
 func (m *DHCPProxyDetails) Reset()               { *m = DHCPProxyDetails{} }
 func (*DHCPProxyDetails) GetMessageName() string { return "dhcp_proxy_details" }
-func (*DHCPProxyDetails) GetCrcString() string   { return "ce16f044" }
+func (*DHCPProxyDetails) GetCrcString() string   { return "dcbaf540" }
 func (*DHCPProxyDetails) GetMessageType() api.MessageType {
        return api.ReplyMessage
 }
 
-func (m *DHCPProxyDetails) Size() int {
+func (m *DHCPProxyDetails) Size() (size int) {
        if m == nil {
                return 0
        }
-       var size int
        size += 4      // m.RxVrfID
        size += 4      // m.VssOui
        size += 4      // m.VssFibID
@@ -1444,29 +1384,27 @@ func (m *DHCPProxyDetails) Size() int {
        return size
 }
 func (m *DHCPProxyDetails) 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.RxVrfID))
-       buf.EncodeUint32(uint32(m.VssOui))
-       buf.EncodeUint32(uint32(m.VssFibID))
+       buf := codec.NewBuffer(b)
+       buf.EncodeUint32(m.RxVrfID)
+       buf.EncodeUint32(m.VssOui)
+       buf.EncodeUint32(m.VssFibID)
        buf.EncodeUint32(uint32(m.VssType))
        buf.EncodeBool(m.IsIPv6)
        buf.EncodeString(m.VssVPNAsciiID, 129)
        buf.EncodeUint8(uint8(m.DHCPSrcAddress.Af))
-       buf.EncodeBytes(m.DHCPSrcAddress.Un.XXX_UnionData[:], 0)
+       buf.EncodeBytes(m.DHCPSrcAddress.Un.XXX_UnionData[:], 16)
        buf.EncodeUint8(uint8(len(m.Servers)))
        for j0 := 0; j0 < len(m.Servers); j0++ {
-               var v0 DHCPServer
+               var v0 DHCPServer // Servers
                if j0 < len(m.Servers) {
                        v0 = m.Servers[j0]
                }
-               buf.EncodeUint32(uint32(v0.ServerVrfID))
+               buf.EncodeUint32(v0.ServerVrfID)
                buf.EncodeUint8(uint8(v0.DHCPServer.Af))
-               buf.EncodeBytes(v0.DHCPServer.Un.XXX_UnionData[:], 0)
+               buf.EncodeBytes(v0.DHCPServer.Un.XXX_UnionData[:], 16)
        }
        return buf.Bytes(), nil
 }
@@ -1481,7 +1419,7 @@ func (m *DHCPProxyDetails) Unmarshal(b []byte) error {
        m.DHCPSrcAddress.Af = ip_types.AddressFamily(buf.DecodeUint8())
        copy(m.DHCPSrcAddress.Un.XXX_UnionData[:], buf.DecodeBytes(16))
        m.Count = buf.DecodeUint8()
-       m.Servers = make([]DHCPServer, int(m.Count))
+       m.Servers = make([]DHCPServer, m.Count)
        for j0 := 0; j0 < len(m.Servers); j0++ {
                m.Servers[j0].ServerVrfID = buf.DecodeUint32()
                m.Servers[j0].DHCPServer.Af = ip_types.AddressFamily(buf.DecodeUint8())
@@ -1502,21 +1440,18 @@ func (*DHCPProxyDump) GetMessageType() api.MessageType {
        return api.RequestMessage
 }
 
-func (m *DHCPProxyDump) Size() int {
+func (m *DHCPProxyDump) Size() (size int) {
        if m == nil {
                return 0
        }
-       var size int
        size += 1 // m.IsIP6
        return size
 }
 func (m *DHCPProxyDump) 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.IsIP6)
        return buf.Bytes(), nil
 }
@@ -1544,11 +1479,10 @@ func (*DHCPProxySetVss) GetMessageType() api.MessageType {
        return api.RequestMessage
 }
 
-func (m *DHCPProxySetVss) Size() int {
+func (m *DHCPProxySetVss) Size() (size int) {
        if m == nil {
                return 0
        }
-       var size int
        size += 4   // m.TblID
        size += 4   // m.VssType
        size += 129 // m.VPNAsciiID
@@ -1559,17 +1493,15 @@ func (m *DHCPProxySetVss) Size() int {
        return size
 }
 func (m *DHCPProxySetVss) 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.TblID))
+       buf := codec.NewBuffer(b)
+       buf.EncodeUint32(m.TblID)
        buf.EncodeUint32(uint32(m.VssType))
        buf.EncodeString(m.VPNAsciiID, 129)
-       buf.EncodeUint32(uint32(m.Oui))
-       buf.EncodeUint32(uint32(m.VPNIndex))
+       buf.EncodeUint32(m.Oui)
+       buf.EncodeUint32(m.VPNIndex)
        buf.EncodeBool(m.IsIPv6)
        buf.EncodeBool(m.IsAdd)
        return buf.Bytes(), nil
@@ -1598,27 +1530,24 @@ func (*DHCPProxySetVssReply) GetMessageType() api.MessageType {
        return api.ReplyMessage
 }
 
-func (m *DHCPProxySetVssReply) Size() int {
+func (m *DHCPProxySetVssReply) Size() (size int) {
        if m == nil {
                return 0
        }
-       var size int
        size += 4 // m.Retval
        return size
 }
 func (m *DHCPProxySetVssReply) 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 *DHCPProxySetVssReply) Unmarshal(b []byte) error {
        buf := codec.NewBuffer(b)
-       m.Retval = int32(buf.DecodeUint32())
+       m.Retval = buf.DecodeInt32()
        return nil
 }
 
@@ -1635,24 +1564,21 @@ func (*WantDHCP6PdReplyEvents) GetMessageType() api.MessageType {
        return api.RequestMessage
 }
 
-func (m *WantDHCP6PdReplyEvents) Size() int {
+func (m *WantDHCP6PdReplyEvents) Size() (size int) {
        if m == nil {
                return 0
        }
-       var size int
        size += 1 // m.EnableDisable
        size += 4 // m.PID
        return size
 }
 func (m *WantDHCP6PdReplyEvents) 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.EnableDisable)
-       buf.EncodeUint32(uint32(m.PID))
+       buf.EncodeUint32(m.PID)
        return buf.Bytes(), nil
 }
 func (m *WantDHCP6PdReplyEvents) Unmarshal(b []byte) error {
@@ -1676,27 +1602,24 @@ func (*WantDHCP6PdReplyEventsReply) GetMessageType() api.MessageType {
        return api.ReplyMessage
 }
 
-func (m *WantDHCP6PdReplyEventsReply) Size() int {
+func (m *WantDHCP6PdReplyEventsReply) Size() (size int) {
        if m == nil {
                return 0
        }
-       var size int
        size += 4 // m.Retval
        return size
 }
 func (m *WantDHCP6PdReplyEventsReply) 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 *WantDHCP6PdReplyEventsReply) Unmarshal(b []byte) error {
        buf := codec.NewBuffer(b)
-       m.Retval = int32(buf.DecodeUint32())
+       m.Retval = buf.DecodeInt32()
        return nil
 }
 
@@ -1713,24 +1636,21 @@ func (*WantDHCP6ReplyEvents) GetMessageType() api.MessageType {
        return api.RequestMessage
 }
 
-func (m *WantDHCP6ReplyEvents) Size() int {
+func (m *WantDHCP6ReplyEvents) Size() (size int) {
        if m == nil {
                return 0
        }
-       var size int
        size += 1 // m.EnableDisable
        size += 4 // m.PID
        return size
 }
 func (m *WantDHCP6ReplyEvents) 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.EncodeUint8(uint8(m.EnableDisable))
-       buf.EncodeUint32(uint32(m.PID))
+       buf := codec.NewBuffer(b)
+       buf.EncodeUint8(m.EnableDisable)
+       buf.EncodeUint32(m.PID)
        return buf.Bytes(), nil
 }
 func (m *WantDHCP6ReplyEvents) Unmarshal(b []byte) error {
@@ -1752,27 +1672,24 @@ func (*WantDHCP6ReplyEventsReply) GetMessageType() api.MessageType {
        return api.ReplyMessage
 }
 
-func (m *WantDHCP6ReplyEventsReply) Size() int {
+func (m *WantDHCP6ReplyEventsReply) Size() (size int) {
        if m == nil {
                return 0
        }
-       var size int
        size += 4 // m.Retval
        return size
 }
 func (m *WantDHCP6ReplyEventsReply) 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 *WantDHCP6ReplyEventsReply) Unmarshal(b []byte) error {
        buf := codec.NewBuffer(b)
-       m.Retval = int32(buf.DecodeUint32())
+       m.Retval = buf.DecodeInt32()
        return nil
 }
 
@@ -1782,24 +1699,24 @@ func file_dhcp_binapi_init() {
        api.RegisterMessage((*DHCP6ClientsEnableDisableReply)(nil), "dhcp6_clients_enable_disable_reply_e8d4e804")
        api.RegisterMessage((*DHCP6DuidLlSet)(nil), "dhcp6_duid_ll_set_0f6ca323")
        api.RegisterMessage((*DHCP6DuidLlSetReply)(nil), "dhcp6_duid_ll_set_reply_e8d4e804")
-       api.RegisterMessage((*DHCP6PdReplyEvent)(nil), "dhcp6_pd_reply_event_cb3e462b")
-       api.RegisterMessage((*DHCP6PdSendClientMessage)(nil), "dhcp6_pd_send_client_message_064badb8")
+       api.RegisterMessage((*DHCP6PdReplyEvent)(nil), "dhcp6_pd_reply_event_5e878029")
+       api.RegisterMessage((*DHCP6PdSendClientMessage)(nil), "dhcp6_pd_send_client_message_3739fd8d")
        api.RegisterMessage((*DHCP6PdSendClientMessageReply)(nil), "dhcp6_pd_send_client_message_reply_e8d4e804")
-       api.RegisterMessage((*DHCP6ReplyEvent)(nil), "dhcp6_reply_event_9f3af9e5")
-       api.RegisterMessage((*DHCP6SendClientMessage)(nil), "dhcp6_send_client_message_f6f14ef0")
+       api.RegisterMessage((*DHCP6ReplyEvent)(nil), "dhcp6_reply_event_85b7b17e")
+       api.RegisterMessage((*DHCP6SendClientMessage)(nil), "dhcp6_send_client_message_f8222476")
        api.RegisterMessage((*DHCP6SendClientMessageReply)(nil), "dhcp6_send_client_message_reply_e8d4e804")
-       api.RegisterMessage((*DHCPClientConfig)(nil), "dhcp_client_config_959b80a3")
+       api.RegisterMessage((*DHCPClientConfig)(nil), "dhcp_client_config_1af013ea")
        api.RegisterMessage((*DHCPClientConfigReply)(nil), "dhcp_client_config_reply_e8d4e804")
-       api.RegisterMessage((*DHCPClientDetails)(nil), "dhcp_client_details_acd82f5a")
+       api.RegisterMessage((*DHCPClientDetails)(nil), "dhcp_client_details_3c5cd28a")
        api.RegisterMessage((*DHCPClientDump)(nil), "dhcp_client_dump_51077d14")
-       api.RegisterMessage((*DHCPComplEvent)(nil), "dhcp_compl_event_e908fd1d")
+       api.RegisterMessage((*DHCPComplEvent)(nil), "dhcp_compl_event_554a44e5")
        api.RegisterMessage((*DHCPPluginControlPing)(nil), "dhcp_plugin_control_ping_51077d14")
        api.RegisterMessage((*DHCPPluginControlPingReply)(nil), "dhcp_plugin_control_ping_reply_f6b0b8ca")
        api.RegisterMessage((*DHCPPluginGetVersion)(nil), "dhcp_plugin_get_version_51077d14")
        api.RegisterMessage((*DHCPPluginGetVersionReply)(nil), "dhcp_plugin_get_version_reply_9b32cf86")
-       api.RegisterMessage((*DHCPProxyConfig)(nil), "dhcp_proxy_config_6767230e")
+       api.RegisterMessage((*DHCPProxyConfig)(nil), "dhcp_proxy_config_4058a689")
        api.RegisterMessage((*DHCPProxyConfigReply)(nil), "dhcp_proxy_config_reply_e8d4e804")
-       api.RegisterMessage((*DHCPProxyDetails)(nil), "dhcp_proxy_details_ce16f044")
+       api.RegisterMessage((*DHCPProxyDetails)(nil), "dhcp_proxy_details_dcbaf540")
        api.RegisterMessage((*DHCPProxyDump)(nil), "dhcp_proxy_dump_5c5b063f")
        api.RegisterMessage((*DHCPProxySetVss)(nil), "dhcp_proxy_set_vss_50537301")
        api.RegisterMessage((*DHCPProxySetVssReply)(nil), "dhcp_proxy_set_vss_reply_e8d4e804")