d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename equal() macro to sa_equal(), which matches the definitions

Browse Source 
of sa_equal() in other files, and makes it more clear what equal()
is comparing.

MFC after:	3 days
This commit is contained in:
rwatson 2005-07-19 10:03:47 +00:00
parent 740ccbab67
commit d19a0a8dd9
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/net/if.c
View File

@ -786,7 +786,7 @@ if_rtdel(struct radix_node *rn, void *arg)
return (0);
}
#define equal(a1, a2) (bcmp((a1), (a2), ((a1))->sa_len) == 0)
#define sa_equal(a1, a2) (bcmp((a1), (a2), ((a1))->sa_len) == 0)
/*
* Locate an interface based on a complete address.
@ -803,13 +803,13 @@ ifa_ifwithaddr(struct sockaddr *addr)
TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
if (ifa->ifa_addr->sa_family != addr->sa_family)
continue;
if (equal(addr, ifa->ifa_addr))
if (sa_equal(addr, ifa->ifa_addr))
goto done;
/* IP6 doesn't have broadcast */
if ((ifp->if_flags & IFF_BROADCAST) &&
ifa->ifa_broadaddr &&
ifa->ifa_broadaddr->sa_len != 0 &&
equal(ifa->ifa_broadaddr, addr))
sa_equal(ifa->ifa_broadaddr, addr))
goto done;
}
ifa = NULL;
@ -835,7 +835,8 @@ ifa_ifwithdstaddr(struct sockaddr *addr)
TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
if (ifa->ifa_addr->sa_family != addr->sa_family)
continue;
if (ifa->ifa_dstaddr && equal(addr, ifa->ifa_dstaddr))
if (ifa->ifa_dstaddr &&
sa_equal(addr, ifa->ifa_dstaddr))
goto done;
}
}
@ -888,8 +889,8 @@ next: continue;
* The trouble is that we don't know the
* netmask for the remote end.
*/
if (ifa->ifa_dstaddr != 0
&& equal(addr, ifa->ifa_dstaddr))
if (ifa->ifa_dstaddr != 0 &&
sa_equal(addr, ifa->ifa_dstaddr))
goto done;
} else {
/*
@ -960,13 +961,14 @@ ifaof_ifpforaddr(struct sockaddr *addr, struct ifnet *ifp)
if (ifa_maybe == 0)
ifa_maybe = ifa;
if (ifa->ifa_netmask == 0) {
if (equal(addr, ifa->ifa_addr) ||
(ifa->ifa_dstaddr && equal(addr, ifa->ifa_dstaddr)))
if (sa_equal(addr, ifa->ifa_addr) ||
(ifa->ifa_dstaddr &&
sa_equal(addr, ifa->ifa_dstaddr)))
goto done;
continue;
}
if (ifp->if_flags & IFF_POINTOPOINT) {
if (equal(addr, ifa->ifa_dstaddr))
if (sa_equal(addr, ifa->ifa_dstaddr))
goto done;
} else {
cp = addr->sa_data;
@ -1838,7 +1840,7 @@ if_addmulti(struct ifnet *ifp, struct sockaddr *sa, struct ifmultiaddr **retifma
* then don't add a new one, just add a reference
*/
TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
if (equal(sa, ifma->ifma_addr)) {
if (sa_equal(sa, ifma->ifma_addr)) {
ifma->ifma_refcount++;
if (retifma)
*retifma = ifma;
@ -1881,7 +1883,7 @@ if_addmulti(struct ifnet *ifp, struct sockaddr *sa, struct ifmultiaddr **retifma
if (llsa != 0) {
TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
if (equal(ifma->ifma_addr, llsa))
if (sa_equal(ifma->ifma_addr, llsa))
break;
}
if (ifma) {
@ -1928,7 +1930,7 @@ if_delmulti(struct ifnet *ifp, struct sockaddr *sa)
int s;
TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link)
if (equal(sa, ifma->ifma_addr))
if (sa_equal(sa, ifma->ifma_addr))
break;
if (ifma == 0)
return ENOENT;
@ -1969,7 +1971,7 @@ if_delmulti(struct ifnet *ifp, struct sockaddr *sa)
* in that case.)
*/
TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link)
if (equal(sa, ifma->ifma_addr))
if (sa_equal(sa, ifma->ifma_addr))
break;
if (ifma == 0)
return 0;
@ -2074,7 +2076,7 @@ ifmaof_ifpforaddr(struct sockaddr *sa, struct ifnet *ifp)
struct ifmultiaddr *ifma;
TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link)
if (equal(ifma->ifma_addr, sa))
if (sa_equal(ifma->ifma_addr, sa))
break;
return ifma;