diff options
author | Nathan Skrzypczak <nathan.skrzypczak@gmail.com> | 2022-04-27 18:39:03 +0200 |
---|---|---|
committer | Nathan Skrzypczak <nathan.skrzypczak@gmail.com> | 2022-05-30 18:49:13 +0200 |
commit | 4102c72bce694babd94a481b1201d33895a6f9c5 (patch) | |
tree | 1b11238ca4706008c88712f26942dd74ab9c14a6 /binapi/nat44_ei | |
parent | a4112fac7b86fe09650d2bb57969fe46404edd7d (diff) |
Update generated binapi to v22.02 & makefile changes
This patch does some small updates to the Makefile.
* `make gen-binapi-from-code` is removed, and moves to
`gen-binapi-local`
* `make build` is patched to build cmd & examples
* `make binapi-generator` to build the api-generator
without other binaries, as they typically require its
output to build.
* `make gen-binapi-local` runs the locally built binapi-generator
to update the local bindings. It expects ${VPP_DIR} to be set and
to point to a local vpp repository checked out with the right version
* `make gen-binapi-internal` runs the locally built binapi-generator
to update the bindings in `internal/testbinapi/binapi2001`
Regarding VPP, notable changes when moving to v22.02 are :
- ControlPing moved from vpe to memclnt
- CliInband went from vpe to vlib
Signed-off-by: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
Change-Id: Ie5cd2d5ded7ecaffd9abc3ca675df40be272b1fa
Diffstat (limited to 'binapi/nat44_ei')
-rw-r--r-- | binapi/nat44_ei/nat44_ei.ba.go | 197 | ||||
-rw-r--r-- | binapi/nat44_ei/nat44_ei_rpc.ba.go | 89 |
2 files changed, 264 insertions, 22 deletions
diff --git a/binapi/nat44_ei/nat44_ei.ba.go b/binapi/nat44_ei/nat44_ei.ba.go index 8f5968b..d69072b 100644 --- a/binapi/nat44_ei/nat44_ei.ba.go +++ b/binapi/nat44_ei/nat44_ei.ba.go @@ -1,14 +1,14 @@ // Code generated by GoVPP's binapi-generator. DO NOT EDIT. // versions: // binapi-generator: v0.5.0-dev -// VPP: 21.06-release +// VPP: 22.02-release // source: /usr/share/vpp/api/plugins/nat44_ei.api.json // Package nat44_ei contains generated bindings for API file nat44_ei.api. // // Contents: // 1 enum -// 73 messages +// 78 messages // package nat44_ei @@ -31,7 +31,7 @@ const _ = api.GoVppAPIPackageIsVersion2 const ( APIFile = "nat44_ei" APIVersion = "1.1.1" - VersionCrc = 0x62d113ee + VersionCrc = 0xfa6ff1f7 ) // Nat44EiConfigFlags defines enum 'nat44_ei_config_flags'. @@ -358,6 +358,80 @@ func (m *Nat44EiAddDelInterfaceAddrReply) Unmarshal(b []byte) error { return nil } +// Nat44EiAddDelOutputInterface defines message 'nat44_ei_add_del_output_interface'. +type Nat44EiAddDelOutputInterface struct { + IsAdd bool `binapi:"bool,name=is_add" json:"is_add,omitempty"` + SwIfIndex interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index" json:"sw_if_index,omitempty"` +} + +func (m *Nat44EiAddDelOutputInterface) Reset() { *m = Nat44EiAddDelOutputInterface{} } +func (*Nat44EiAddDelOutputInterface) GetMessageName() string { + return "nat44_ei_add_del_output_interface" +} +func (*Nat44EiAddDelOutputInterface) GetCrcString() string { return "47d6e753" } +func (*Nat44EiAddDelOutputInterface) GetMessageType() api.MessageType { + return api.RequestMessage +} + +func (m *Nat44EiAddDelOutputInterface) Size() (size int) { + if m == nil { + return 0 + } + size += 1 // m.IsAdd + size += 4 // m.SwIfIndex + return size +} +func (m *Nat44EiAddDelOutputInterface) Marshal(b []byte) ([]byte, error) { + if b == nil { + b = make([]byte, m.Size()) + } + buf := codec.NewBuffer(b) + buf.EncodeBool(m.IsAdd) + buf.EncodeUint32(uint32(m.SwIfIndex)) + return buf.Bytes(), nil +} +func (m *Nat44EiAddDelOutputInterface) Unmarshal(b []byte) error { + buf := codec.NewBuffer(b) + m.IsAdd = buf.DecodeBool() + m.SwIfIndex = interface_types.InterfaceIndex(buf.DecodeUint32()) + return nil +} + +// Nat44EiAddDelOutputInterfaceReply defines message 'nat44_ei_add_del_output_interface_reply'. +type Nat44EiAddDelOutputInterfaceReply struct { + Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"` +} + +func (m *Nat44EiAddDelOutputInterfaceReply) Reset() { *m = Nat44EiAddDelOutputInterfaceReply{} } +func (*Nat44EiAddDelOutputInterfaceReply) GetMessageName() string { + return "nat44_ei_add_del_output_interface_reply" +} +func (*Nat44EiAddDelOutputInterfaceReply) GetCrcString() string { return "e8d4e804" } +func (*Nat44EiAddDelOutputInterfaceReply) GetMessageType() api.MessageType { + return api.ReplyMessage +} + +func (m *Nat44EiAddDelOutputInterfaceReply) Size() (size int) { + if m == nil { + return 0 + } + size += 4 // m.Retval + return size +} +func (m *Nat44EiAddDelOutputInterfaceReply) 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 *Nat44EiAddDelOutputInterfaceReply) Unmarshal(b []byte) error { + buf := codec.NewBuffer(b) + m.Retval = buf.DecodeInt32() + return nil +} + // Nat44EiAddDelStaticMapping defines message 'nat44_ei_add_del_static_mapping'. // InProgress: the message form may change in the future versions type Nat44EiAddDelStaticMapping struct { @@ -1926,6 +2000,113 @@ func (m *Nat44EiIpfixEnableDisableReply) Unmarshal(b []byte) error { return nil } +// Nat44EiOutputInterfaceDetails defines message 'nat44_ei_output_interface_details'. +type Nat44EiOutputInterfaceDetails struct { + SwIfIndex interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index" json:"sw_if_index,omitempty"` +} + +func (m *Nat44EiOutputInterfaceDetails) Reset() { *m = Nat44EiOutputInterfaceDetails{} } +func (*Nat44EiOutputInterfaceDetails) GetMessageName() string { + return "nat44_ei_output_interface_details" +} +func (*Nat44EiOutputInterfaceDetails) GetCrcString() string { return "0b45011c" } +func (*Nat44EiOutputInterfaceDetails) GetMessageType() api.MessageType { + return api.ReplyMessage +} + +func (m *Nat44EiOutputInterfaceDetails) Size() (size int) { + if m == nil { + return 0 + } + size += 4 // m.SwIfIndex + return size +} +func (m *Nat44EiOutputInterfaceDetails) Marshal(b []byte) ([]byte, error) { + if b == nil { + b = make([]byte, m.Size()) + } + buf := codec.NewBuffer(b) + buf.EncodeUint32(uint32(m.SwIfIndex)) + return buf.Bytes(), nil +} +func (m *Nat44EiOutputInterfaceDetails) Unmarshal(b []byte) error { + buf := codec.NewBuffer(b) + m.SwIfIndex = interface_types.InterfaceIndex(buf.DecodeUint32()) + return nil +} + +// Nat44EiOutputInterfaceGet defines message 'nat44_ei_output_interface_get'. +type Nat44EiOutputInterfaceGet struct { + Cursor uint32 `binapi:"u32,name=cursor" json:"cursor,omitempty"` +} + +func (m *Nat44EiOutputInterfaceGet) Reset() { *m = Nat44EiOutputInterfaceGet{} } +func (*Nat44EiOutputInterfaceGet) GetMessageName() string { return "nat44_ei_output_interface_get" } +func (*Nat44EiOutputInterfaceGet) GetCrcString() string { return "f75ba505" } +func (*Nat44EiOutputInterfaceGet) GetMessageType() api.MessageType { + return api.RequestMessage +} + +func (m *Nat44EiOutputInterfaceGet) Size() (size int) { + if m == nil { + return 0 + } + size += 4 // m.Cursor + return size +} +func (m *Nat44EiOutputInterfaceGet) Marshal(b []byte) ([]byte, error) { + if b == nil { + b = make([]byte, m.Size()) + } + buf := codec.NewBuffer(b) + buf.EncodeUint32(m.Cursor) + return buf.Bytes(), nil +} +func (m *Nat44EiOutputInterfaceGet) Unmarshal(b []byte) error { + buf := codec.NewBuffer(b) + m.Cursor = buf.DecodeUint32() + return nil +} + +// Nat44EiOutputInterfaceGetReply defines message 'nat44_ei_output_interface_get_reply'. +type Nat44EiOutputInterfaceGetReply struct { + Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"` + Cursor uint32 `binapi:"u32,name=cursor" json:"cursor,omitempty"` +} + +func (m *Nat44EiOutputInterfaceGetReply) Reset() { *m = Nat44EiOutputInterfaceGetReply{} } +func (*Nat44EiOutputInterfaceGetReply) GetMessageName() string { + return "nat44_ei_output_interface_get_reply" +} +func (*Nat44EiOutputInterfaceGetReply) GetCrcString() string { return "53b48f5d" } +func (*Nat44EiOutputInterfaceGetReply) GetMessageType() api.MessageType { + return api.ReplyMessage +} + +func (m *Nat44EiOutputInterfaceGetReply) Size() (size int) { + if m == nil { + return 0 + } + size += 4 // m.Retval + size += 4 // m.Cursor + return size +} +func (m *Nat44EiOutputInterfaceGetReply) Marshal(b []byte) ([]byte, error) { + if b == nil { + b = make([]byte, m.Size()) + } + buf := codec.NewBuffer(b) + buf.EncodeInt32(m.Retval) + buf.EncodeUint32(m.Cursor) + return buf.Bytes(), nil +} +func (m *Nat44EiOutputInterfaceGetReply) Unmarshal(b []byte) error { + buf := codec.NewBuffer(b) + m.Retval = buf.DecodeInt32() + m.Cursor = buf.DecodeUint32() + return nil +} + // Nat44EiPluginEnableDisable defines message 'nat44_ei_plugin_enable_disable'. // InProgress: the message form may change in the future versions type Nat44EiPluginEnableDisable struct { @@ -3021,6 +3202,8 @@ func file_nat44_ei_binapi_init() { api.RegisterMessage((*Nat44EiAddDelIdentityMappingReply)(nil), "nat44_ei_add_del_identity_mapping_reply_e8d4e804") api.RegisterMessage((*Nat44EiAddDelInterfaceAddr)(nil), "nat44_ei_add_del_interface_addr_883abbcc") api.RegisterMessage((*Nat44EiAddDelInterfaceAddrReply)(nil), "nat44_ei_add_del_interface_addr_reply_e8d4e804") + api.RegisterMessage((*Nat44EiAddDelOutputInterface)(nil), "nat44_ei_add_del_output_interface_47d6e753") + api.RegisterMessage((*Nat44EiAddDelOutputInterfaceReply)(nil), "nat44_ei_add_del_output_interface_reply_e8d4e804") api.RegisterMessage((*Nat44EiAddDelStaticMapping)(nil), "nat44_ei_add_del_static_mapping_b404b7fe") api.RegisterMessage((*Nat44EiAddDelStaticMappingReply)(nil), "nat44_ei_add_del_static_mapping_reply_e8d4e804") api.RegisterMessage((*Nat44EiAddressDetails)(nil), "nat44_ei_address_details_318f1202") @@ -3062,6 +3245,9 @@ func file_nat44_ei_binapi_init() { api.RegisterMessage((*Nat44EiInterfaceOutputFeatureDump)(nil), "nat44_ei_interface_output_feature_dump_51077d14") api.RegisterMessage((*Nat44EiIpfixEnableDisable)(nil), "nat44_ei_ipfix_enable_disable_9af4a2d2") api.RegisterMessage((*Nat44EiIpfixEnableDisableReply)(nil), "nat44_ei_ipfix_enable_disable_reply_e8d4e804") + api.RegisterMessage((*Nat44EiOutputInterfaceDetails)(nil), "nat44_ei_output_interface_details_0b45011c") + api.RegisterMessage((*Nat44EiOutputInterfaceGet)(nil), "nat44_ei_output_interface_get_f75ba505") + api.RegisterMessage((*Nat44EiOutputInterfaceGetReply)(nil), "nat44_ei_output_interface_get_reply_53b48f5d") api.RegisterMessage((*Nat44EiPluginEnableDisable)(nil), "nat44_ei_plugin_enable_disable_bf692144") api.RegisterMessage((*Nat44EiPluginEnableDisableReply)(nil), "nat44_ei_plugin_enable_disable_reply_e8d4e804") api.RegisterMessage((*Nat44EiSetAddrAndPortAllocAlg)(nil), "nat44_ei_set_addr_and_port_alloc_alg_deeb746f") @@ -3099,6 +3285,8 @@ func AllMessages() []api.Message { (*Nat44EiAddDelIdentityMappingReply)(nil), (*Nat44EiAddDelInterfaceAddr)(nil), (*Nat44EiAddDelInterfaceAddrReply)(nil), + (*Nat44EiAddDelOutputInterface)(nil), + (*Nat44EiAddDelOutputInterfaceReply)(nil), (*Nat44EiAddDelStaticMapping)(nil), (*Nat44EiAddDelStaticMappingReply)(nil), (*Nat44EiAddressDetails)(nil), @@ -3140,6 +3328,9 @@ func AllMessages() []api.Message { (*Nat44EiInterfaceOutputFeatureDump)(nil), (*Nat44EiIpfixEnableDisable)(nil), (*Nat44EiIpfixEnableDisableReply)(nil), + (*Nat44EiOutputInterfaceDetails)(nil), + (*Nat44EiOutputInterfaceGet)(nil), + (*Nat44EiOutputInterfaceGetReply)(nil), (*Nat44EiPluginEnableDisable)(nil), (*Nat44EiPluginEnableDisableReply)(nil), (*Nat44EiSetAddrAndPortAllocAlg)(nil), diff --git a/binapi/nat44_ei/nat44_ei_rpc.ba.go b/binapi/nat44_ei/nat44_ei_rpc.ba.go index a20c60f..78b5d3a 100644 --- a/binapi/nat44_ei/nat44_ei_rpc.ba.go +++ b/binapi/nat44_ei/nat44_ei_rpc.ba.go @@ -8,7 +8,7 @@ import ( "io" api "git.fd.io/govpp.git/api" - vpe "git.fd.io/govpp.git/binapi/vpe" + memclnt "git.fd.io/govpp.git/binapi/memclnt" ) // RPCService defines RPC service nat44_ei. @@ -16,6 +16,7 @@ type RPCService interface { Nat44EiAddDelAddressRange(ctx context.Context, in *Nat44EiAddDelAddressRange) (*Nat44EiAddDelAddressRangeReply, error) Nat44EiAddDelIdentityMapping(ctx context.Context, in *Nat44EiAddDelIdentityMapping) (*Nat44EiAddDelIdentityMappingReply, error) Nat44EiAddDelInterfaceAddr(ctx context.Context, in *Nat44EiAddDelInterfaceAddr) (*Nat44EiAddDelInterfaceAddrReply, error) + Nat44EiAddDelOutputInterface(ctx context.Context, in *Nat44EiAddDelOutputInterface) (*Nat44EiAddDelOutputInterfaceReply, error) Nat44EiAddDelStaticMapping(ctx context.Context, in *Nat44EiAddDelStaticMapping) (*Nat44EiAddDelStaticMappingReply, error) Nat44EiAddressDump(ctx context.Context, in *Nat44EiAddressDump) (RPCService_Nat44EiAddressDumpClient, error) Nat44EiDelSession(ctx context.Context, in *Nat44EiDelSession) (*Nat44EiDelSessionReply, error) @@ -36,6 +37,7 @@ type RPCService interface { Nat44EiInterfaceDump(ctx context.Context, in *Nat44EiInterfaceDump) (RPCService_Nat44EiInterfaceDumpClient, error) Nat44EiInterfaceOutputFeatureDump(ctx context.Context, in *Nat44EiInterfaceOutputFeatureDump) (RPCService_Nat44EiInterfaceOutputFeatureDumpClient, error) Nat44EiIpfixEnableDisable(ctx context.Context, in *Nat44EiIpfixEnableDisable) (*Nat44EiIpfixEnableDisableReply, error) + Nat44EiOutputInterfaceGet(ctx context.Context, in *Nat44EiOutputInterfaceGet) (RPCService_Nat44EiOutputInterfaceGetClient, error) Nat44EiPluginEnableDisable(ctx context.Context, in *Nat44EiPluginEnableDisable) (*Nat44EiPluginEnableDisableReply, error) Nat44EiSetAddrAndPortAllocAlg(ctx context.Context, in *Nat44EiSetAddrAndPortAllocAlg) (*Nat44EiSetAddrAndPortAllocAlgReply, error) Nat44EiSetFqOptions(ctx context.Context, in *Nat44EiSetFqOptions) (*Nat44EiSetFqOptionsReply, error) @@ -86,6 +88,15 @@ func (c *serviceClient) Nat44EiAddDelInterfaceAddr(ctx context.Context, in *Nat4 return out, api.RetvalToVPPApiError(out.Retval) } +func (c *serviceClient) Nat44EiAddDelOutputInterface(ctx context.Context, in *Nat44EiAddDelOutputInterface) (*Nat44EiAddDelOutputInterfaceReply, error) { + out := new(Nat44EiAddDelOutputInterfaceReply) + err := c.conn.Invoke(ctx, in, out) + if err != nil { + return nil, err + } + return out, api.RetvalToVPPApiError(out.Retval) +} + func (c *serviceClient) Nat44EiAddDelStaticMapping(ctx context.Context, in *Nat44EiAddDelStaticMapping) (*Nat44EiAddDelStaticMappingReply, error) { out := new(Nat44EiAddDelStaticMappingReply) err := c.conn.Invoke(ctx, in, out) @@ -104,7 +115,7 @@ func (c *serviceClient) Nat44EiAddressDump(ctx context.Context, in *Nat44EiAddre if err := x.Stream.SendMsg(in); err != nil { return nil, err } - if err = x.Stream.SendMsg(&vpe.ControlPing{}); err != nil { + if err = x.Stream.SendMsg(&memclnt.ControlPing{}); err != nil { return nil, err } return x, nil @@ -127,7 +138,7 @@ func (c *serviceClient_Nat44EiAddressDumpClient) Recv() (*Nat44EiAddressDetails, switch m := msg.(type) { case *Nat44EiAddressDetails: return m, nil - case *vpe.ControlPingReply: + case *memclnt.ControlPingReply: err = c.Stream.Close() if err != nil { return nil, err @@ -246,7 +257,7 @@ func (c *serviceClient) Nat44EiIdentityMappingDump(ctx context.Context, in *Nat4 if err := x.Stream.SendMsg(in); err != nil { return nil, err } - if err = x.Stream.SendMsg(&vpe.ControlPing{}); err != nil { + if err = x.Stream.SendMsg(&memclnt.ControlPing{}); err != nil { return nil, err } return x, nil @@ -269,7 +280,7 @@ func (c *serviceClient_Nat44EiIdentityMappingDumpClient) Recv() (*Nat44EiIdentit switch m := msg.(type) { case *Nat44EiIdentityMappingDetails: return m, nil - case *vpe.ControlPingReply: + case *memclnt.ControlPingReply: err = c.Stream.Close() if err != nil { return nil, err @@ -307,7 +318,7 @@ func (c *serviceClient) Nat44EiInterfaceAddrDump(ctx context.Context, in *Nat44E if err := x.Stream.SendMsg(in); err != nil { return nil, err } - if err = x.Stream.SendMsg(&vpe.ControlPing{}); err != nil { + if err = x.Stream.SendMsg(&memclnt.ControlPing{}); err != nil { return nil, err } return x, nil @@ -330,7 +341,7 @@ func (c *serviceClient_Nat44EiInterfaceAddrDumpClient) Recv() (*Nat44EiInterface switch m := msg.(type) { case *Nat44EiInterfaceAddrDetails: return m, nil - case *vpe.ControlPingReply: + case *memclnt.ControlPingReply: err = c.Stream.Close() if err != nil { return nil, err @@ -350,7 +361,7 @@ func (c *serviceClient) Nat44EiInterfaceDump(ctx context.Context, in *Nat44EiInt if err := x.Stream.SendMsg(in); err != nil { return nil, err } - if err = x.Stream.SendMsg(&vpe.ControlPing{}); err != nil { + if err = x.Stream.SendMsg(&memclnt.ControlPing{}); err != nil { return nil, err } return x, nil @@ -373,7 +384,7 @@ func (c *serviceClient_Nat44EiInterfaceDumpClient) Recv() (*Nat44EiInterfaceDeta switch m := msg.(type) { case *Nat44EiInterfaceDetails: return m, nil - case *vpe.ControlPingReply: + case *memclnt.ControlPingReply: err = c.Stream.Close() if err != nil { return nil, err @@ -393,7 +404,7 @@ func (c *serviceClient) Nat44EiInterfaceOutputFeatureDump(ctx context.Context, i if err := x.Stream.SendMsg(in); err != nil { return nil, err } - if err = x.Stream.SendMsg(&vpe.ControlPing{}); err != nil { + if err = x.Stream.SendMsg(&memclnt.ControlPing{}); err != nil { return nil, err } return x, nil @@ -416,7 +427,7 @@ func (c *serviceClient_Nat44EiInterfaceOutputFeatureDumpClient) Recv() (*Nat44Ei switch m := msg.(type) { case *Nat44EiInterfaceOutputFeatureDetails: return m, nil - case *vpe.ControlPingReply: + case *memclnt.ControlPingReply: err = c.Stream.Close() if err != nil { return nil, err @@ -436,6 +447,46 @@ func (c *serviceClient) Nat44EiIpfixEnableDisable(ctx context.Context, in *Nat44 return out, api.RetvalToVPPApiError(out.Retval) } +func (c *serviceClient) Nat44EiOutputInterfaceGet(ctx context.Context, in *Nat44EiOutputInterfaceGet) (RPCService_Nat44EiOutputInterfaceGetClient, error) { + stream, err := c.conn.NewStream(ctx) + if err != nil { + return nil, err + } + x := &serviceClient_Nat44EiOutputInterfaceGetClient{stream} + if err := x.Stream.SendMsg(in); err != nil { + return nil, err + } + return x, nil +} + +type RPCService_Nat44EiOutputInterfaceGetClient interface { + Recv() (*Nat44EiOutputInterfaceDetails, error) + api.Stream +} + +type serviceClient_Nat44EiOutputInterfaceGetClient struct { + api.Stream +} + +func (c *serviceClient_Nat44EiOutputInterfaceGetClient) Recv() (*Nat44EiOutputInterfaceDetails, error) { + msg, err := c.Stream.RecvMsg() + if err != nil { + return nil, err + } + switch m := msg.(type) { + case *Nat44EiOutputInterfaceDetails: + return m, nil + case *Nat44EiOutputInterfaceGetReply: + err = c.Stream.Close() + if err != nil { + return nil, err + } + return nil, io.EOF + default: + return nil, fmt.Errorf("unexpected message: %T %v", m, m) + } +} + func (c *serviceClient) Nat44EiPluginEnableDisable(ctx context.Context, in *Nat44EiPluginEnableDisable) (*Nat44EiPluginEnableDisableReply, error) { out := new(Nat44EiPluginEnableDisableReply) err := c.conn.Invoke(ctx, in, out) @@ -526,7 +577,7 @@ func (c *serviceClient) Nat44EiStaticMappingDump(ctx context.Context, in *Nat44E if err := x.Stream.SendMsg(in); err != nil { return nil, err } - if err = x.Stream.SendMsg(&vpe.ControlPing{}); err != nil { + if err = x.Stream.SendMsg(&memclnt.ControlPing{}); err != nil { return nil, err } return x, nil @@ -549,7 +600,7 @@ func (c *serviceClient_Nat44EiStaticMappingDumpClient) Recv() (*Nat44EiStaticMap switch m := msg.(type) { case *Nat44EiStaticMappingDetails: return m, nil - case *vpe.ControlPingReply: + case *memclnt.ControlPingReply: err = c.Stream.Close() if err != nil { return nil, err @@ -569,7 +620,7 @@ func (c *serviceClient) Nat44EiUserDump(ctx context.Context, in *Nat44EiUserDump if err := x.Stream.SendMsg(in); err != nil { return nil, err } - if err = x.Stream.SendMsg(&vpe.ControlPing{}); err != nil { + if err = x.Stream.SendMsg(&memclnt.ControlPing{}); err != nil { return nil, err } return x, nil @@ -592,7 +643,7 @@ func (c *serviceClient_Nat44EiUserDumpClient) Recv() (*Nat44EiUserDetails, error switch m := msg.(type) { case *Nat44EiUserDetails: return m, nil - case *vpe.ControlPingReply: + case *memclnt.ControlPingReply: err = c.Stream.Close() if err != nil { return nil, err @@ -612,7 +663,7 @@ func (c *serviceClient) Nat44EiUserSessionDump(ctx context.Context, in *Nat44EiU if err := x.Stream.SendMsg(in); err != nil { return nil, err } - if err = x.Stream.SendMsg(&vpe.ControlPing{}); err != nil { + if err = x.Stream.SendMsg(&memclnt.ControlPing{}); err != nil { return nil, err } return x, nil @@ -635,7 +686,7 @@ func (c *serviceClient_Nat44EiUserSessionDumpClient) Recv() (*Nat44EiUserSession switch m := msg.(type) { case *Nat44EiUserSessionDetails: return m, nil - case *vpe.ControlPingReply: + case *memclnt.ControlPingReply: err = c.Stream.Close() if err != nil { return nil, err @@ -655,7 +706,7 @@ func (c *serviceClient) Nat44EiWorkerDump(ctx context.Context, in *Nat44EiWorker if err := x.Stream.SendMsg(in); err != nil { return nil, err } - if err = x.Stream.SendMsg(&vpe.ControlPing{}); err != nil { + if err = x.Stream.SendMsg(&memclnt.ControlPing{}); err != nil { return nil, err } return x, nil @@ -678,7 +729,7 @@ func (c *serviceClient_Nat44EiWorkerDumpClient) Recv() (*Nat44EiWorkerDetails, e switch m := msg.(type) { case *Nat44EiWorkerDetails: return m, nil - case *vpe.ControlPingReply: + case *memclnt.ControlPingReply: err = c.Stream.Close() if err != nil { return nil, err |