diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2021-10-26 11:18:16 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2021-10-26 11:22:32 +0200 |
| commit | 93bd2b17d6e798afebf6c7b81a9bb2d676ac3bb6 (patch) | |
| tree | f2e8a375643b17a6cf67bf6807b899e7cd2c69ec | |
| parent | compat: taskqueue draining was backported to stable/13 (diff) | |
| download | wireguard-freebsd-93bd2b17d6e798afebf6c7b81a9bb2d676ac3bb6.tar.xz wireguard-freebsd-93bd2b17d6e798afebf6c7b81a9bb2d676ac3bb6.zip | |
if_wg: bump keepalive timers unconditionally on send
The keepalive timers -- both persistent and mandatory -- are part of the
internal state machine, which needs to be cranked whether or not the
packet was actually sent. A packet might be dropped by the network. Or
the packet might be dropped by the local network stack. The latter case
gives a hint -- which is useful for the data_sent event -- but is
harmful to consider for the keepalive state machine. So, crank those
timers before even calling wg_send.
Incidentally, doing it this way matches exactly what Linux's send.c's
wg_packet_create_data_done and Go's send.go's RoutineSequentialSender do
too.
Suggested-by: Kyle Evans <kevans@freebsd.org>
Reported-by: Ryan Roosa <ryanroosa@gmail.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -rw-r--r-- | src/if_wg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/if_wg.c b/src/if_wg.c index 11b8394..6492356 100644 --- a/src/if_wg.c +++ b/src/if_wg.c @@ -1676,10 +1676,10 @@ wg_deliver_out(struct wg_peer *peer) len = m->m_pkthdr.len; + wg_timers_event_any_authenticated_packet_traversal(peer); + wg_timers_event_any_authenticated_packet_sent(peer); rc = wg_send(sc, &endpoint, m); if (rc == 0) { - wg_timers_event_any_authenticated_packet_traversal(peer); - wg_timers_event_any_authenticated_packet_sent(peer); if (len > (sizeof(struct wg_pkt_data) + NOISE_AUTHTAG_LEN)) wg_timers_event_data_sent(peer); counter_u64_add(peer->p_tx_bytes, len); |