eburet-oss/wireguard-go-awg2-lx
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix shutdown races

Browse source
This commit is contained in:
Jason A. Donenfeld 2018-09-24 01:52:02 +02:00
parent 833597b585
commit ebc7541953
3 changed files with 42 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
receive.go
View file

@ -247,7 +247,6 @@ func (device *Device) RoutineDecryption() {
// check if dropped
if elem.IsDropped() {
device.PutInboundElement(elem)
continue
}
@ -281,7 +280,6 @@ func (device *Device) RoutineDecryption() {
if err != nil {
elem.Drop()
device.PutMessageBuffer(elem.buffer)
elem.buffer = nil
}
elem.mutex.Unlock()
}
@ -313,6 +311,7 @@ func (device *Device) RoutineHandshake() {
for {
if elem.buffer != nil {
device.PutMessageBuffer(elem.buffer)
elem.buffer = nil
}
select {
@ -494,7 +493,7 @@ func (peer *Peer) RoutineSequentialReceiver() {
logDebug.Println(peer, "- Routine: sequential receiver - stopped")
peer.routines.stopping.Done()
if elem != nil {
if elem.buffer != nil {
if !elem.IsDropped() {
device.PutMessageBuffer(elem.buffer)
}
device.PutInboundElement(elem)
@ -507,10 +506,11 @@ func (peer *Peer) RoutineSequentialReceiver() {
for {
if elem != nil {
if elem.buffer != nil {
if !elem.IsDropped() {
device.PutMessageBuffer(elem.buffer)
}
device.PutInboundElement(elem)
elem = nil
}
select {