From b6b9dc238a68b7bb7cc88214a3db47b23e0b8f76 Mon Sep 17 00:00:00 2001 From: ycc Date: Tue, 13 Feb 2024 23:25:37 +0100 Subject: [PATCH] protobug03 --- messages.pb.go | 40 ++++++++++++++++++++-------------------- pb/messages.proto | 8 ++++---- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/messages.pb.go b/messages.pb.go index 6fb1a51..0713706 100644 --- a/messages.pb.go +++ b/messages.pb.go @@ -12,7 +12,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.26.0 +// protoc-gen-go v1.32.0 // protoc v4.25.2 // source: messages.proto @@ -956,10 +956,10 @@ type PackedUserMessage struct { unknownFields protoimpl.UnknownFields Destination string `protobuf:"bytes,1,opt,name=destination,proto3" json:"destination,omitempty"` // the peer's current conversation lookup public key - Payload []byte `protobuf:"bytes,2,opt,name=payload,proto3" json:"payload,omitempty"` // the message UserMessage encrypted with the destination peer's public key - Signature []byte `protobuf:"bytes,3,opt,name=signature,proto3" json:"signature,omitempty"` // the payload signature with the client identity private key - ServerTimestamp []int64 `protobuf:"varint,4,rep,packed,name=serverTimestamp,proto3" json:"serverTimestamp,omitempty"` // server time stamp, might be several in matriochka mode - From string `protobuf:"bytes,5,opt,name=from,proto3" json:"from,omitempty"` // the sender public key + From string `protobuf:"bytes,2,opt,name=from,proto3" json:"from,omitempty"` // the sender public key + Payload []byte `protobuf:"bytes,3,opt,name=payload,proto3" json:"payload,omitempty"` // the message UserMessage encrypted with the destination peer's public key + Signature []byte `protobuf:"bytes,4,opt,name=signature,proto3" json:"signature,omitempty"` // the payload signature with the client identity private key + ServerTimestamp []int64 `protobuf:"varint,5,rep,packed,name=serverTimestamp,proto3" json:"serverTimestamp,omitempty"` // server time stamp, might be several in matriochka mode } func (x *PackedUserMessage) Reset() { @@ -1001,6 +1001,13 @@ func (x *PackedUserMessage) GetDestination() string { return "" } +func (x *PackedUserMessage) GetFrom() string { + if x != nil { + return x.From + } + return "" +} + func (x *PackedUserMessage) GetPayload() []byte { if x != nil { return x.Payload @@ -1022,13 +1029,6 @@ func (x *PackedUserMessage) GetServerTimestamp() []int64 { return nil } -func (x *PackedUserMessage) GetFrom() string { - if x != nil { - return x.From - } - return "" -} - type ConversationStatus struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1611,14 +1611,14 @@ var file_messages_proto_rawDesc = []byte{ 0x6b, 0x65, 0x64, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x12, 0x18, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x0c, 0x52, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, - 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x73, - 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x73, 0x65, 0x72, 0x76, - 0x65, 0x72, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x04, 0x20, 0x03, 0x28, - 0x03, 0x52, 0x0f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, - 0x6d, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x22, 0x96, 0x02, 0x0a, 0x12, 0x43, 0x6f, 0x6e, 0x76, 0x65, + 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, + 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x1c, + 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x0c, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x28, 0x0a, 0x0f, + 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, + 0x05, 0x20, 0x03, 0x28, 0x03, 0x52, 0x0f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x54, 0x69, 0x6d, + 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0x96, 0x02, 0x0a, 0x12, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x55, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x55, 0x75, 0x69, 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x6c, diff --git a/pb/messages.proto b/pb/messages.proto index 33be6ad..444b06f 100644 --- a/pb/messages.proto +++ b/pb/messages.proto @@ -131,10 +131,10 @@ message ContactCard { // structure for sending a message to be forwarded to another user in protobuf format message PackedUserMessage { string destination=1; // the peer's current conversation lookup public key - bytes payload=2; // the message UserMessage encrypted with the destination peer's public key - bytes signature=3; // the payload signature with the client identity private key - repeated int64 serverTimestamp=4; // server time stamp, might be several in matriochka mode - string from=5; // the sender public key + string from=2; // the sender public key + bytes payload=3; // the message UserMessage encrypted with the destination peer's public key + bytes signature=4; // the payload signature with the client identity private key + repeated int64 serverTimestamp=5; // server time stamp, might be several in matriochka mode } message ConversationStatus {