From d8288e154cfb7d757e039d3a707d67ac4a0c5e49 Mon Sep 17 00:00:00 2001 From: Nathan Skrzypczak Date: Tue, 13 Dec 2022 15:38:36 +0100 Subject: [PATCH] vpp: upgrade to 77488ae02ae56911d65d72e8df6ca793876c5317 (13 dec 22) This upgrade includes : * 4561d6d25 - (7 weeks ago) devices: fix the l2 hdr offset in af_packet transmit side - Mohsin Kazmi * a6d16b713 - (8 weeks ago) avf: support generic flow - Ting Xu * 6db275861 - (3 weeks ago) rdma: fix for-loop initialization in scalar path - Jieqiang Wang * 186798270 - (3 months ago) rdma: set correct CQE flags - Jieqiang Wang * bf93670c5 - (3 months ago) rdma: fix ipv4 checksum check in rdma-input node - Jieqiang Wang * 5efc0cdf4 - (7 weeks ago) virtio: use current_data as l2_hdr_offset - Mohsin Kazmi * 4897257db - (8 weeks ago) gso: remove vxlan header include file dependency - Steven Luong Signed-off-by: Nathan Skrzypczak --- vpplink/binapi/vpp_clone_current.sh | 2 +- vpplink/binapi/vppapi/generate.log | 4 +- vpplink/binapi/vppapi/ipsec/ipsec.ba.go | 1 + vpplink/binapi/vppapi/nat44_ed/nat44_ed.ba.go | 764 +----------------- .../binapi/vppapi/nat44_ed/nat44_ed_rpc.ba.go | 90 --- 5 files changed, 6 insertions(+), 855 deletions(-) diff --git a/vpplink/binapi/vpp_clone_current.sh b/vpplink/binapi/vpp_clone_current.sh index 5c4d70c8..de3a9ae8 100755 --- a/vpplink/binapi/vpp_clone_current.sh +++ b/vpplink/binapi/vpp_clone_current.sh @@ -84,7 +84,7 @@ function git_clone_cd_and_reset () # --------------- Things to cherry pick --------------- -git_clone_cd_and_reset "$1" 8b90d89b05322ceaaf57e0eda403c4f92546f7b3 +git_clone_cd_and_reset "$1" e416893a597959509c7f667c140c271c0bb78c14 git_cherry_pick refs/changes/13/34713/4 # 34713: vppinfra: improve & test abstract socket | https://gerrit.fd.io/r/c/vpp/+/34713 git_cherry_pick refs/changes/71/32271/16 # 32271: memif: add support for ns abstract sockets | https://gerrit.fd.io/r/c/vpp/+/32271 diff --git a/vpplink/binapi/vppapi/generate.log b/vpplink/binapi/vppapi/generate.log index a138dc59..6399ce7e 100644 --- a/vpplink/binapi/vppapi/generate.log +++ b/vpplink/binapi/vppapi/generate.log @@ -1,6 +1,6 @@ -VPP Version : 23.02-rc0~81-g1abb2ae46 +VPP Version : 23.02-rc0~185-g77488ae02 Binapi-generator version : govpp v0.6.0-dev -VPP Base commit : 8b90d89b0 devices: add support for af-packet v2 +VPP Base commit : e416893a5 tests: tapv2, tunv2 and af_packet interface tests for vpp ------------------ Cherry picked commits -------------------- gerrit:28513/28 capo: Calico Policies plugin gerrit:28083/21 acl: acl-plugin custom policies diff --git a/vpplink/binapi/vppapi/ipsec/ipsec.ba.go b/vpplink/binapi/vppapi/ipsec/ipsec.ba.go index 03e3b3b7..282e80cf 100644 --- a/vpplink/binapi/vppapi/ipsec/ipsec.ba.go +++ b/vpplink/binapi/vppapi/ipsec/ipsec.ba.go @@ -1898,6 +1898,7 @@ func (m *IpsecSpdEntryAddDel) Unmarshal(b []byte) error { } // IpsecSpdEntryAddDelReply defines message 'ipsec_spd_entry_add_del_reply'. +// Deprecated: the message will be removed in the future versions type IpsecSpdEntryAddDelReply struct { Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"` StatIndex uint32 `binapi:"u32,name=stat_index" json:"stat_index,omitempty"` diff --git a/vpplink/binapi/vppapi/nat44_ed/nat44_ed.ba.go b/vpplink/binapi/vppapi/nat44_ed/nat44_ed.ba.go index 70ebcc52..ca329062 100644 --- a/vpplink/binapi/vppapi/nat44_ed/nat44_ed.ba.go +++ b/vpplink/binapi/vppapi/nat44_ed/nat44_ed.ba.go @@ -6,7 +6,7 @@ // // 1 enum // 1 struct -// 92 messages +// 73 messages package nat44_ed import ( @@ -28,7 +28,7 @@ const _ = api.GoVppAPIPackageIsVersion2 const ( APIFile = "nat44_ed" APIVersion = "5.5.0" - VersionCrc = 0x89b1d9d3 + VersionCrc = 0x354f61c0 ) // Nat44ConfigFlags defines enum 'nat44_config_flags'. @@ -849,78 +849,6 @@ func (m *Nat44DelSessionReply) Unmarshal(b []byte) error { return nil } -// Nat44DelUser defines message 'nat44_del_user'. -// Deprecated: the message will be removed in the future versions -type Nat44DelUser struct { - IPAddress ip_types.IP4Address `binapi:"ip4_address,name=ip_address" json:"ip_address,omitempty"` - FibIndex uint32 `binapi:"u32,name=fib_index" json:"fib_index,omitempty"` -} - -func (m *Nat44DelUser) Reset() { *m = Nat44DelUser{} } -func (*Nat44DelUser) GetMessageName() string { return "nat44_del_user" } -func (*Nat44DelUser) GetCrcString() string { return "99a9f998" } -func (*Nat44DelUser) GetMessageType() api.MessageType { - return api.RequestMessage -} - -func (m *Nat44DelUser) Size() (size int) { - if m == nil { - return 0 - } - size += 1 * 4 // m.IPAddress - size += 4 // m.FibIndex - return size -} -func (m *Nat44DelUser) Marshal(b []byte) ([]byte, error) { - if b == nil { - b = make([]byte, m.Size()) - } - buf := codec.NewBuffer(b) - buf.EncodeBytes(m.IPAddress[:], 4) - buf.EncodeUint32(m.FibIndex) - return buf.Bytes(), nil -} -func (m *Nat44DelUser) Unmarshal(b []byte) error { - buf := codec.NewBuffer(b) - copy(m.IPAddress[:], buf.DecodeBytes(4)) - m.FibIndex = buf.DecodeUint32() - return nil -} - -// Nat44DelUserReply defines message 'nat44_del_user_reply'. -// Deprecated: the message will be removed in the future versions -type Nat44DelUserReply struct { - Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"` -} - -func (m *Nat44DelUserReply) Reset() { *m = Nat44DelUserReply{} } -func (*Nat44DelUserReply) GetMessageName() string { return "nat44_del_user_reply" } -func (*Nat44DelUserReply) GetCrcString() string { return "e8d4e804" } -func (*Nat44DelUserReply) GetMessageType() api.MessageType { - return api.ReplyMessage -} - -func (m *Nat44DelUserReply) Size() (size int) { - if m == nil { - return 0 - } - size += 4 // m.Retval - return size -} -func (m *Nat44DelUserReply) 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 *Nat44DelUserReply) Unmarshal(b []byte) error { - buf := codec.NewBuffer(b) - m.Retval = buf.DecodeInt32() - return nil -} - // Nat44EdAddDelOutputInterface defines message 'nat44_ed_add_del_output_interface'. type Nat44EdAddDelOutputInterface struct { IsAdd bool `binapi:"bool,name=is_add" json:"is_add,omitempty"` @@ -2826,94 +2754,6 @@ func (m *Nat44UserSessionV3Dump) Unmarshal(b []byte) error { return nil } -// NatGetAddrAndPortAllocAlg defines message 'nat_get_addr_and_port_alloc_alg'. -// Deprecated: the message will be removed in the future versions -type NatGetAddrAndPortAllocAlg struct{} - -func (m *NatGetAddrAndPortAllocAlg) Reset() { *m = NatGetAddrAndPortAllocAlg{} } -func (*NatGetAddrAndPortAllocAlg) GetMessageName() string { return "nat_get_addr_and_port_alloc_alg" } -func (*NatGetAddrAndPortAllocAlg) GetCrcString() string { return "51077d14" } -func (*NatGetAddrAndPortAllocAlg) GetMessageType() api.MessageType { - return api.RequestMessage -} - -func (m *NatGetAddrAndPortAllocAlg) Size() (size int) { - if m == nil { - return 0 - } - return size -} -func (m *NatGetAddrAndPortAllocAlg) Marshal(b []byte) ([]byte, error) { - if b == nil { - b = make([]byte, m.Size()) - } - buf := codec.NewBuffer(b) - return buf.Bytes(), nil -} -func (m *NatGetAddrAndPortAllocAlg) Unmarshal(b []byte) error { - return nil -} - -// NatGetAddrAndPortAllocAlgReply defines message 'nat_get_addr_and_port_alloc_alg_reply'. -// Deprecated: the message will be removed in the future versions -type NatGetAddrAndPortAllocAlgReply struct { - Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"` - Alg uint8 `binapi:"u8,name=alg" json:"alg,omitempty"` - PsidOffset uint8 `binapi:"u8,name=psid_offset" json:"psid_offset,omitempty"` - PsidLength uint8 `binapi:"u8,name=psid_length" json:"psid_length,omitempty"` - Psid uint16 `binapi:"u16,name=psid" json:"psid,omitempty"` - StartPort uint16 `binapi:"u16,name=start_port" json:"start_port,omitempty"` - EndPort uint16 `binapi:"u16,name=end_port" json:"end_port,omitempty"` -} - -func (m *NatGetAddrAndPortAllocAlgReply) Reset() { *m = NatGetAddrAndPortAllocAlgReply{} } -func (*NatGetAddrAndPortAllocAlgReply) GetMessageName() string { - return "nat_get_addr_and_port_alloc_alg_reply" -} -func (*NatGetAddrAndPortAllocAlgReply) GetCrcString() string { return "3607a7d0" } -func (*NatGetAddrAndPortAllocAlgReply) GetMessageType() api.MessageType { - return api.ReplyMessage -} - -func (m *NatGetAddrAndPortAllocAlgReply) Size() (size int) { - if m == nil { - return 0 - } - size += 4 // m.Retval - size += 1 // m.Alg - size += 1 // m.PsidOffset - size += 1 // m.PsidLength - size += 2 // m.Psid - size += 2 // m.StartPort - size += 2 // m.EndPort - return size -} -func (m *NatGetAddrAndPortAllocAlgReply) Marshal(b []byte) ([]byte, error) { - if b == nil { - b = make([]byte, m.Size()) - } - buf := codec.NewBuffer(b) - buf.EncodeInt32(m.Retval) - buf.EncodeUint8(m.Alg) - buf.EncodeUint8(m.PsidOffset) - buf.EncodeUint8(m.PsidLength) - buf.EncodeUint16(m.Psid) - buf.EncodeUint16(m.StartPort) - buf.EncodeUint16(m.EndPort) - return buf.Bytes(), nil -} -func (m *NatGetAddrAndPortAllocAlgReply) Unmarshal(b []byte) error { - buf := codec.NewBuffer(b) - m.Retval = buf.DecodeInt32() - m.Alg = buf.DecodeUint8() - m.PsidOffset = buf.DecodeUint8() - m.PsidLength = buf.DecodeUint8() - m.Psid = buf.DecodeUint16() - m.StartPort = buf.DecodeUint16() - m.EndPort = buf.DecodeUint16() - return nil -} - // NatGetMssClamping defines message 'nat_get_mss_clamping'. type NatGetMssClamping struct{} @@ -2982,478 +2822,6 @@ func (m *NatGetMssClampingReply) Unmarshal(b []byte) error { return nil } -// NatHaFlush defines message 'nat_ha_flush'. -// Deprecated: the message will be removed in the future versions -type NatHaFlush struct{} - -func (m *NatHaFlush) Reset() { *m = NatHaFlush{} } -func (*NatHaFlush) GetMessageName() string { return "nat_ha_flush" } -func (*NatHaFlush) GetCrcString() string { return "51077d14" } -func (*NatHaFlush) GetMessageType() api.MessageType { - return api.RequestMessage -} - -func (m *NatHaFlush) Size() (size int) { - if m == nil { - return 0 - } - return size -} -func (m *NatHaFlush) Marshal(b []byte) ([]byte, error) { - if b == nil { - b = make([]byte, m.Size()) - } - buf := codec.NewBuffer(b) - return buf.Bytes(), nil -} -func (m *NatHaFlush) Unmarshal(b []byte) error { - return nil -} - -// NatHaFlushReply defines message 'nat_ha_flush_reply'. -// Deprecated: the message will be removed in the future versions -type NatHaFlushReply struct { - Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"` -} - -func (m *NatHaFlushReply) Reset() { *m = NatHaFlushReply{} } -func (*NatHaFlushReply) GetMessageName() string { return "nat_ha_flush_reply" } -func (*NatHaFlushReply) GetCrcString() string { return "e8d4e804" } -func (*NatHaFlushReply) GetMessageType() api.MessageType { - return api.ReplyMessage -} - -func (m *NatHaFlushReply) Size() (size int) { - if m == nil { - return 0 - } - size += 4 // m.Retval - return size -} -func (m *NatHaFlushReply) 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 *NatHaFlushReply) Unmarshal(b []byte) error { - buf := codec.NewBuffer(b) - m.Retval = buf.DecodeInt32() - return nil -} - -// NatHaGetFailover defines message 'nat_ha_get_failover'. -// Deprecated: the message will be removed in the future versions -type NatHaGetFailover struct{} - -func (m *NatHaGetFailover) Reset() { *m = NatHaGetFailover{} } -func (*NatHaGetFailover) GetMessageName() string { return "nat_ha_get_failover" } -func (*NatHaGetFailover) GetCrcString() string { return "51077d14" } -func (*NatHaGetFailover) GetMessageType() api.MessageType { - return api.RequestMessage -} - -func (m *NatHaGetFailover) Size() (size int) { - if m == nil { - return 0 - } - return size -} -func (m *NatHaGetFailover) Marshal(b []byte) ([]byte, error) { - if b == nil { - b = make([]byte, m.Size()) - } - buf := codec.NewBuffer(b) - return buf.Bytes(), nil -} -func (m *NatHaGetFailover) Unmarshal(b []byte) error { - return nil -} - -// NatHaGetFailoverReply defines message 'nat_ha_get_failover_reply'. -// Deprecated: the message will be removed in the future versions -type NatHaGetFailoverReply struct { - Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"` - IPAddress ip_types.IP4Address `binapi:"ip4_address,name=ip_address" json:"ip_address,omitempty"` - Port uint16 `binapi:"u16,name=port" json:"port,omitempty"` - SessionRefreshInterval uint32 `binapi:"u32,name=session_refresh_interval" json:"session_refresh_interval,omitempty"` -} - -func (m *NatHaGetFailoverReply) Reset() { *m = NatHaGetFailoverReply{} } -func (*NatHaGetFailoverReply) GetMessageName() string { return "nat_ha_get_failover_reply" } -func (*NatHaGetFailoverReply) GetCrcString() string { return "a67d8752" } -func (*NatHaGetFailoverReply) GetMessageType() api.MessageType { - return api.ReplyMessage -} - -func (m *NatHaGetFailoverReply) Size() (size int) { - if m == nil { - return 0 - } - size += 4 // m.Retval - size += 1 * 4 // m.IPAddress - size += 2 // m.Port - size += 4 // m.SessionRefreshInterval - return size -} -func (m *NatHaGetFailoverReply) Marshal(b []byte) ([]byte, error) { - if b == nil { - b = make([]byte, m.Size()) - } - buf := codec.NewBuffer(b) - buf.EncodeInt32(m.Retval) - buf.EncodeBytes(m.IPAddress[:], 4) - buf.EncodeUint16(m.Port) - buf.EncodeUint32(m.SessionRefreshInterval) - return buf.Bytes(), nil -} -func (m *NatHaGetFailoverReply) Unmarshal(b []byte) error { - buf := codec.NewBuffer(b) - m.Retval = buf.DecodeInt32() - copy(m.IPAddress[:], buf.DecodeBytes(4)) - m.Port = buf.DecodeUint16() - m.SessionRefreshInterval = buf.DecodeUint32() - return nil -} - -// NatHaGetListener defines message 'nat_ha_get_listener'. -// Deprecated: the message will be removed in the future versions -type NatHaGetListener struct{} - -func (m *NatHaGetListener) Reset() { *m = NatHaGetListener{} } -func (*NatHaGetListener) GetMessageName() string { return "nat_ha_get_listener" } -func (*NatHaGetListener) GetCrcString() string { return "51077d14" } -func (*NatHaGetListener) GetMessageType() api.MessageType { - return api.RequestMessage -} - -func (m *NatHaGetListener) Size() (size int) { - if m == nil { - return 0 - } - return size -} -func (m *NatHaGetListener) Marshal(b []byte) ([]byte, error) { - if b == nil { - b = make([]byte, m.Size()) - } - buf := codec.NewBuffer(b) - return buf.Bytes(), nil -} -func (m *NatHaGetListener) Unmarshal(b []byte) error { - return nil -} - -// NatHaGetListenerReply defines message 'nat_ha_get_listener_reply'. -// Deprecated: the message will be removed in the future versions -type NatHaGetListenerReply struct { - Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"` - IPAddress ip_types.IP4Address `binapi:"ip4_address,name=ip_address" json:"ip_address,omitempty"` - Port uint16 `binapi:"u16,name=port" json:"port,omitempty"` - PathMtu uint32 `binapi:"u32,name=path_mtu" json:"path_mtu,omitempty"` -} - -func (m *NatHaGetListenerReply) Reset() { *m = NatHaGetListenerReply{} } -func (*NatHaGetListenerReply) GetMessageName() string { return "nat_ha_get_listener_reply" } -func (*NatHaGetListenerReply) GetCrcString() string { return "123ea41f" } -func (*NatHaGetListenerReply) GetMessageType() api.MessageType { - return api.ReplyMessage -} - -func (m *NatHaGetListenerReply) Size() (size int) { - if m == nil { - return 0 - } - size += 4 // m.Retval - size += 1 * 4 // m.IPAddress - size += 2 // m.Port - size += 4 // m.PathMtu - return size -} -func (m *NatHaGetListenerReply) Marshal(b []byte) ([]byte, error) { - if b == nil { - b = make([]byte, m.Size()) - } - buf := codec.NewBuffer(b) - buf.EncodeInt32(m.Retval) - buf.EncodeBytes(m.IPAddress[:], 4) - buf.EncodeUint16(m.Port) - buf.EncodeUint32(m.PathMtu) - return buf.Bytes(), nil -} -func (m *NatHaGetListenerReply) Unmarshal(b []byte) error { - buf := codec.NewBuffer(b) - m.Retval = buf.DecodeInt32() - copy(m.IPAddress[:], buf.DecodeBytes(4)) - m.Port = buf.DecodeUint16() - m.PathMtu = buf.DecodeUint32() - return nil -} - -// NatHaResync defines message 'nat_ha_resync'. -// Deprecated: the message will be removed in the future versions -type NatHaResync struct { - WantResyncEvent uint8 `binapi:"u8,name=want_resync_event" json:"want_resync_event,omitempty"` - PID uint32 `binapi:"u32,name=pid" json:"pid,omitempty"` -} - -func (m *NatHaResync) Reset() { *m = NatHaResync{} } -func (*NatHaResync) GetMessageName() string { return "nat_ha_resync" } -func (*NatHaResync) GetCrcString() string { return "c8ab9e03" } -func (*NatHaResync) GetMessageType() api.MessageType { - return api.RequestMessage -} - -func (m *NatHaResync) Size() (size int) { - if m == nil { - return 0 - } - size += 1 // m.WantResyncEvent - size += 4 // m.PID - return size -} -func (m *NatHaResync) Marshal(b []byte) ([]byte, error) { - if b == nil { - b = make([]byte, m.Size()) - } - buf := codec.NewBuffer(b) - buf.EncodeUint8(m.WantResyncEvent) - buf.EncodeUint32(m.PID) - return buf.Bytes(), nil -} -func (m *NatHaResync) Unmarshal(b []byte) error { - buf := codec.NewBuffer(b) - m.WantResyncEvent = buf.DecodeUint8() - m.PID = buf.DecodeUint32() - return nil -} - -// NatHaResyncCompletedEvent defines message 'nat_ha_resync_completed_event'. -// Deprecated: the message will be removed in the future versions -type NatHaResyncCompletedEvent struct { - PID uint32 `binapi:"u32,name=pid" json:"pid,omitempty"` - MissedCount uint32 `binapi:"u32,name=missed_count" json:"missed_count,omitempty"` -} - -func (m *NatHaResyncCompletedEvent) Reset() { *m = NatHaResyncCompletedEvent{} } -func (*NatHaResyncCompletedEvent) GetMessageName() string { return "nat_ha_resync_completed_event" } -func (*NatHaResyncCompletedEvent) GetCrcString() string { return "fdc598fb" } -func (*NatHaResyncCompletedEvent) GetMessageType() api.MessageType { - return api.EventMessage -} - -func (m *NatHaResyncCompletedEvent) Size() (size int) { - if m == nil { - return 0 - } - size += 4 // m.PID - size += 4 // m.MissedCount - return size -} -func (m *NatHaResyncCompletedEvent) Marshal(b []byte) ([]byte, error) { - if b == nil { - b = make([]byte, m.Size()) - } - buf := codec.NewBuffer(b) - buf.EncodeUint32(m.PID) - buf.EncodeUint32(m.MissedCount) - return buf.Bytes(), nil -} -func (m *NatHaResyncCompletedEvent) Unmarshal(b []byte) error { - buf := codec.NewBuffer(b) - m.PID = buf.DecodeUint32() - m.MissedCount = buf.DecodeUint32() - return nil -} - -// NatHaResyncReply defines message 'nat_ha_resync_reply'. -// Deprecated: the message will be removed in the future versions -type NatHaResyncReply struct { - Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"` -} - -func (m *NatHaResyncReply) Reset() { *m = NatHaResyncReply{} } -func (*NatHaResyncReply) GetMessageName() string { return "nat_ha_resync_reply" } -func (*NatHaResyncReply) GetCrcString() string { return "e8d4e804" } -func (*NatHaResyncReply) GetMessageType() api.MessageType { - return api.ReplyMessage -} - -func (m *NatHaResyncReply) Size() (size int) { - if m == nil { - return 0 - } - size += 4 // m.Retval - return size -} -func (m *NatHaResyncReply) 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 *NatHaResyncReply) Unmarshal(b []byte) error { - buf := codec.NewBuffer(b) - m.Retval = buf.DecodeInt32() - return nil -} - -// NatHaSetFailover defines message 'nat_ha_set_failover'. -// Deprecated: the message will be removed in the future versions -type NatHaSetFailover struct { - IPAddress ip_types.IP4Address `binapi:"ip4_address,name=ip_address" json:"ip_address,omitempty"` - Port uint16 `binapi:"u16,name=port" json:"port,omitempty"` - SessionRefreshInterval uint32 `binapi:"u32,name=session_refresh_interval" json:"session_refresh_interval,omitempty"` -} - -func (m *NatHaSetFailover) Reset() { *m = NatHaSetFailover{} } -func (*NatHaSetFailover) GetMessageName() string { return "nat_ha_set_failover" } -func (*NatHaSetFailover) GetCrcString() string { return "718246af" } -func (*NatHaSetFailover) GetMessageType() api.MessageType { - return api.RequestMessage -} - -func (m *NatHaSetFailover) Size() (size int) { - if m == nil { - return 0 - } - size += 1 * 4 // m.IPAddress - size += 2 // m.Port - size += 4 // m.SessionRefreshInterval - return size -} -func (m *NatHaSetFailover) Marshal(b []byte) ([]byte, error) { - if b == nil { - b = make([]byte, m.Size()) - } - buf := codec.NewBuffer(b) - buf.EncodeBytes(m.IPAddress[:], 4) - buf.EncodeUint16(m.Port) - buf.EncodeUint32(m.SessionRefreshInterval) - return buf.Bytes(), nil -} -func (m *NatHaSetFailover) Unmarshal(b []byte) error { - buf := codec.NewBuffer(b) - copy(m.IPAddress[:], buf.DecodeBytes(4)) - m.Port = buf.DecodeUint16() - m.SessionRefreshInterval = buf.DecodeUint32() - return nil -} - -// NatHaSetFailoverReply defines message 'nat_ha_set_failover_reply'. -// Deprecated: the message will be removed in the future versions -type NatHaSetFailoverReply struct { - Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"` -} - -func (m *NatHaSetFailoverReply) Reset() { *m = NatHaSetFailoverReply{} } -func (*NatHaSetFailoverReply) GetMessageName() string { return "nat_ha_set_failover_reply" } -func (*NatHaSetFailoverReply) GetCrcString() string { return "e8d4e804" } -func (*NatHaSetFailoverReply) GetMessageType() api.MessageType { - return api.ReplyMessage -} - -func (m *NatHaSetFailoverReply) Size() (size int) { - if m == nil { - return 0 - } - size += 4 // m.Retval - return size -} -func (m *NatHaSetFailoverReply) 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 *NatHaSetFailoverReply) Unmarshal(b []byte) error { - buf := codec.NewBuffer(b) - m.Retval = buf.DecodeInt32() - return nil -} - -// NatHaSetListener defines message 'nat_ha_set_listener'. -// Deprecated: the message will be removed in the future versions -type NatHaSetListener struct { - IPAddress ip_types.IP4Address `binapi:"ip4_address,name=ip_address" json:"ip_address,omitempty"` - Port uint16 `binapi:"u16,name=port" json:"port,omitempty"` - PathMtu uint32 `binapi:"u32,name=path_mtu" json:"path_mtu,omitempty"` -} - -func (m *NatHaSetListener) Reset() { *m = NatHaSetListener{} } -func (*NatHaSetListener) GetMessageName() string { return "nat_ha_set_listener" } -func (*NatHaSetListener) GetCrcString() string { return "e4a8cb4e" } -func (*NatHaSetListener) GetMessageType() api.MessageType { - return api.RequestMessage -} - -func (m *NatHaSetListener) Size() (size int) { - if m == nil { - return 0 - } - size += 1 * 4 // m.IPAddress - size += 2 // m.Port - size += 4 // m.PathMtu - return size -} -func (m *NatHaSetListener) Marshal(b []byte) ([]byte, error) { - if b == nil { - b = make([]byte, m.Size()) - } - buf := codec.NewBuffer(b) - buf.EncodeBytes(m.IPAddress[:], 4) - buf.EncodeUint16(m.Port) - buf.EncodeUint32(m.PathMtu) - return buf.Bytes(), nil -} -func (m *NatHaSetListener) Unmarshal(b []byte) error { - buf := codec.NewBuffer(b) - copy(m.IPAddress[:], buf.DecodeBytes(4)) - m.Port = buf.DecodeUint16() - m.PathMtu = buf.DecodeUint32() - return nil -} - -// NatHaSetListenerReply defines message 'nat_ha_set_listener_reply'. -// Deprecated: the message will be removed in the future versions -type NatHaSetListenerReply struct { - Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"` -} - -func (m *NatHaSetListenerReply) Reset() { *m = NatHaSetListenerReply{} } -func (*NatHaSetListenerReply) GetMessageName() string { return "nat_ha_set_listener_reply" } -func (*NatHaSetListenerReply) GetCrcString() string { return "e8d4e804" } -func (*NatHaSetListenerReply) GetMessageType() api.MessageType { - return api.ReplyMessage -} - -func (m *NatHaSetListenerReply) Size() (size int) { - if m == nil { - return 0 - } - size += 4 // m.Retval - return size -} -func (m *NatHaSetListenerReply) 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 *NatHaSetListenerReply) Unmarshal(b []byte) error { - buf := codec.NewBuffer(b) - m.Retval = buf.DecodeInt32() - return nil -} - // NatIpfixEnableDisable defines message 'nat_ipfix_enable_disable'. // Deprecated: the message will be removed in the future versions type NatIpfixEnableDisable struct { @@ -3530,96 +2898,6 @@ func (m *NatIpfixEnableDisableReply) Unmarshal(b []byte) error { return nil } -// NatSetAddrAndPortAllocAlg defines message 'nat_set_addr_and_port_alloc_alg'. -// Deprecated: the message will be removed in the future versions -type NatSetAddrAndPortAllocAlg struct { - Alg uint8 `binapi:"u8,name=alg" json:"alg,omitempty"` - PsidOffset uint8 `binapi:"u8,name=psid_offset" json:"psid_offset,omitempty"` - PsidLength uint8 `binapi:"u8,name=psid_length" json:"psid_length,omitempty"` - Psid uint16 `binapi:"u16,name=psid" json:"psid,omitempty"` - StartPort uint16 `binapi:"u16,name=start_port" json:"start_port,omitempty"` - EndPort uint16 `binapi:"u16,name=end_port" json:"end_port,omitempty"` -} - -func (m *NatSetAddrAndPortAllocAlg) Reset() { *m = NatSetAddrAndPortAllocAlg{} } -func (*NatSetAddrAndPortAllocAlg) GetMessageName() string { return "nat_set_addr_and_port_alloc_alg" } -func (*NatSetAddrAndPortAllocAlg) GetCrcString() string { return "deeb746f" } -func (*NatSetAddrAndPortAllocAlg) GetMessageType() api.MessageType { - return api.RequestMessage -} - -func (m *NatSetAddrAndPortAllocAlg) Size() (size int) { - if m == nil { - return 0 - } - size += 1 // m.Alg - size += 1 // m.PsidOffset - size += 1 // m.PsidLength - size += 2 // m.Psid - size += 2 // m.StartPort - size += 2 // m.EndPort - return size -} -func (m *NatSetAddrAndPortAllocAlg) Marshal(b []byte) ([]byte, error) { - if b == nil { - b = make([]byte, m.Size()) - } - buf := codec.NewBuffer(b) - buf.EncodeUint8(m.Alg) - buf.EncodeUint8(m.PsidOffset) - buf.EncodeUint8(m.PsidLength) - buf.EncodeUint16(m.Psid) - buf.EncodeUint16(m.StartPort) - buf.EncodeUint16(m.EndPort) - return buf.Bytes(), nil -} -func (m *NatSetAddrAndPortAllocAlg) Unmarshal(b []byte) error { - buf := codec.NewBuffer(b) - m.Alg = buf.DecodeUint8() - m.PsidOffset = buf.DecodeUint8() - m.PsidLength = buf.DecodeUint8() - m.Psid = buf.DecodeUint16() - m.StartPort = buf.DecodeUint16() - m.EndPort = buf.DecodeUint16() - return nil -} - -// NatSetAddrAndPortAllocAlgReply defines message 'nat_set_addr_and_port_alloc_alg_reply'. -// Deprecated: the message will be removed in the future versions -type NatSetAddrAndPortAllocAlgReply struct { - Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"` -} - -func (m *NatSetAddrAndPortAllocAlgReply) Reset() { *m = NatSetAddrAndPortAllocAlgReply{} } -func (*NatSetAddrAndPortAllocAlgReply) GetMessageName() string { - return "nat_set_addr_and_port_alloc_alg_reply" -} -func (*NatSetAddrAndPortAllocAlgReply) GetCrcString() string { return "e8d4e804" } -func (*NatSetAddrAndPortAllocAlgReply) GetMessageType() api.MessageType { - return api.ReplyMessage -} - -func (m *NatSetAddrAndPortAllocAlgReply) Size() (size int) { - if m == nil { - return 0 - } - size += 4 // m.Retval - return size -} -func (m *NatSetAddrAndPortAllocAlgReply) 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 *NatSetAddrAndPortAllocAlgReply) Unmarshal(b []byte) error { - buf := codec.NewBuffer(b) - m.Retval = buf.DecodeInt32() - return nil -} - // NatSetMssClamping defines message 'nat_set_mss_clamping'. type NatSetMssClamping struct { MssValue uint16 `binapi:"u16,name=mss_value" json:"mss_value,omitempty"` @@ -3922,8 +3200,6 @@ func file_nat44_ed_binapi_init() { api.RegisterMessage((*Nat44AddressDump)(nil), "nat44_address_dump_51077d14") api.RegisterMessage((*Nat44DelSession)(nil), "nat44_del_session_15a5bf8c") api.RegisterMessage((*Nat44DelSessionReply)(nil), "nat44_del_session_reply_e8d4e804") - api.RegisterMessage((*Nat44DelUser)(nil), "nat44_del_user_99a9f998") - api.RegisterMessage((*Nat44DelUserReply)(nil), "nat44_del_user_reply_e8d4e804") api.RegisterMessage((*Nat44EdAddDelOutputInterface)(nil), "nat44_ed_add_del_output_interface_47d6e753") api.RegisterMessage((*Nat44EdAddDelOutputInterfaceReply)(nil), "nat44_ed_add_del_output_interface_reply_e8d4e804") api.RegisterMessage((*Nat44EdAddDelVrfRoute)(nil), "nat44_ed_add_del_vrf_route_59187407") @@ -3969,27 +3245,10 @@ func file_nat44_ed_binapi_init() { api.RegisterMessage((*Nat44UserSessionV2Dump)(nil), "nat44_user_session_v2_dump_e1899c98") api.RegisterMessage((*Nat44UserSessionV3Details)(nil), "nat44_user_session_v3_details_edae926e") api.RegisterMessage((*Nat44UserSessionV3Dump)(nil), "nat44_user_session_v3_dump_e1899c98") - api.RegisterMessage((*NatGetAddrAndPortAllocAlg)(nil), "nat_get_addr_and_port_alloc_alg_51077d14") - api.RegisterMessage((*NatGetAddrAndPortAllocAlgReply)(nil), "nat_get_addr_and_port_alloc_alg_reply_3607a7d0") api.RegisterMessage((*NatGetMssClamping)(nil), "nat_get_mss_clamping_51077d14") api.RegisterMessage((*NatGetMssClampingReply)(nil), "nat_get_mss_clamping_reply_1c0b2a78") - api.RegisterMessage((*NatHaFlush)(nil), "nat_ha_flush_51077d14") - api.RegisterMessage((*NatHaFlushReply)(nil), "nat_ha_flush_reply_e8d4e804") - api.RegisterMessage((*NatHaGetFailover)(nil), "nat_ha_get_failover_51077d14") - api.RegisterMessage((*NatHaGetFailoverReply)(nil), "nat_ha_get_failover_reply_a67d8752") - api.RegisterMessage((*NatHaGetListener)(nil), "nat_ha_get_listener_51077d14") - api.RegisterMessage((*NatHaGetListenerReply)(nil), "nat_ha_get_listener_reply_123ea41f") - api.RegisterMessage((*NatHaResync)(nil), "nat_ha_resync_c8ab9e03") - api.RegisterMessage((*NatHaResyncCompletedEvent)(nil), "nat_ha_resync_completed_event_fdc598fb") - api.RegisterMessage((*NatHaResyncReply)(nil), "nat_ha_resync_reply_e8d4e804") - api.RegisterMessage((*NatHaSetFailover)(nil), "nat_ha_set_failover_718246af") - api.RegisterMessage((*NatHaSetFailoverReply)(nil), "nat_ha_set_failover_reply_e8d4e804") - api.RegisterMessage((*NatHaSetListener)(nil), "nat_ha_set_listener_e4a8cb4e") - api.RegisterMessage((*NatHaSetListenerReply)(nil), "nat_ha_set_listener_reply_e8d4e804") api.RegisterMessage((*NatIpfixEnableDisable)(nil), "nat_ipfix_enable_disable_9af4a2d2") api.RegisterMessage((*NatIpfixEnableDisableReply)(nil), "nat_ipfix_enable_disable_reply_e8d4e804") - api.RegisterMessage((*NatSetAddrAndPortAllocAlg)(nil), "nat_set_addr_and_port_alloc_alg_deeb746f") - api.RegisterMessage((*NatSetAddrAndPortAllocAlgReply)(nil), "nat_set_addr_and_port_alloc_alg_reply_e8d4e804") api.RegisterMessage((*NatSetMssClamping)(nil), "nat_set_mss_clamping_25e90abb") api.RegisterMessage((*NatSetMssClampingReply)(nil), "nat_set_mss_clamping_reply_e8d4e804") api.RegisterMessage((*NatSetTimeouts)(nil), "nat_set_timeouts_d4746b16") @@ -4019,8 +3278,6 @@ func AllMessages() []api.Message { (*Nat44AddressDump)(nil), (*Nat44DelSession)(nil), (*Nat44DelSessionReply)(nil), - (*Nat44DelUser)(nil), - (*Nat44DelUserReply)(nil), (*Nat44EdAddDelOutputInterface)(nil), (*Nat44EdAddDelOutputInterfaceReply)(nil), (*Nat44EdAddDelVrfRoute)(nil), @@ -4066,27 +3323,10 @@ func AllMessages() []api.Message { (*Nat44UserSessionV2Dump)(nil), (*Nat44UserSessionV3Details)(nil), (*Nat44UserSessionV3Dump)(nil), - (*NatGetAddrAndPortAllocAlg)(nil), - (*NatGetAddrAndPortAllocAlgReply)(nil), (*NatGetMssClamping)(nil), (*NatGetMssClampingReply)(nil), - (*NatHaFlush)(nil), - (*NatHaFlushReply)(nil), - (*NatHaGetFailover)(nil), - (*NatHaGetFailoverReply)(nil), - (*NatHaGetListener)(nil), - (*NatHaGetListenerReply)(nil), - (*NatHaResync)(nil), - (*NatHaResyncCompletedEvent)(nil), - (*NatHaResyncReply)(nil), - (*NatHaSetFailover)(nil), - (*NatHaSetFailoverReply)(nil), - (*NatHaSetListener)(nil), - (*NatHaSetListenerReply)(nil), (*NatIpfixEnableDisable)(nil), (*NatIpfixEnableDisableReply)(nil), - (*NatSetAddrAndPortAllocAlg)(nil), - (*NatSetAddrAndPortAllocAlgReply)(nil), (*NatSetMssClamping)(nil), (*NatSetMssClampingReply)(nil), (*NatSetTimeouts)(nil), diff --git a/vpplink/binapi/vppapi/nat44_ed/nat44_ed_rpc.ba.go b/vpplink/binapi/vppapi/nat44_ed/nat44_ed_rpc.ba.go index 5dfd7f28..43fd92f0 100644 --- a/vpplink/binapi/vppapi/nat44_ed/nat44_ed_rpc.ba.go +++ b/vpplink/binapi/vppapi/nat44_ed/nat44_ed_rpc.ba.go @@ -21,7 +21,6 @@ type RPCService interface { Nat44AddDelStaticMappingV2(ctx context.Context, in *Nat44AddDelStaticMappingV2) (*Nat44AddDelStaticMappingV2Reply, error) Nat44AddressDump(ctx context.Context, in *Nat44AddressDump) (RPCService_Nat44AddressDumpClient, error) Nat44DelSession(ctx context.Context, in *Nat44DelSession) (*Nat44DelSessionReply, error) - Nat44DelUser(ctx context.Context, in *Nat44DelUser) (*Nat44DelUserReply, error) Nat44EdAddDelOutputInterface(ctx context.Context, in *Nat44EdAddDelOutputInterface) (*Nat44EdAddDelOutputInterfaceReply, error) Nat44EdAddDelVrfRoute(ctx context.Context, in *Nat44EdAddDelVrfRoute) (*Nat44EdAddDelVrfRouteReply, error) Nat44EdAddDelVrfTable(ctx context.Context, in *Nat44EdAddDelVrfTable) (*Nat44EdAddDelVrfTableReply, error) @@ -44,16 +43,8 @@ type RPCService interface { Nat44UserSessionDump(ctx context.Context, in *Nat44UserSessionDump) (RPCService_Nat44UserSessionDumpClient, error) Nat44UserSessionV2Dump(ctx context.Context, in *Nat44UserSessionV2Dump) (RPCService_Nat44UserSessionV2DumpClient, error) Nat44UserSessionV3Dump(ctx context.Context, in *Nat44UserSessionV3Dump) (RPCService_Nat44UserSessionV3DumpClient, error) - NatGetAddrAndPortAllocAlg(ctx context.Context, in *NatGetAddrAndPortAllocAlg) (*NatGetAddrAndPortAllocAlgReply, error) NatGetMssClamping(ctx context.Context, in *NatGetMssClamping) (*NatGetMssClampingReply, error) - NatHaFlush(ctx context.Context, in *NatHaFlush) (*NatHaFlushReply, error) - NatHaGetFailover(ctx context.Context, in *NatHaGetFailover) (*NatHaGetFailoverReply, error) - NatHaGetListener(ctx context.Context, in *NatHaGetListener) (*NatHaGetListenerReply, error) - NatHaResync(ctx context.Context, in *NatHaResync) (*NatHaResyncReply, error) - NatHaSetFailover(ctx context.Context, in *NatHaSetFailover) (*NatHaSetFailoverReply, error) - NatHaSetListener(ctx context.Context, in *NatHaSetListener) (*NatHaSetListenerReply, error) NatIpfixEnableDisable(ctx context.Context, in *NatIpfixEnableDisable) (*NatIpfixEnableDisableReply, error) - NatSetAddrAndPortAllocAlg(ctx context.Context, in *NatSetAddrAndPortAllocAlg) (*NatSetAddrAndPortAllocAlgReply, error) NatSetMssClamping(ctx context.Context, in *NatSetMssClamping) (*NatSetMssClampingReply, error) NatSetTimeouts(ctx context.Context, in *NatSetTimeouts) (*NatSetTimeoutsReply, error) NatSetWorkers(ctx context.Context, in *NatSetWorkers) (*NatSetWorkersReply, error) @@ -174,15 +165,6 @@ func (c *serviceClient) Nat44DelSession(ctx context.Context, in *Nat44DelSession return out, api.RetvalToVPPApiError(out.Retval) } -func (c *serviceClient) Nat44DelUser(ctx context.Context, in *Nat44DelUser) (*Nat44DelUserReply, error) { - out := new(Nat44DelUserReply) - err := c.conn.Invoke(ctx, in, out) - if err != nil { - return nil, err - } - return out, api.RetvalToVPPApiError(out.Retval) -} - func (c *serviceClient) Nat44EdAddDelOutputInterface(ctx context.Context, in *Nat44EdAddDelOutputInterface) (*Nat44EdAddDelOutputInterfaceReply, error) { out := new(Nat44EdAddDelOutputInterfaceReply) err := c.conn.Invoke(ctx, in, out) @@ -752,15 +734,6 @@ func (c *serviceClient_Nat44UserSessionV3DumpClient) Recv() (*Nat44UserSessionV3 } } -func (c *serviceClient) NatGetAddrAndPortAllocAlg(ctx context.Context, in *NatGetAddrAndPortAllocAlg) (*NatGetAddrAndPortAllocAlgReply, error) { - out := new(NatGetAddrAndPortAllocAlgReply) - err := c.conn.Invoke(ctx, in, out) - if err != nil { - return nil, err - } - return out, api.RetvalToVPPApiError(out.Retval) -} - func (c *serviceClient) NatGetMssClamping(ctx context.Context, in *NatGetMssClamping) (*NatGetMssClampingReply, error) { out := new(NatGetMssClampingReply) err := c.conn.Invoke(ctx, in, out) @@ -770,60 +743,6 @@ func (c *serviceClient) NatGetMssClamping(ctx context.Context, in *NatGetMssClam return out, api.RetvalToVPPApiError(out.Retval) } -func (c *serviceClient) NatHaFlush(ctx context.Context, in *NatHaFlush) (*NatHaFlushReply, error) { - out := new(NatHaFlushReply) - err := c.conn.Invoke(ctx, in, out) - if err != nil { - return nil, err - } - return out, api.RetvalToVPPApiError(out.Retval) -} - -func (c *serviceClient) NatHaGetFailover(ctx context.Context, in *NatHaGetFailover) (*NatHaGetFailoverReply, error) { - out := new(NatHaGetFailoverReply) - err := c.conn.Invoke(ctx, in, out) - if err != nil { - return nil, err - } - return out, api.RetvalToVPPApiError(out.Retval) -} - -func (c *serviceClient) NatHaGetListener(ctx context.Context, in *NatHaGetListener) (*NatHaGetListenerReply, error) { - out := new(NatHaGetListenerReply) - err := c.conn.Invoke(ctx, in, out) - if err != nil { - return nil, err - } - return out, api.RetvalToVPPApiError(out.Retval) -} - -func (c *serviceClient) NatHaResync(ctx context.Context, in *NatHaResync) (*NatHaResyncReply, error) { - out := new(NatHaResyncReply) - err := c.conn.Invoke(ctx, in, out) - if err != nil { - return nil, err - } - return out, api.RetvalToVPPApiError(out.Retval) -} - -func (c *serviceClient) NatHaSetFailover(ctx context.Context, in *NatHaSetFailover) (*NatHaSetFailoverReply, error) { - out := new(NatHaSetFailoverReply) - err := c.conn.Invoke(ctx, in, out) - if err != nil { - return nil, err - } - return out, api.RetvalToVPPApiError(out.Retval) -} - -func (c *serviceClient) NatHaSetListener(ctx context.Context, in *NatHaSetListener) (*NatHaSetListenerReply, error) { - out := new(NatHaSetListenerReply) - err := c.conn.Invoke(ctx, in, out) - if err != nil { - return nil, err - } - return out, api.RetvalToVPPApiError(out.Retval) -} - func (c *serviceClient) NatIpfixEnableDisable(ctx context.Context, in *NatIpfixEnableDisable) (*NatIpfixEnableDisableReply, error) { out := new(NatIpfixEnableDisableReply) err := c.conn.Invoke(ctx, in, out) @@ -833,15 +752,6 @@ func (c *serviceClient) NatIpfixEnableDisable(ctx context.Context, in *NatIpfixE return out, api.RetvalToVPPApiError(out.Retval) } -func (c *serviceClient) NatSetAddrAndPortAllocAlg(ctx context.Context, in *NatSetAddrAndPortAllocAlg) (*NatSetAddrAndPortAllocAlgReply, error) { - out := new(NatSetAddrAndPortAllocAlgReply) - err := c.conn.Invoke(ctx, in, out) - if err != nil { - return nil, err - } - return out, api.RetvalToVPPApiError(out.Retval) -} - func (c *serviceClient) NatSetMssClamping(ctx context.Context, in *NatSetMssClamping) (*NatSetMssClampingReply, error) { out := new(NatSetMssClampingReply) err := c.conn.Invoke(ctx, in, out)