diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-05-19 01:52:17 +0200 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-05-19 02:40:22 +0200 |
commit | 5a267f0b8cc8aa712b8171f43bea36d0f5767f39 (patch) | |
tree | 85dbcac5846f58444cd1001edbe2f3dac6c0b6d8 | |
parent | 870734ab5e1ee1dd3f8859381c9f173c30ed197f (diff) |
timers: no need to clear keepalive in persistent keepalive
We do this after sending the keepalive anyway.
This is something of a regression, though, since before we'd cancel and
then send, but now we send and then cancel, so it introduces a potential
race, but hopefully that isn't too big of a deal.
Kernel module commit a24b3e6e15ae1ea1291666e5da910caf43eedbaf
-rw-r--r-- | timers.go | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -134,9 +134,6 @@ func expiredZeroKeyMaterial(peer *Peer) { func expiredPersistentKeepalive(peer *Peer) { if peer.persistentKeepaliveInterval > 0 { - if peer.timersActive() { - peer.timers.sendKeepalive.Del() - } peer.SendKeepalive() } } |