diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2006-06-16 13:51:22 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2006-06-16 13:51:22 +0000 |
| commit | 0b97243467c8c47cc964b17cfd9700d86774625e (patch) | |
| tree | 9855daeebe9ac969fee0188e96545d0666dacefe /usr.sbin/route6d/route6d.c | |
| parent | c5cd627d4c3c2d1a1a028375117b9a6add494377 (diff) | |
Don't use rmx_hopcount any longer. The kernel ignores it anyway.
OK henning@, norby@, hshoexer@
Diffstat (limited to 'usr.sbin/route6d/route6d.c')
| -rw-r--r-- | usr.sbin/route6d/route6d.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c index ad0ee22f25f..27c39c118ff 100644 --- a/usr.sbin/route6d/route6d.c +++ b/usr.sbin/route6d/route6d.c @@ -1,4 +1,4 @@ -/* $OpenBSD: route6d.c,v 1.44 2006/04/02 21:38:55 djm Exp $ */ +/* $OpenBSD: route6d.c,v 1.45 2006/06/16 13:51:21 claudio Exp $ */ /* $KAME: route6d.c,v 1.94 2002/10/26 20:08:55 itojun Exp $ */ /* @@ -31,7 +31,7 @@ */ #if 0 -static char _rcsid[] = "$OpenBSD: route6d.c,v 1.44 2006/04/02 21:38:55 djm Exp $"; +static char _rcsid[] = "$OpenBSD: route6d.c,v 1.45 2006/06/16 13:51:21 claudio Exp $"; #endif #include <stdio.h> @@ -2566,9 +2566,7 @@ rt_entry(struct rt_msghdr *rtm, int again) if ((rtm->rtm_flags & (RTF_HOST|RTF_GATEWAY)) == RTF_HOST) rrt->rrt_t = 0; /* Don't age non-gateway host routes */ np->rip6_tag = 0; - np->rip6_metric = rtm->rtm_rmx.rmx_hopcount; - if (np->rip6_metric < 1) - np->rip6_metric = 1; + np->rip6_metric = 1; rrt->rrt_flags = rtm->rtm_flags; np->rip6_dest = sin6_dst->sin6_addr; @@ -2680,7 +2678,6 @@ addroute(struct riprt *rrt, const struct in6_addr *gw, struct ifc *ifcp) rtm->rtm_pid = pid; rtm->rtm_flags = rrt->rrt_flags; rtm->rtm_addrs = RTA_DST | RTA_GATEWAY | RTA_NETMASK; - rtm->rtm_rmx.rmx_hopcount = np->rip6_metric - 1; rtm->rtm_inits = RTV_HOPCOUNT; sin6 = (struct sockaddr_in6 *)&buf[sizeof(struct rt_msghdr)]; /* Destination */ |