Skip to content

[ME-3665] Add Device Name to WireGuard Peer Message #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adrianosela merged 1 commit into from
Nov 6, 2024
Merged

[ME-3665] Add Device Name to WireGuard Peer Message #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 37 additions & 28 deletions common/messages.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions common/messages.pb.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,9 @@ struct Border0_Common_V1_WireGuardPeer: Sendable {
/// applicable only when PeerType == PEER_TYPE_CONNECTOR
var services: [Border0_Common_V1_Service] = []

/// device (client or connector) name
var name: String = String()

var unknownFields = SwiftProtobuf.UnknownStorage()

init() {}
Expand Down Expand Up @@ -515,6 +518,7 @@ extension Border0_Common_V1_WireGuardPeer: SwiftProtobuf.Message, SwiftProtobuf.
7: .standard(proto: "public_udp6_endpoint"),
8: .same(proto: "type"),
9: .same(proto: "services"),
10: .same(proto: "name"),
]

mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
Expand All @@ -532,6 +536,7 @@ extension Border0_Common_V1_WireGuardPeer: SwiftProtobuf.Message, SwiftProtobuf.
case 7: try { try decoder.decodeSingularStringField(value: &self.publicUdp6Endpoint) }()
case 8: try { try decoder.decodeSingularEnumField(value: &self.type) }()
case 9: try { try decoder.decodeRepeatedMessageField(value: &self.services) }()
case 10: try { try decoder.decodeSingularStringField(value: &self.name) }()
default: break
}
}
Expand Down Expand Up @@ -565,6 +570,9 @@ extension Border0_Common_V1_WireGuardPeer: SwiftProtobuf.Message, SwiftProtobuf.
if !self.services.isEmpty {
try visitor.visitRepeatedMessageField(value: self.services, fieldNumber: 9)
}
if !self.name.isEmpty {
try visitor.visitSingularStringField(value: self.name, fieldNumber: 10)
}
try unknownFields.traverse(visitor: &visitor)
}

Expand All @@ -578,6 +586,7 @@ extension Border0_Common_V1_WireGuardPeer: SwiftProtobuf.Message, SwiftProtobuf.
if lhs.publicUdp6Endpoint != rhs.publicUdp6Endpoint {return false}
if lhs.type != rhs.type {return false}
if lhs.services != rhs.services {return false}
if lhs.name != rhs.name {return false}
if lhs.unknownFields != rhs.unknownFields {return false}
return true
}
Expand Down
1 change: 1 addition & 0 deletions common/messages.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ message WireGuardPeer {
string public_udp6_endpoint = 7; // endpoint for UDP peer-to-peer communication over IPv6 (public IPv6 + port as seen from the Internet)
PeerType type = 8; // client or connector
repeated Service services = 9; // applicable only when PeerType == PEER_TYPE_CONNECTOR
string name = 10; // device (client or connector) name
}

message Service {
Expand Down