snow/wireguard-go
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

device: receive: simplify flush loop

Browse source
This commit is contained in:
Jason A. Donenfeld 2019-07-01 15:23:24 +02:00
parent 5e6eff81b6
commit dd8817f50e
1 changed files with 12 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
device/receive.go
View file

@ -485,33 +485,6 @@ func (device *Device) RoutineHandshake() {
} }
} }
func (peer *Peer) elementStopOrFlush(shouldFlush *bool) (stop bool, elemOk bool, elem *QueueInboundElement) {
if !*shouldFlush {
select {
case <-peer.routines.stop:
stop = true
return
case elem, elemOk = <-peer.queue.inbound:
return
}
} else {
select {
case <-peer.routines.stop:
stop = true
return
case elem, elemOk = <-peer.queue.inbound:
return
default:
*shouldFlush = false
err := peer.device.tun.device.Flush()
if err != nil {
peer.device.log.Error.Printf("Unable to flush packets: %v", err)
}
return peer.elementStopOrFlush(shouldFlush)
}
}
}
func (peer *Peer) RoutineSequentialReceiver() { func (peer *Peer) RoutineSequentialReceiver() {
device := peer.device device := peer.device
@ -520,10 +493,6 @@ func (peer *Peer) RoutineSequentialReceiver() {
logDebug := device.log.Debug logDebug := device.log.Debug
var elem *QueueInboundElement var elem *QueueInboundElement
var ok bool
var stop bool
shouldFlush := false
defer func() { defer func() {
logDebug.Println(peer, "- Routine: sequential receiver - stopped") logDebug.Println(peer, "- Routine: sequential receiver - stopped")
@ -549,9 +518,14 @@ func (peer *Peer) RoutineSequentialReceiver() {
elem = nil elem = nil
} }
stop, ok, elem = peer.elementStopOrFlush(&shouldFlush) var elemOk bool
if stop || !ok { select {
case <-peer.routines.stop:
return return
case elem, elemOk = <-peer.queue.inbound:
if !elemOk {
return
}
} }
// wait for decryption // wait for decryption
@ -660,8 +634,11 @@ func (peer *Peer) RoutineSequentialReceiver() {
offset := MessageTransportOffsetContent offset := MessageTransportOffsetContent
_, err := device.tun.device.Write(elem.buffer[:offset+len(elem.packet)], offset) _, err := device.tun.device.Write(elem.buffer[:offset+len(elem.packet)], offset)
if err == nil { if len(peer.queue.inbound) == 0 {
shouldFlush = true err = device.tun.device.Flush()
if err != nil {
peer.device.log.Error.Printf("Unable to flush packets: %v", err)
}
} }
if err != nil && !device.isClosed.Get() { if err != nil && !device.isClosed.Get() {
logError.Println("Failed to write packet to TUN device:", err) logError.Println("Failed to write packet to TUN device:", err)