summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2017-11-29 14:33:06 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2017-11-29 14:34:27 +0100
commite18fb977156f938d76a58906af47cbcd9a3702bb (patch)
tree7bae89656c1c8dc2e2b6546c3f8a6d41c43e4d7c
parent9639e7219e69533fd92022c345869bf8e8c202ff (diff)
device: clear last handshake timer on ifdown
Otherwise new handshakes might not occur immediately when the interface goes up and down. Also initialize peers to having a proper zeroed handshake jiffies. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-rw-r--r--src/device.c1
-rw-r--r--src/peer.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/device.c b/src/device.c
index d585c56..d5dc93c 100644
--- a/src/device.c
+++ b/src/device.c
@@ -102,6 +102,7 @@ static int stop(struct net_device *dev)
timers_stop(peer);
noise_handshake_clear(&peer->handshake);
noise_keypairs_clear(&peer->keypairs);
+ peer->last_sent_handshake = get_jiffies_64() - REKEY_TIMEOUT - HZ;
}
mutex_unlock(&wg->device_update_lock);
skb_queue_purge(&wg->incoming_handshakes);
diff --git a/src/peer.c b/src/peer.c
index 6ff14f4..78ba5b0 100644
--- a/src/peer.c
+++ b/src/peer.c
@@ -52,6 +52,7 @@ struct wireguard_peer *peer_create(struct wireguard_device *wg, const u8 public_
skb_queue_head_init(&peer->staged_packet_queue);
list_add_tail(&peer->peer_list, &wg->peer_list);
pubkey_hashtable_add(&wg->peer_hashtable, peer);
+ peer->last_sent_handshake = get_jiffies_64() - REKEY_TIMEOUT - HZ;
pr_debug("%s: Peer %llu created\n", wg->dev->name, peer->internal_id);
return peer;
}