Merge pull request #842 from Arceliar/mutex

Fix incorrect mutex use in ipv6rwc

src/core/debug.go

@@ -1,3 +1,4 @@
+//go:build debug
 // +build debug
 
 package core

src/core/tcp_darwin.go

@@ -1,3 +1,4 @@
+//go:build darwin
 // +build darwin
 
 package core

src/core/tcp_linux.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package core

src/core/tcp_other.go

@@ -1,3 +1,4 @@
+//go:build !darwin && !linux
 // +build !darwin,!linux
 
 package core

src/defaults/defaults_darwin.go

@@ -1,3 +1,4 @@
+//go:build darwin
 // +build darwin
 
 package defaults

src/defaults/defaults_freebsd.go

@@ -1,3 +1,4 @@
+//go:build freebsd
 // +build freebsd
 
 package defaults

src/defaults/defaults_linux.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package defaults

src/defaults/defaults_openbsd.go

@@ -1,3 +1,4 @@
+//go:build openbsd
 // +build openbsd
 
 package defaults

src/defaults/defaults_other.go

@@ -1,3 +1,4 @@
+//go:build !linux && !darwin && !windows && !openbsd && !freebsd
 // +build !linux,!darwin,!windows,!openbsd,!freebsd
 
 package defaults

src/defaults/defaults_windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package defaults

src/ipv6rwc/ipv6rwc.go

@@ -132,6 +132,7 @@ func (k *keyStore) update(key ed25519.PublicKey) *keyInfo {
 	var kArray keyArray
 	copy(kArray[:], key)
 	var info *keyInfo
+	var packets [][]byte
 	if info = k.keyToInfo[kArray]; info == nil {
 		info = new(keyInfo)
 		info.key = kArray
@@ -140,19 +141,19 @@ func (k *keyStore) update(key ed25519.PublicKey) *keyInfo {
 		k.keyToInfo[info.key] = info
 		k.addrToInfo[info.address] = info
 		k.subnetToInfo[info.subnet] = info
-		k.resetTimeout(info)
-		k.mutex.Unlock()
 		if buf := k.addrBuffer[info.address]; buf != nil {
-			k.core.WriteTo(buf.packet, iwt.Addr(info.key[:]))
+			packets = append(packets, buf.packet)
 			delete(k.addrBuffer, info.address)
 		}
 		if buf := k.subnetBuffer[info.subnet]; buf != nil {
-			k.core.WriteTo(buf.packet, iwt.Addr(info.key[:]))
+			packets = append(packets, buf.packet)
 			delete(k.subnetBuffer, info.subnet)
 		}
-	} else {
+	}
-		k.resetTimeout(info)
+	k.resetTimeout(info)
-		k.mutex.Unlock()
+	k.mutex.Unlock()
+	for _, packet := range packets {
+		k.core.WriteTo(packet, iwt.Addr(info.key[:]))
 	}
 	return info
 }

src/multicast/multicast_darwin.go

@@ -1,3 +1,4 @@
+//go:build darwin
 // +build darwin
 
 package multicast

src/multicast/multicast_other.go

@@ -1,3 +1,4 @@
+//go:build !linux && !darwin && !netbsd && !freebsd && !openbsd && !dragonflybsd && !windows
 // +build !linux,!darwin,!netbsd,!freebsd,!openbsd,!dragonflybsd,!windows
 
 package multicast

src/multicast/multicast_unix.go

@@ -1,3 +1,4 @@
+//go:build linux || netbsd || freebsd || openbsd || dragonflybsd
 // +build linux netbsd freebsd openbsd dragonflybsd
 
 package multicast

src/multicast/multicast_windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package multicast

src/tuntap/tun_bsd.go

@@ -1,3 +1,4 @@
+//go:build openbsd || freebsd
 // +build openbsd freebsd
 
 package tuntap

src/tuntap/tun_darwin.go

@@ -1,3 +1,4 @@
+//go:build !mobile
 // +build !mobile
 
 package tuntap

src/tuntap/tun_linux.go

@@ -1,3 +1,4 @@
+//go:build !mobile
 // +build !mobile
 
 package tuntap

src/tuntap/tun_other.go

@@ -1,3 +1,4 @@
+//go:build !linux && !darwin && !windows && !openbsd && !freebsd && !mobile
 // +build !linux,!darwin,!windows,!openbsd,!freebsd,!mobile
 
 package tuntap

src/tuntap/tun_windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package tuntap