TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-20 11:58:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

derp: fix atomic padding on 32-bit again

Browse Source 
Broken by earlier OnlyDisco addition.
This commit is contained in:
Brad Fitzpatrick 2020-07-16 13:38:21 -07:00
parent a6559a8924
commit 52969bdfb0
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
derp/derp_server.go
View File

@ -40,7 +40,11 @@ const (
) )
const host64bit = (^uint(0) >> 32) & 1 // 1 on 64-bit, 0 on 32-bit const host64bit = (^uint(0) >> 32) & 1 // 1 on 64-bit, 0 on 32-bit
const pad32bit = 4 - host64bit*4 // 0 on 64-bit, 4 on 32-bit
// pad32bit is 4 on 32-bit machines and 0 on 64-bit.
// It exists so the Server struct's atomic fields can be aligned to 8
// byte boundaries. (As tested by GOARCH=386 go test, etc)
const pad32bit = 4 - host64bit*4 // 0 on 64-bit, 4 on 32-bit
// Server is a DERP server. // Server is a DERP server.
type Server struct { type Server struct {
@ -53,6 +57,7 @@ type Server struct {
// NAT traversal works (using DERP for out-of-band messaging) // NAT traversal works (using DERP for out-of-band messaging)
// but the packets themselves aren't going via DERP. // but the packets themselves aren't going via DERP.
OnlyDisco bool OnlyDisco bool
_ [pad32bit]byte
privateKey key.Private privateKey key.Private
publicKey key.Public publicKey key.Public