diff options
| -rw-r--r-- | src/if_wg.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/if_wg.c b/src/if_wg.c index ea712b5..c2bc2ee 100644 --- a/src/if_wg.c +++ b/src/if_wg.c @@ -377,7 +377,7 @@ static void wg_queue_purge(struct wg_queue *); static int wg_queue_both(struct wg_queue *, struct wg_queue *, struct wg_packet *); static struct wg_packet *wg_queue_dequeue_serial(struct wg_queue *); static struct wg_packet *wg_queue_dequeue_parallel(struct wg_queue *); -static void wg_input(struct mbuf *, int, struct inpcb *, const struct sockaddr *, void *); +static bool wg_input(struct mbuf *, int, struct inpcb *, const struct sockaddr *, void *); static void wg_peer_send_staged(struct wg_peer *); static int wg_clone_create(struct if_clone *, int, caddr_t); static void wg_qflush(struct ifnet *); @@ -708,7 +708,7 @@ wg_socket_init(struct wg_softc *sc, in_port_t port) if (rc) goto out; - rc = udp_set_kernel_tunneling(so4, wg_input, NULL, sc); + rc = udp_set_kernel_tunneling(so4, (udp_tun_func_t)wg_input, NULL, sc); /* * udp_set_kernel_tunneling can only fail if there is already a tunneling function set. * This should never happen with a new socket. @@ -719,7 +719,7 @@ wg_socket_init(struct wg_softc *sc, in_port_t port) rc = socreate(AF_INET6, &so6, SOCK_DGRAM, IPPROTO_UDP, cred, td); if (rc) goto out; - rc = udp_set_kernel_tunneling(so6, wg_input, NULL, sc); + rc = udp_set_kernel_tunneling(so6, (udp_tun_func_t)wg_input, NULL, sc); MPASS(rc == 0); #endif @@ -1946,7 +1946,7 @@ wg_queue_dequeue_parallel(struct wg_queue *parallel) return (pkt); } -static void +static bool wg_input(struct mbuf *m, int offset, struct inpcb *inpcb, const struct sockaddr *sa, void *_sc) { @@ -1965,7 +1965,7 @@ wg_input(struct mbuf *m, int offset, struct inpcb *inpcb, m = m_unshare(m, M_NOWAIT); if (!m) { if_inc_counter(sc->sc_ifp, IFCOUNTER_IQDROPS, 1); - return; + return true; } /* Caller provided us with `sa`, no need for this header. */ @@ -1974,13 +1974,13 @@ wg_input(struct mbuf *m, int offset, struct inpcb *inpcb, /* Pullup enough to read packet type */ if ((m = m_pullup(m, sizeof(uint32_t))) == NULL) { if_inc_counter(sc->sc_ifp, IFCOUNTER_IQDROPS, 1); - return; + return true; } if ((pkt = wg_packet_alloc(m)) == NULL) { if_inc_counter(sc->sc_ifp, IFCOUNTER_IQDROPS, 1); m_freem(m); - return; + return true; } /* Save send/recv address and port for later. */ @@ -2027,11 +2027,11 @@ wg_input(struct mbuf *m, int offset, struct inpcb *inpcb, } else { goto error; } - return; + return true; error: if_inc_counter(sc->sc_ifp, IFCOUNTER_IERRORS, 1); wg_packet_free(pkt); - return; + return true; } static void |