starred/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2026-03-31 14:33:42 +02:00
Code Issues 98 Packages Projects Releases 10 Wiki Activity

Poll kinda working

Browse Source
This commit is contained in:
Juan Font Alonso
2022-03-29 00:01:15 +02:00
parent 834f39db31
commit 928544a24f
4 changed files with 324 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
machine.go
View File

@@ -518,11 +518,14 @@ func (machine Machine) toNode(
}
var machineKey key.MachinePublic
err = machineKey.UnmarshalText(
[]byte(MachinePublicKeyEnsurePrefix(machine.MachineKey)),
)
if err != nil {
return nil, fmt.Errorf("failed to parse machine public key: %w", err)
if machine.MachineKey != "" {
// MachineKey is only used in the legacy protocol
err = machineKey.UnmarshalText(
[]byte(MachinePublicKeyEnsurePrefix(machine.MachineKey)),
)
if err != nil {
return nil, fmt.Errorf("failed to parse machine public key: %w", err)
}
}
var discoKey key.DiscoPublic