From 8e55a9d8181fb6af58f220d8a6d4d994a8ac69c0 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 23 Jan 2017 18:56:31 +0100 Subject: timers: use setup_timer macro helper --- src/timers.c | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/src/timers.c b/src/timers.c index 91ef0b3..3e6456c 100644 --- a/src/timers.c +++ b/src/timers.c @@ -153,26 +153,11 @@ void timers_any_authenticated_packet_traversal(struct wireguard_peer *peer) void timers_init_peer(struct wireguard_peer *peer) { - init_timer(&peer->timer_retransmit_handshake); - peer->timer_retransmit_handshake.function = expired_retransmit_handshake; - peer->timer_retransmit_handshake.data = (unsigned long)peer; - - init_timer(&peer->timer_send_keepalive); - peer->timer_send_keepalive.function = expired_send_keepalive; - peer->timer_send_keepalive.data = (unsigned long)peer; - - init_timer(&peer->timer_new_handshake); - peer->timer_new_handshake.function = expired_new_handshake; - peer->timer_new_handshake.data = (unsigned long)peer; - - init_timer(&peer->timer_kill_ephemerals); - peer->timer_kill_ephemerals.function = expired_kill_ephemerals; - peer->timer_kill_ephemerals.data = (unsigned long)peer; - - init_timer(&peer->timer_persistent_keepalive); - peer->timer_persistent_keepalive.function = expired_send_persistent_keepalive; - peer->timer_persistent_keepalive.data = (unsigned long)peer; - + 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); + setup_timer(&peer->timer_kill_ephemerals, expired_kill_ephemerals, (unsigned long)peer); + setup_timer(&peer->timer_persistent_keepalive, expired_send_persistent_keepalive, (unsigned long)peer); INIT_WORK(&peer->clear_peer_work, queued_expired_kill_ephemerals); } -- cgit v1.2.3-59-g8ed1b