Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

There may be more IP address records with the same IP.

Browse source
This commit is contained in:
Ondrej Zajicek 2011-05-01 17:16:05 +02:00
parent 5964569c23
commit a506476acd
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
nest/iface.c
View file

@ -451,6 +451,13 @@ ifa_recalc_all_primary_addresses(void)
} }
} }
static inline int
ifa_same(struct ifa *a, struct ifa *b)
{
return ipa_equal(a->ip, b->ip) && ipa_equal(a->prefix, b->prefix) &&
a->pxlen == b->pxlen;
}
/** /**
* ifa_update - update interface address * ifa_update - update interface address
@ -467,11 +474,9 @@ ifa_update(struct ifa *a)
struct ifa *b; struct ifa *b;
WALK_LIST(b, i->addrs) WALK_LIST(b, i->addrs)
if (ipa_equal(b->ip, a->ip)) if (ifa_same(b, a))
{ {
if (ipa_equal(b->prefix, a->prefix) && if (ipa_equal(b->brd, a->brd) &&
b->pxlen == a->pxlen &&
ipa_equal(b->brd, a->brd) &&
ipa_equal(b->opposite, a->opposite) && ipa_equal(b->opposite, a->opposite) &&
b->scope == a->scope && b->scope == a->scope &&
!((b->flags ^ a->flags) & IA_PEER)) !((b->flags ^ a->flags) & IA_PEER))
@ -514,7 +519,7 @@ ifa_delete(struct ifa *a)
struct ifa *b; struct ifa *b;
WALK_LIST(b, i->addrs) WALK_LIST(b, i->addrs)
if (ipa_equal(b->ip, a->ip)) if (ifa_same(b, a))
{ {
rem_node(&b->n); rem_node(&b->n);
if (b->flags & IF_UP) if (b->flags & IF_UP)