diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2017-05-31 05:32:36 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-05-31 14:23:13 +0200 |
| commit | e3030b64e64cc2e1192e06ffe3faab3ece1f3fc3 (patch) | |
| tree | 1c0951216dca1092642f5f8e0edc2ee2cc7cc518 /src/send.c | |
| parent | timers: the completion of a handshake also is on key confirmation (diff) | |
| download | wireguard-monolithic-historical-e3030b64e64cc2e1192e06ffe3faab3ece1f3fc3.tar.xz wireguard-monolithic-historical-e3030b64e64cc2e1192e06ffe3faab3ece1f3fc3.zip | |
timers: reset retry-attempt counter when not retrying
Diffstat (limited to 'src/send.c')
| -rw-r--r-- | src/send.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -44,8 +44,11 @@ void packet_send_queued_handshakes(struct work_struct *work) peer_put(peer); } -void packet_queue_handshake_initiation(struct wireguard_peer *peer) +void packet_queue_handshake_initiation(struct wireguard_peer *peer, bool is_retry) { + if (!is_retry) + peer->timer_handshake_attempts = 0; + /* First checking the timestamp here is just an optimization; it will * be caught while properly locked inside the actual work queue. */ if (!time_is_before_jiffies64(peer->last_sent_handshake + REKEY_TIMEOUT)) @@ -100,7 +103,7 @@ static inline void keep_key_fresh(struct wireguard_peer *peer) rcu_read_unlock_bh(); if (send) - packet_queue_handshake_initiation(peer); + packet_queue_handshake_initiation(peer, false); } void packet_send_keepalive(struct wireguard_peer *peer) @@ -183,7 +186,7 @@ void packet_send_queue(struct wireguard_peer *peer) skb_queue_splice(&queue, &peer->tx_packet_queue); spin_unlock_bh(&peer->tx_packet_queue.lock); - packet_queue_handshake_initiation(peer); + packet_queue_handshake_initiation(peer, false); break; default: /* If we failed for any other reason, we want to just free the packets and |