From dd96787bc78284b906ccfb55f8cd2228da7bfaf9 Mon Sep 17 00:00:00 2001 From: rwatson Date: Mon, 20 Apr 2009 20:09:55 +0000 Subject: Prefer if_addrhead (FreeBSD) to if_addrlist (BSD compat) naming for the interface address list in if_stf.c. Acquire interface address list locks around address list access. MFC after: 2 months --- sys/net/if_stf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'sys') diff --git a/sys/net/if_stf.c b/sys/net/if_stf.c index cc43e51..46757c9 100644 --- a/sys/net/if_stf.c +++ b/sys/net/if_stf.c @@ -382,7 +382,8 @@ stf_getsrcifa6(ifp) struct sockaddr_in6 *sin6; struct in_addr in; - TAILQ_FOREACH(ia, &ifp->if_addrlist, ifa_list) { + IF_ADDR_LOCK(ifp); + TAILQ_FOREACH(ia, &ifp->if_addrhead, ifa_list) { if (ia->ifa_addr->sa_family != AF_INET6) continue; sin6 = (struct sockaddr_in6 *)ia->ifa_addr; @@ -396,8 +397,10 @@ stf_getsrcifa6(ifp) if (ia4 == NULL) continue; + IF_ADDR_UNLOCK(ifp); return (struct in6_ifaddr *)ia; } + IF_ADDR_UNLOCK(ifp); return NULL; } -- cgit v1.1