From: Jason A. Donenfeld <Jason@zx2c4.com>
Date: Fri, 24 Mar 2023 15:21:46 +0000 (+0100)
Subject: conn: move booleans to bottom of StdNetBind struct
X-Git-Tag: 0.0.20250515~40
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=6f895be10d741d138ec240d3c53acf3afde44b6c;p=thirdparty%2Fwireguard-go.git

conn: move booleans to bottom of StdNetBind struct

This results in a more compact structure.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---

diff --git a/conn/bind_std.go b/conn/bind_std.go
index ab2bd85..69789b3 100644
--- a/conn/bind_std.go
+++ b/conn/bind_std.go
@@ -29,17 +29,19 @@ var (
 // methods for sending and receiving multiple datagrams per-syscall. See the
 // proposal in https://github.com/golang/go/issues/45886#issuecomment-1218301564.
 type StdNetBind struct {
-	mu         sync.Mutex // protects following fields
-	ipv4       *net.UDPConn
-	ipv6       *net.UDPConn
-	blackhole4 bool
-	blackhole6 bool
-	ipv4PC     *ipv4.PacketConn // will be nil on non-Linux
-	ipv6PC     *ipv6.PacketConn // will be nil on non-Linux
-
-	udpAddrPool  sync.Pool // following fields are not guarded by mu
+	mu     sync.Mutex // protects all fields except as specified
+	ipv4   *net.UDPConn
+	ipv6   *net.UDPConn
+	ipv4PC *ipv4.PacketConn // will be nil on non-Linux
+	ipv6PC *ipv6.PacketConn // will be nil on non-Linux
+
+	// these three fields are not guarded by mu
+	udpAddrPool  sync.Pool
 	ipv4MsgsPool sync.Pool
 	ipv6MsgsPool sync.Pool
+
+	blackhole4 bool
+	blackhole6 bool
 }
 
 func NewStdNetBind() Bind {