TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 04:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

derp: fix server struct fielfd alignment on 32-bit

Browse Source 
Mostly so the GitHub CI will pass on 32-bit.
This commit is contained in:
Brad Fitzpatrick 2020-07-07 09:08:15 -07:00
parent 724ad13fe1
commit c1cabe75dc
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
derp/derp_server.go
View File

@ -38,6 +38,9 @@
writeTimeout = 2 * time.Second writeTimeout = 2 * time.Second
) )
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
// Server is a DERP server. // Server is a DERP server.
type Server struct { type Server struct {
// WriteTimeout, if non-zero, specifies how long to wait // WriteTimeout, if non-zero, specifies how long to wait
@ -51,6 +54,7 @@ type Server struct {
meshKey string meshKey string
// Counters: // Counters:
_ [pad32bit]byte
packetsSent, bytesSent expvar.Int packetsSent, bytesSent expvar.Int
packetsRecv, bytesRecv expvar.Int packetsRecv, bytesRecv expvar.Int
packetsDropped expvar.Int packetsDropped expvar.Int
@ -61,6 +65,7 @@ type Server struct {
packetsDroppedQueueHead *expvar.Int // queue full, drop head packet packetsDroppedQueueHead *expvar.Int // queue full, drop head packet
packetsDroppedQueueTail *expvar.Int // queue full, drop tail packet packetsDroppedQueueTail *expvar.Int // queue full, drop tail packet
packetsDroppedWrite *expvar.Int // error writing to dst conn packetsDroppedWrite *expvar.Int // error writing to dst conn
_ [pad32bit]byte
packetsForwardedOut expvar.Int packetsForwardedOut expvar.Int
packetsForwardedIn expvar.Int packetsForwardedIn expvar.Int
peerGoneFrames expvar.Int // number of peer gone frames sent peerGoneFrames expvar.Int // number of peer gone frames sent