diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2014-01-22 06:24:24 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2014-01-22 06:24:24 +0000 |
| commit | df43d09c5310fe733a4ba3f8c8cf4f0101c2f21c (patch) | |
| tree | 78bca9dad32c85ab52a195ba2bd9f554900ea4c7 /usr.sbin/route6d/route6d.c | |
| parent | f1ede1e1bf05f4789c2877bac42eb8cbc746592e (diff) | |
RTA_GENMASK is going to die soon so no need to handle it anymore.
OK benno@ and agreed by dlg@
Diffstat (limited to 'usr.sbin/route6d/route6d.c')
| -rw-r--r-- | usr.sbin/route6d/route6d.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c index eb6245233ee..2fa978b12cf 100644 --- a/usr.sbin/route6d/route6d.c +++ b/usr.sbin/route6d/route6d.c @@ -1,4 +1,4 @@ -/* $OpenBSD: route6d.c,v 1.60 2014/01/07 19:23:13 deraadt Exp $ */ +/* $OpenBSD: route6d.c,v 1.61 2014/01/22 06:24:23 claudio Exp $ */ /* $KAME: route6d.c,v 1.111 2006/10/25 06:38:13 jinmei Exp $ */ /* @@ -2487,13 +2487,13 @@ void rt_entry(struct rt_msghdr *rtm, int again) { struct sockaddr_in6 *sin6_dst, *sin6_gw, *sin6_mask; - struct sockaddr_in6 *sin6_genmask, *sin6_ifp; + struct sockaddr_in6 *sin6_ifp; char *rtmp, *ifname = NULL; struct riprt *rrt, *orrt; struct netinfo6 *np; int s; - sin6_dst = sin6_gw = sin6_mask = sin6_genmask = sin6_ifp = 0; + sin6_dst = sin6_gw = sin6_mask = sin6_ifp = 0; if ((rtm->rtm_flags & RTF_UP) == 0 || rtm->rtm_flags & (RTF_CLONING|RTF_XRESOLVE|RTF_LLINFO|RTF_BLACKHOLE)) { return; /* not interested in the link route */ @@ -2527,10 +2527,6 @@ rt_entry(struct rt_msghdr *rtm, int again) sin6_mask = (struct sockaddr_in6 *)rtmp; rtmp += ROUNDUP(sin6_mask->sin6_len); } - if (rtm->rtm_addrs & RTA_GENMASK) { - sin6_genmask = (struct sockaddr_in6 *)rtmp; - rtmp += ROUNDUP(sin6_genmask->sin6_len); - } if (rtm->rtm_addrs & RTA_IFP) { sin6_ifp = (struct sockaddr_in6 *)rtmp; rtmp += ROUNDUP(sin6_ifp->sin6_len); |