diff options
| author | SUZUKI Shinsuke <suz@FreeBSD.org> | 2005-10-19 16:53:24 +0000 |
|---|---|---|
| committer | SUZUKI Shinsuke <suz@FreeBSD.org> | 2005-10-19 16:53:24 +0000 |
| commit | c1a049ac203c888a2a70796ba437aa2c69da0d6e (patch) | |
| tree | 4dabb85555262e01dfc155ead343e0eaf314c9df /sys/netinet6/in6_src.c | |
| parent | d28bde669a45f32fab8c02036d62543292e1eb05 (diff) | |
| download | src-c1a049ac203c888a2a70796ba437aa2c69da0d6e.tar.gz src-c1a049ac203c888a2a70796ba437aa2c69da0d6e.zip | |
sync with KAME (removed a unnecesary non-standard macro)
Obtained from: KAME
Reviewd by: ume, gnn
Notes
Notes:
svn path=/head/; revision=151478
Diffstat (limited to 'sys/netinet6/in6_src.c')
| -rw-r--r-- | sys/netinet6/in6_src.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c index 24534da588e8..61cf9db51ec8 100644 --- a/sys/netinet6/in6_src.c +++ b/sys/netinet6/in6_src.c @@ -510,7 +510,8 @@ selectroute(dstsock, opts, mopts, ro, retifp, retrt, clone, norouteok) if ((ron->ro_rt && (ron->ro_rt->rt_flags & (RTF_UP | RTF_LLINFO)) != (RTF_UP | RTF_LLINFO)) || - !SA6_ARE_ADDR_EQUAL(satosin6(&ron->ro_dst), sin6_next)) { + !IN6_ARE_ADDR_EQUAL(&satosin6(&ron->ro_dst)->sin6_addr, + &sin6_next->sin6_addr)) { if (ron->ro_rt) { RTFREE(ron->ro_rt); ron->ro_rt = NULL; @@ -967,10 +968,10 @@ add_addrsel_policyent(newpolicy) /* duplication check */ TAILQ_FOREACH(pol, &addrsel_policytab, ape_entry) { - if (SA6_ARE_ADDR_EQUAL(&newpolicy->addr, - &pol->ape_policy.addr) && - SA6_ARE_ADDR_EQUAL(&newpolicy->addrmask, - &pol->ape_policy.addrmask)) { + if (IN6_ARE_ADDR_EQUAL(&newpolicy->addr.sin6_addr, + &pol->ape_policy.addr.sin6_addr) && + IN6_ARE_ADDR_EQUAL(&newpolicy->addrmask.sin6_addr, + &pol->ape_policy.addrmask.sin6_addr)) { ADDRSEL_UNLOCK(); ADDRSEL_XUNLOCK(); FREE(new, M_IFADDR); @@ -1001,9 +1002,10 @@ delete_addrsel_policyent(key) /* search for the entry in the table */ TAILQ_FOREACH(pol, &addrsel_policytab, ape_entry) { - if (SA6_ARE_ADDR_EQUAL(&key->addr, &pol->ape_policy.addr) && - SA6_ARE_ADDR_EQUAL(&key->addrmask, - &pol->ape_policy.addrmask)) { + if (IN6_ARE_ADDR_EQUAL(&key->addr.sin6_addr, + &pol->ape_policy.addr.sin6_addr) && + IN6_ARE_ADDR_EQUAL(&key->addrmask.sin6_addr, + &pol->ape_policy.addrmask.sin6_addr)) { break; } } |