From 53ac15784a540597761d79f0504e397fcf9c0a76 Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Mon, 6 Jan 2025 14:42:12 -0500 Subject: [PATCH] Regenerate natdiscovery.pb.go Signed-off-by: Tom Pantelis --- pkg/natdiscovery/proto/natdiscovery.pb.go | 95 +++++++++++------------ 1 file changed, 47 insertions(+), 48 deletions(-) diff --git a/pkg/natdiscovery/proto/natdiscovery.pb.go b/pkg/natdiscovery/proto/natdiscovery.pb.go index 06e3ae12b..6a2334f89 100644 --- a/pkg/natdiscovery/proto/natdiscovery.pb.go +++ b/pkg/natdiscovery/proto/natdiscovery.pb.go @@ -17,8 +17,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 -// protoc v3.19.6 +// protoc-gen-go v1.36.1 +// protoc v3.17.3 // source: pkg/natdiscovery/proto/natdiscovery.proto package proto @@ -93,16 +93,15 @@ func (ResponseType) EnumDescriptor() ([]byte, []int) { } type SubmarinerNATDiscoveryMessage struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Version int32 `protobuf:"varint,1,opt,name=version,proto3" json:"version,omitempty"` - // Types that are assignable to Message: + state protoimpl.MessageState `protogen:"open.v1"` + Version int32 `protobuf:"varint,1,opt,name=version,proto3" json:"version,omitempty"` + // Types that are valid to be assigned to Message: // // *SubmarinerNATDiscoveryMessage_Request // *SubmarinerNATDiscoveryMessage_Response - Message isSubmarinerNATDiscoveryMessage_Message `protobuf_oneof:"message"` + Message isSubmarinerNATDiscoveryMessage_Message `protobuf_oneof:"message"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *SubmarinerNATDiscoveryMessage) Reset() { @@ -142,23 +141,27 @@ func (x *SubmarinerNATDiscoveryMessage) GetVersion() int32 { return 0 } -func (m *SubmarinerNATDiscoveryMessage) GetMessage() isSubmarinerNATDiscoveryMessage_Message { - if m != nil { - return m.Message +func (x *SubmarinerNATDiscoveryMessage) GetMessage() isSubmarinerNATDiscoveryMessage_Message { + if x != nil { + return x.Message } return nil } func (x *SubmarinerNATDiscoveryMessage) GetRequest() *SubmarinerNATDiscoveryRequest { - if x, ok := x.GetMessage().(*SubmarinerNATDiscoveryMessage_Request); ok { - return x.Request + if x != nil { + if x, ok := x.Message.(*SubmarinerNATDiscoveryMessage_Request); ok { + return x.Request + } } return nil } func (x *SubmarinerNATDiscoveryMessage) GetResponse() *SubmarinerNATDiscoveryResponse { - if x, ok := x.GetMessage().(*SubmarinerNATDiscoveryMessage_Response); ok { - return x.Response + if x != nil { + if x, ok := x.Message.(*SubmarinerNATDiscoveryMessage_Response); ok { + return x.Response + } } return nil } @@ -180,17 +183,16 @@ func (*SubmarinerNATDiscoveryMessage_Request) isSubmarinerNATDiscoveryMessage_Me func (*SubmarinerNATDiscoveryMessage_Response) isSubmarinerNATDiscoveryMessage_Message() {} type SubmarinerNATDiscoveryRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - RequestNumber uint64 `protobuf:"varint,1,opt,name=request_number,json=requestNumber,proto3" json:"request_number,omitempty"` - Sender *EndpointDetails `protobuf:"bytes,2,opt,name=sender,proto3" json:"sender,omitempty"` - Receiver *EndpointDetails `protobuf:"bytes,3,opt,name=receiver,proto3" json:"receiver,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + RequestNumber uint64 `protobuf:"varint,1,opt,name=request_number,json=requestNumber,proto3" json:"request_number,omitempty"` + Sender *EndpointDetails `protobuf:"bytes,2,opt,name=sender,proto3" json:"sender,omitempty"` + Receiver *EndpointDetails `protobuf:"bytes,3,opt,name=receiver,proto3" json:"receiver,omitempty"` // The following information would allow the receiver to identify // and log if any form of NAT traversal is happening on the path - UsingSrc *IPPortPair `protobuf:"bytes,4,opt,name=using_src,json=usingSrc,proto3" json:"using_src,omitempty"` - UsingDst *IPPortPair `protobuf:"bytes,5,opt,name=using_dst,json=usingDst,proto3" json:"using_dst,omitempty"` + UsingSrc *IPPortPair `protobuf:"bytes,4,opt,name=using_src,json=usingSrc,proto3" json:"using_src,omitempty"` + UsingDst *IPPortPair `protobuf:"bytes,5,opt,name=using_dst,json=usingDst,proto3" json:"using_dst,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *SubmarinerNATDiscoveryRequest) Reset() { @@ -259,20 +261,19 @@ func (x *SubmarinerNATDiscoveryRequest) GetUsingDst() *IPPortPair { } type SubmarinerNATDiscoveryResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - RequestNumber uint64 `protobuf:"varint,1,opt,name=request_number,json=requestNumber,proto3" json:"request_number,omitempty"` - Response ResponseType `protobuf:"varint,2,opt,name=response,proto3,enum=ResponseType" json:"response,omitempty"` - Sender *EndpointDetails `protobuf:"bytes,3,opt,name=sender,proto3" json:"sender,omitempty"` - Receiver *EndpointDetails `protobuf:"bytes,4,opt,name=receiver,proto3" json:"receiver,omitempty"` - SrcIpNatDetected bool `protobuf:"varint,5,opt,name=src_ip_nat_detected,json=srcIpNatDetected,proto3" json:"src_ip_nat_detected,omitempty"` - SrcPortNatDetected bool `protobuf:"varint,6,opt,name=src_port_nat_detected,json=srcPortNatDetected,proto3" json:"src_port_nat_detected,omitempty"` - DstIpNatDetected bool `protobuf:"varint,7,opt,name=dst_ip_nat_detected,json=dstIpNatDetected,proto3" json:"dst_ip_nat_detected,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + RequestNumber uint64 `protobuf:"varint,1,opt,name=request_number,json=requestNumber,proto3" json:"request_number,omitempty"` + Response ResponseType `protobuf:"varint,2,opt,name=response,proto3,enum=ResponseType" json:"response,omitempty"` + Sender *EndpointDetails `protobuf:"bytes,3,opt,name=sender,proto3" json:"sender,omitempty"` + Receiver *EndpointDetails `protobuf:"bytes,4,opt,name=receiver,proto3" json:"receiver,omitempty"` + SrcIpNatDetected bool `protobuf:"varint,5,opt,name=src_ip_nat_detected,json=srcIpNatDetected,proto3" json:"src_ip_nat_detected,omitempty"` + SrcPortNatDetected bool `protobuf:"varint,6,opt,name=src_port_nat_detected,json=srcPortNatDetected,proto3" json:"src_port_nat_detected,omitempty"` + DstIpNatDetected bool `protobuf:"varint,7,opt,name=dst_ip_nat_detected,json=dstIpNatDetected,proto3" json:"dst_ip_nat_detected,omitempty"` // The received SRC IP / SRC port is reported, which will be useful for // diagnosing corner cases - ReceivedSrc *IPPortPair `protobuf:"bytes,8,opt,name=received_src,json=receivedSrc,proto3" json:"received_src,omitempty"` + ReceivedSrc *IPPortPair `protobuf:"bytes,8,opt,name=received_src,json=receivedSrc,proto3" json:"received_src,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *SubmarinerNATDiscoveryResponse) Reset() { @@ -362,12 +363,11 @@ func (x *SubmarinerNATDiscoveryResponse) GetReceivedSrc() *IPPortPair { } type IPPortPair struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + IP string `protobuf:"bytes,1,opt,name=IP,proto3" json:"IP,omitempty"` + Port int32 `protobuf:"varint,2,opt,name=port,proto3" json:"port,omitempty"` unknownFields protoimpl.UnknownFields - - IP string `protobuf:"bytes,1,opt,name=IP,proto3" json:"IP,omitempty"` - Port int32 `protobuf:"varint,2,opt,name=port,proto3" json:"port,omitempty"` + sizeCache protoimpl.SizeCache } func (x *IPPortPair) Reset() { @@ -415,13 +415,12 @@ func (x *IPPortPair) GetPort() int32 { } type EndpointDetails struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // should we hash this for privacy? a hash can be checked against a known list, but can't be decoded - ClusterId string `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"` - EndpointId string `protobuf:"bytes,2,opt,name=endpoint_id,json=endpointId,proto3" json:"endpoint_id,omitempty"` + ClusterId string `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"` + EndpointId string `protobuf:"bytes,2,opt,name=endpoint_id,json=endpointId,proto3" json:"endpoint_id,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *EndpointDetails) Reset() {