diff options
| author | Mathias Hall-Andersen <mathias@hall-andersen.dk> | 2018-01-13 09:00:37 +0100 |
|---|---|---|
| committer | Mathias Hall-Andersen <mathias@hall-andersen.dk> | 2018-01-13 09:00:37 +0100 |
| commit | 1dd590b91b893a413666b6daaed848d89bab7f05 (patch) | |
| tree | 702ff9185afe072565a17fb089cf6014f4cbccfc /src/send.go | |
| parent | d73f960aab86b9a12b0b7d18aa80ce1d4f130695 (diff) | |
| download | wireguard-go-1dd590b91b893a413666b6daaed848d89bab7f05.tar.gz wireguard-go-1dd590b91b893a413666b6daaed848d89bab7f05.zip | |
Work on timer teardown + bug fixes
Added waitgroups to peer struct for routine
start / stop synchronisation
Diffstat (limited to 'src/send.go')
| -rw-r--r-- | src/send.go | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/send.go b/src/send.go index 9537f5e..fa13c91 100644 --- a/src/send.go +++ b/src/send.go @@ -192,7 +192,7 @@ func (peer *Peer) RoutineNonce() { for { NextPacket: select { - case <-peer.signal.stop.Wait(): + case <-peer.routines.stop.Wait(): return case elem := <-peer.queue.nonce: @@ -217,7 +217,7 @@ func (peer *Peer) RoutineNonce() { logDebug.Println("Clearing queue for", peer.String()) peer.FlushNonceQueue() goto NextPacket - case <-peer.signal.stop.Wait(): + case <-peer.routines.stop.Wait(): return } } @@ -309,15 +309,20 @@ func (device *Device) RoutineEncryption() { * The routine terminates then the outbound queue is closed. */ func (peer *Peer) RoutineSequentialSender() { + + defer peer.routines.stopping.Done() + device := peer.device logDebug := device.log.Debug logDebug.Println("Routine, sequential sender, started for", peer.String()) + peer.routines.starting.Done() + for { select { - case <-peer.signal.stop.Wait(): + case <-peer.routines.stop.Wait(): logDebug.Println( "Routine, sequential sender, stopped for", peer.String()) return |