diff options
| author |   jmatthew <jmatthew@openbsd.org> | 2020-08-13 04:26:11 +0000 |
|---|---|---|
| committer | jmatthew <jmatthew@openbsd.org> | 2020-08-13 04:26:11 +0000 |
| commit | 089992381ed8f400c64d487ee82d7e8f15c55ea2 (patch) | |
| tree | 0820466a52f8bf4ed79329ee349e3aa522431dfa | |
| parent | select.2: Xr directly to timersub(3) now that it has a dedicated manpage (diff) | |
| download | wireguard-openbsd-089992381ed8f400c64d487ee82d7e8f15c55ea2.tar.xz wireguard-openbsd-089992381ed8f400c64d487ee82d7e8f15c55ea2.zip | |
Use rtm_miss() rather than the simpler rtm_send() to send route delete
messages, and save the route flags before deleting the route. For L2
route entries, the RTF_LLINFO flag is cleared during deletion, so saving
the flags beforehand means they're correct in the routing socket message.
ok mpi@
| -rw-r--r-- | sys/net/route.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/net/route.c b/sys/net/route.c index 312eac51c3b..0bbd5d3064e 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -1,4 +1,4 @@ -/* $OpenBSD: route.c,v 1.395 2020/07/28 11:16:32 kn Exp $ */ +/* $OpenBSD: route.c,v 1.396 2020/08/13 04:26:11 jmatthew Exp $ */ /* $NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $ */ /* @@ -663,6 +663,7 @@ rtdeletemsg(struct rtentry *rt, struct ifnet *ifp, u_int tableid) { int error; struct rt_addrinfo info; + struct sockaddr_rtlabel sa_rl; struct sockaddr_in6 sa_mask; KASSERT(rt->rt_ifidx == ifp->if_index); @@ -677,8 +678,13 @@ rtdeletemsg(struct rtentry *rt, struct ifnet *ifp, u_int tableid) info.rti_info[RTAX_GATEWAY] = rt->rt_gateway; if (!ISSET(rt->rt_flags, RTF_HOST)) info.rti_info[RTAX_NETMASK] = rt_plen2mask(rt, &sa_mask); + info.rti_info[RTAX_LABEL] = rtlabel_id2sa(rt->rt_labelid, &sa_rl); + info.rti_flags = rt->rt_flags; + info.rti_info[RTAX_IFP] = sdltosa(ifp->if_sadl); + info.rti_info[RTAX_IFA] = rt->rt_ifa->ifa_addr; error = rtrequest_delete(&info, rt->rt_priority, ifp, &rt, tableid); - rtm_send(rt, RTM_DELETE, error, tableid); + rtm_miss(RTM_DELETE, &info, info.rti_flags, rt->rt_priority, + rt->rt_ifidx, error, tableid); if (error == 0) rtfree(rt); return (error); |