mirror of
https://github.com/slackhq/nebula.git
synced 2025-12-16 11:58:27 +01:00
Merge remote-tracking branch 'origin/master' into multiport
This commit is contained in:
32
nebula.proto
32
nebula.proto
@@ -23,19 +23,28 @@ message NebulaMeta {
|
||||
}
|
||||
|
||||
message NebulaMetaDetails {
|
||||
uint32 VpnIp = 1;
|
||||
repeated Ip4AndPort Ip4AndPorts = 2;
|
||||
repeated Ip6AndPort Ip6AndPorts = 4;
|
||||
repeated uint32 RelayVpnIp = 5;
|
||||
uint32 OldVpnAddr = 1 [deprecated = true];
|
||||
Addr VpnAddr = 6;
|
||||
|
||||
repeated uint32 OldRelayVpnAddrs = 5 [deprecated = true];
|
||||
repeated Addr RelayVpnAddrs = 7;
|
||||
|
||||
repeated V4AddrPort V4AddrPorts = 2;
|
||||
repeated V6AddrPort V6AddrPorts = 4;
|
||||
uint32 counter = 3;
|
||||
}
|
||||
|
||||
message Ip4AndPort {
|
||||
uint32 Ip = 1;
|
||||
message Addr {
|
||||
uint64 Hi = 1;
|
||||
uint64 Lo = 2;
|
||||
}
|
||||
|
||||
message V4AddrPort {
|
||||
uint32 Addr = 1;
|
||||
uint32 Port = 2;
|
||||
}
|
||||
|
||||
message Ip6AndPort {
|
||||
message V6AddrPort {
|
||||
uint64 Hi = 1;
|
||||
uint64 Lo = 2;
|
||||
uint32 Port = 3;
|
||||
@@ -69,6 +78,7 @@ message NebulaHandshakeDetails {
|
||||
uint32 ResponderIndex = 3;
|
||||
uint64 Cookie = 4;
|
||||
uint64 Time = 5;
|
||||
uint32 CertVersion = 8;
|
||||
|
||||
MultiPortDetails InitiatorMultiPort = 6;
|
||||
MultiPortDetails ResponderMultiPort = 7;
|
||||
@@ -84,6 +94,10 @@ message NebulaControl {
|
||||
|
||||
uint32 InitiatorRelayIndex = 2;
|
||||
uint32 ResponderRelayIndex = 3;
|
||||
uint32 RelayToIp = 4;
|
||||
uint32 RelayFromIp = 5;
|
||||
|
||||
uint32 OldRelayToAddr = 4 [deprecated = true];
|
||||
uint32 OldRelayFromAddr = 5 [deprecated = true];
|
||||
|
||||
Addr RelayToAddr = 6;
|
||||
Addr RelayFromAddr = 7;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user