diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2021-03-19 10:50:45 -0600 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2021-03-19 10:55:14 -0600 |
| commit | 6f1c5f3860e6c5ef223e980f88f55cc04bd3209a (patch) | |
| tree | c7752bcd7caa8b300fc4d9c28f3d5f2dfbea551f | |
| parent | if_wg: mark as point to point (diff) | |
| download | wireguard-freebsd-6f1c5f3860e6c5ef223e980f88f55cc04bd3209a.tar.xz wireguard-freebsd-6f1c5f3860e6c5ef223e980f88f55cc04bd3209a.zip | |
if_wg: cleanup timeout_t usage
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -rw-r--r-- | src/if_wg.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/if_wg.c b/src/if_wg.c index 3e9cd8c..f14c540 100644 --- a/src/if_wg.c +++ b/src/if_wg.c @@ -319,10 +319,6 @@ struct wg_softc { #define ENOKEY ENOTCAPABLE #endif -#if __FreeBSD_version > 1300000 -typedef void timeout_t (void *); -#endif - #define GROUPTASK_DRAIN(gtask) \ gtaskqueue_drain((gtask)->gt_taskqueue, &(gtask)->gt_task) @@ -1275,7 +1271,7 @@ wg_timers_event_data_sent(struct wg_timers *t) callout_reset(&t->t_new_handshake, MSEC_2_TICKS( NEW_HANDSHAKE_TIMEOUT * 1000 + arc4random_uniform(REKEY_TIMEOUT_JITTER)), - (timeout_t *)wg_timers_run_new_handshake, t); + (callout_func_t *)wg_timers_run_new_handshake, t); rw_runlock(&t->t_lock); } @@ -1288,7 +1284,7 @@ wg_timers_event_data_received(struct wg_timers *t) if (!callout_pending(&t->t_send_keepalive)) { callout_reset(&t->t_send_keepalive, MSEC_2_TICKS(KEEPALIVE_TIMEOUT * 1000), - (timeout_t *)wg_timers_run_send_keepalive, t); + (callout_func_t *)wg_timers_run_send_keepalive, t); } else { t->t_need_another_keepalive = 1; } @@ -1327,7 +1323,7 @@ wg_timers_event_any_authenticated_packet_traversal(struct wg_timers *t) if (!t->t_disabled && t->t_persistent_keepalive_interval > 0) callout_reset(&t->t_persistent_keepalive, MSEC_2_TICKS(t->t_persistent_keepalive_interval * 1000), - (timeout_t *)wg_timers_run_persistent_keepalive, t); + (callout_func_t *)wg_timers_run_persistent_keepalive, t); rw_runlock(&t->t_lock); } @@ -1340,7 +1336,7 @@ wg_timers_event_handshake_initiated(struct wg_timers *t) callout_reset(&t->t_retry_handshake, MSEC_2_TICKS( REKEY_TIMEOUT * 1000 + arc4random_uniform(REKEY_TIMEOUT_JITTER)), - (timeout_t *)wg_timers_run_retry_handshake, t); + (callout_func_t *)wg_timers_run_retry_handshake, t); rw_runlock(&t->t_lock); } @@ -1380,7 +1376,7 @@ wg_timers_event_session_derived(struct wg_timers *t) if (!t->t_disabled) { callout_reset(&t->t_zero_key_material, MSEC_2_TICKS(REJECT_AFTER_TIME * 3 * 1000), - (timeout_t *)wg_timers_run_zero_key_material, t); + (callout_func_t *)wg_timers_run_zero_key_material, t); } rw_runlock(&t->t_lock); } @@ -1440,7 +1436,7 @@ wg_timers_run_retry_handshake(struct wg_timers *t) if (!callout_pending(&t->t_zero_key_material)) callout_reset(&t->t_zero_key_material, MSEC_2_TICKS(REJECT_AFTER_TIME * 3 * 1000), - (timeout_t *)wg_timers_run_zero_key_material, t); + (callout_func_t *)wg_timers_run_zero_key_material, t); } } @@ -1454,7 +1450,7 @@ wg_timers_run_send_keepalive(struct wg_timers *t) t->t_need_another_keepalive = 0; callout_reset(&t->t_send_keepalive, MSEC_2_TICKS(KEEPALIVE_TIMEOUT * 1000), - (timeout_t *)wg_timers_run_send_keepalive, t); + (callout_func_t *)wg_timers_run_send_keepalive, t); } } |