diff options
| author | hsu <hsu@FreeBSD.org> | 2002-12-18 11:46:59 +0000 |
|---|---|---|
| committer | hsu <hsu@FreeBSD.org> | 2002-12-18 11:46:59 +0000 |
| commit | c3153934cb24d911042c92eedf9e5dd6d7be07e1 (patch) | |
| tree | 079e82ffd683b796c6432b8bcf3ff23f996d4e04 /sys/net/route.c | |
| parent | 2d0e93bb2eab2533104a92a432361a0d75aae7da (diff) | |
| download | FreeBSD-src-c3153934cb24d911042c92eedf9e5dd6d7be07e1.zip FreeBSD-src-c3153934cb24d911042c92eedf9e5dd6d7be07e1.tar.gz | |
Lock up ifaddr reference counts.
Diffstat (limited to 'sys/net/route.c')
| -rw-r--r-- | sys/net/route.c | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/sys/net/route.c b/sys/net/route.c index adf0b3b..bb07949 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -213,7 +213,6 @@ rtfree(rt) */ register struct radix_node_head *rnh = rt_tables[rt_key(rt)->sa_family]; - register struct ifaddr *ifa; if (rt == 0 || rnh == 0) panic("rtfree"); @@ -252,11 +251,10 @@ rtfree(rt) * release references on items we hold them on.. * e.g other routes and ifaddrs. */ - if((ifa = rt->rt_ifa)) - IFAFREE(ifa); - if (rt->rt_parent) { + if (rt->rt_ifa) + IFAFREE(rt->rt_ifa); + if (rt->rt_parent) RTFREE(rt->rt_parent); - } /* * The key is separatly alloc'd so free it (see rt_setgate()). @@ -272,17 +270,7 @@ rtfree(rt) } } -void -ifafree(ifa) - register struct ifaddr *ifa; -{ - if (ifa == NULL) - panic("ifafree"); - if (ifa->ifa_refcnt == 0) - free(ifa, M_IFADDR); - else - ifa->ifa_refcnt--; -} +#define equal(a1, a2) (bcmp((caddr_t)(a1), (caddr_t)(a2), (a1)->sa_len) == 0) /* * Force a routing table entry to the specified @@ -317,7 +305,6 @@ rtredirect(dst, gateway, netmask, flags, src, rtp) * we have a routing loop, perhaps as a result of an interface * going down recently. */ -#define equal(a1, a2) (bcmp((caddr_t)(a1), (caddr_t)(a2), (a1)->sa_len) == 0) if (!(flags & RTF_DONE) && rt && (!equal(src, rt->rt_gateway) || rt->rt_ifa != ifa)) error = EINVAL; @@ -394,8 +381,8 @@ out: } /* -* Routing table ioctl interface. -*/ + * Routing table ioctl interface. + */ int rtioctl(req, data) u_long req; @@ -443,7 +430,7 @@ ifa_ifwithroute(flags, dst, gateway) struct rtentry *rt = rtalloc1(gateway, 0, 0UL); if (rt == 0) return (0); - rt->rt_refcnt--; + --rt->rt_refcnt; if ((ifa = rt->rt_ifa) == 0) return (0); } @@ -679,7 +666,7 @@ rtrequest1(req, info, ret_nrt) * This moved from below so that rnh->rnh_addaddr() can * examine the ifa and ifa->ifa_ifp if it so desires. */ - ifa->ifa_refcnt++; + IFAREF(ifa); rt->rt_ifa = ifa; rt->rt_ifp = ifa->ifa_ifp; /* XXX mtu manipulation will be done in rnh_addaddr -- itojun */ |
