diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2006-06-17 14:14:13 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2006-06-17 14:14:13 +0000 |
| commit | de0cdf16cee1b312d05e322b32bd465c67775f97 (patch) | |
| tree | c1ac3682d3d58962e3de7eb48b22d7bb97f37f35 /sys | |
| parent | 905f0a795ad4f269a1639ca6aa9185dca175073b (diff) | |
adopt to extended rtrequest / rtalloc1 api
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net/if_arcsubr.c | 6 | ||||
| -rw-r--r-- | sys/net/if_tokensubr.c | 4 | ||||
| -rw-r--r-- | sys/netatalk/at_control.c | 4 | ||||
| -rw-r--r-- | sys/nfs/nfs_boot.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/sys/net/if_arcsubr.c b/sys/net/if_arcsubr.c index 6d4851d3af2..b0147db0dc8 100644 --- a/sys/net/if_arcsubr.c +++ b/sys/net/if_arcsubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_arcsubr.c,v 1.22 2006/03/04 22:40:15 brad Exp $ */ +/* $OpenBSD: if_arcsubr.c,v 1.23 2006/06/17 14:14:12 henning Exp $ */ /* $NetBSD: if_arcsubr.c,v 1.8 1996/05/07 02:40:29 thorpej Exp $ */ /* @@ -111,7 +111,7 @@ arc_output(ifp, m0, dst, rt0) if ((rt = rt0)) { if ((rt->rt_flags & RTF_UP) == 0) { - if ((rt0 = rt = rtalloc1(dst, 1))) + if ((rt0 = rt = rtalloc1(dst, 1, 0))) rt->rt_refcnt--; else senderr(EHOSTUNREACH); @@ -121,7 +121,7 @@ arc_output(ifp, m0, dst, rt0) goto lookup; if (((rt = rt->rt_gwroute)->rt_flags & RTF_UP) == 0) { rtfree(rt); rt = rt0; - lookup: rt->rt_gwroute = rtalloc1(rt->rt_gateway, 1); + lookup: rt->rt_gwroute = rtalloc1(rt->rt_gateway, 1, 0); if ((rt = rt->rt_gwroute) == 0) senderr(EHOSTUNREACH); } diff --git a/sys/net/if_tokensubr.c b/sys/net/if_tokensubr.c index 40ab41ae933..d9e27f16919 100644 --- a/sys/net/if_tokensubr.c +++ b/sys/net/if_tokensubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tokensubr.c,v 1.21 2006/03/04 22:40:16 brad Exp $ */ +/* $OpenBSD: if_tokensubr.c,v 1.22 2006/06/17 14:14:12 henning Exp $ */ /* $NetBSD: if_tokensubr.c,v 1.7 1999/05/30 00:39:07 bad Exp $ */ /* @@ -80,7 +80,7 @@ #define senderr(e) { error = (e); goto bad;} #if defined(__bsdi__) || defined(__NetBSD__) || defined(__OpenBSD__) -#define RTALLOC1(a, b) rtalloc1(a, b) +#define RTALLOC1(a, b) rtalloc1(a, b, 0) #define ARPRESOLVE(a, b, c, d, e, f) arpresolve(a, b, c, d, e) #define TYPEHTONS(t) (t) #elif defined(__FreeBSD__) diff --git a/sys/netatalk/at_control.c b/sys/netatalk/at_control.c index 4bc3e2d8174..b8a6bfc91df 100644 --- a/sys/netatalk/at_control.c +++ b/sys/netatalk/at_control.c @@ -1,4 +1,4 @@ -/* $OpenBSD: at_control.c,v 1.8 2006/03/04 22:40:16 brad Exp $ */ +/* $OpenBSD: at_control.c,v 1.9 2006/06/17 14:14:12 henning Exp $ */ /* * Copyright (c) 1990,1991 Regents of The University of Michigan. @@ -650,5 +650,5 @@ aa_dosingleroute(struct ifaddr *ifa, flags |= RTF_HOST; return(rtrequest(cmd, (struct sockaddr *) &addr, (flags & RTF_HOST)?(ifa->ifa_dstaddr):(ifa->ifa_addr), - (struct sockaddr *) &mask, flags, NULL)); + (struct sockaddr *) &mask, flags, NULL, 0)); } diff --git a/sys/nfs/nfs_boot.c b/sys/nfs/nfs_boot.c index 9fe58817622..eed4bb1ad15 100644 --- a/sys/nfs/nfs_boot.c +++ b/sys/nfs/nfs_boot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_boot.c,v 1.17 2006/05/26 01:10:01 deraadt Exp $ */ +/* $OpenBSD: nfs_boot.c,v 1.18 2006/06/17 14:14:12 henning Exp $ */ /* $NetBSD: nfs_boot.c,v 1.26 1996/05/07 02:51:25 thorpej Exp $ */ /* @@ -246,7 +246,7 @@ nfs_boot_init(nd, procp) printf("nfs_boot: gateway=%s\n", inet_ntoa(gw_ip)); /* add, dest, gw, mask, flags, 0 */ error = rtrequest(RTM_ADD, &dst, (struct sockaddr *)&gw, - &mask, (RTF_UP | RTF_GATEWAY | RTF_STATIC), NULL); + &mask, (RTF_UP | RTF_GATEWAY | RTF_STATIC), NULL, 0); if (error) printf("nfs_boot: add route, error=%d\n", error); } |