diff options
Diffstat (limited to 'src/timers.c')
| -rw-r--r-- | src/timers.c | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/src/timers.c b/src/timers.c index e7cdd11..ef30005 100644 --- a/src/timers.c +++ b/src/timers.c @@ -31,7 +31,7 @@ static void expired_retransmit_handshake(unsigned long ptr) if (peer->timer_handshake_attempts > MAX_TIMER_HANDSHAKES) { pr_debug("%s: Handshake for peer %Lu (%pISpfsc) did not complete after %d attempts, giving up\n", peer->device->dev->name, peer->internal_id, &peer->endpoint.addr, MAX_TIMER_HANDSHAKES + 2); - if (likely(peer->timers_enabled)) + if (likely(netif_running(peer->device->dev))) del_timer(&peer->timer_send_keepalive); /* We drop all packets without a keypair and don't try again, * if we try unsuccessfully for too long to make a handshake. */ @@ -39,7 +39,7 @@ static void expired_retransmit_handshake(unsigned long ptr) /* We set a timer for destroying any residue that might be left * of a partial exchange. */ - if (likely(peer->timers_enabled) && !timer_pending(&peer->timer_zero_key_material)) + if (likely(netif_running(peer->device->dev)) && !timer_pending(&peer->timer_zero_key_material)) mod_timer(&peer->timer_zero_key_material, jiffies + (REJECT_AFTER_TIME * 3)); } else { ++peer->timer_handshake_attempts; @@ -59,7 +59,7 @@ static void expired_send_keepalive(unsigned long ptr) packet_send_keepalive(peer); if (peer->timer_need_another_keepalive) { peer->timer_need_another_keepalive = false; - if (likely(peer->timers_enabled)) + if (likely(netif_running(peer->device->dev))) mod_timer(&peer->timer_send_keepalive, jiffies + KEEPALIVE_TIMEOUT); } peer_put(peer); @@ -94,7 +94,7 @@ static void expired_send_persistent_keepalive(unsigned long ptr) { peer_get_from_ptr(ptr); if (likely(peer->persistent_keepalive_interval)) { - if (likely(peer->timers_enabled)) + if (likely(netif_running(peer->device->dev))) del_timer(&peer->timer_send_keepalive); packet_send_keepalive(peer); } @@ -104,17 +104,17 @@ static void expired_send_persistent_keepalive(unsigned long ptr) /* Should be called after an authenticated data packet is sent. */ void timers_data_sent(struct wireguard_peer *peer) { - if (likely(peer->timers_enabled)) + if (likely(netif_running(peer->device->dev))) del_timer(&peer->timer_send_keepalive); - if (likely(peer->timers_enabled) && !timer_pending(&peer->timer_new_handshake)) + if (likely(netif_running(peer->device->dev)) && !timer_pending(&peer->timer_new_handshake)) mod_timer(&peer->timer_new_handshake, jiffies + KEEPALIVE_TIMEOUT + REKEY_TIMEOUT); } /* Should be called after an authenticated data packet is received. */ void timers_data_received(struct wireguard_peer *peer) { - if (likely(peer->timers_enabled) && !timer_pending(&peer->timer_send_keepalive)) + if (likely(netif_running(peer->device->dev)) && !timer_pending(&peer->timer_send_keepalive)) mod_timer(&peer->timer_send_keepalive, jiffies + KEEPALIVE_TIMEOUT); else peer->timer_need_another_keepalive = true; @@ -123,14 +123,14 @@ void timers_data_received(struct wireguard_peer *peer) /* Should be called after any type of authenticated packet is received -- keepalive or data. */ void timers_any_authenticated_packet_received(struct wireguard_peer *peer) { - if (likely(peer->timers_enabled)) + if (likely(netif_running(peer->device->dev))) del_timer(&peer->timer_new_handshake); } /* Should be called after a handshake initiation message is sent. */ void timers_handshake_initiated(struct wireguard_peer *peer) { - if (likely(peer->timers_enabled)) { + if (likely(netif_running(peer->device->dev))) { del_timer(&peer->timer_send_keepalive); mod_timer(&peer->timer_retransmit_handshake, slack_time(jiffies + REKEY_TIMEOUT + prandom_u32_max(REKEY_TIMEOUT_JITTER_MAX))); } @@ -139,7 +139,7 @@ void timers_handshake_initiated(struct wireguard_peer *peer) /* Should be called after a handshake response message is received and processed or when getting key confirmation via the first data message. */ void timers_handshake_complete(struct wireguard_peer *peer) { - if (likely(peer->timers_enabled)) + if (likely(netif_running(peer->device->dev))) del_timer(&peer->timer_retransmit_handshake); peer->timer_handshake_attempts = 0; peer->sent_lastminute_handshake = false; @@ -149,20 +149,19 @@ void timers_handshake_complete(struct wireguard_peer *peer) /* Should be called after an ephemeral key is created, which is before sending a handshake response or after receiving a handshake response. */ void timers_session_derived(struct wireguard_peer *peer) { - if (likely(peer->timers_enabled)) + if (likely(netif_running(peer->device->dev))) mod_timer(&peer->timer_zero_key_material, jiffies + (REJECT_AFTER_TIME * 3)); } /* Should be called before a packet with authentication -- data, keepalive, either handshake -- is sent, or after one is received. */ void timers_any_authenticated_packet_traversal(struct wireguard_peer *peer) { - if (peer->persistent_keepalive_interval && likely(peer->timers_enabled)) + if (peer->persistent_keepalive_interval && likely(netif_running(peer->device->dev))) mod_timer(&peer->timer_persistent_keepalive, slack_time(jiffies + peer->persistent_keepalive_interval)); } -void timers_init_peer(struct wireguard_peer *peer) +void timers_init(struct wireguard_peer *peer) { - peer->timers_enabled = true; setup_timer(&peer->timer_retransmit_handshake, expired_retransmit_handshake, (unsigned long)peer); setup_timer(&peer->timer_send_keepalive, expired_send_keepalive, (unsigned long)peer); setup_timer(&peer->timer_new_handshake, expired_new_handshake, (unsigned long)peer); @@ -171,12 +170,8 @@ void timers_init_peer(struct wireguard_peer *peer) INIT_WORK(&peer->clear_peer_work, queued_expired_zero_key_material); } -void timers_uninit_peer(struct wireguard_peer *peer) +void timers_stop(struct wireguard_peer *peer) { - if (!peer->timers_enabled) - return; - peer->timers_enabled = false; - wmb(); del_timer_sync(&peer->timer_retransmit_handshake); del_timer_sync(&peer->timer_send_keepalive); del_timer_sync(&peer->timer_new_handshake); |