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

Fixes problem with OSPF neighbor router ID change. Thanx to Alexander V. Chernikov

Browse source
This commit is contained in:
Ondrej Filip 2013-09-13 18:55:02 +02:00
parent c404f4b968
commit e550a37206
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
proto/ospf/hello.c
View file

@ -101,6 +101,17 @@ ospf_hello_receive(struct ospf_packet *ps_i, struct ospf_iface *ifa,
return; return;
} }
#ifdef OSPFv2
if (n && (n->rid != ntohl(ps_i->routerid)))
{
OSPF_TRACE(D_EVENTS,
"Neighbor %I has changed router id from %R to %R.",
n->ip, n->rid, ntohl(ps_i->routerid));
ospf_neigh_remove(n);
n = NULL;
}
#endif
if (!n) if (!n)
{ {
if ((ifa->type == OSPF_IT_NBMA) || (ifa->type == OSPF_IT_PTMP)) if ((ifa->type == OSPF_IT_NBMA) || (ifa->type == OSPF_IT_PTMP))
@ -132,7 +143,7 @@ ospf_hello_receive(struct ospf_packet *ps_i, struct ospf_iface *ifa,
n = ospf_neighbor_new(ifa); n = ospf_neighbor_new(ifa);
n->rid = ntohl(((struct ospf_packet *) ps)->routerid); n->rid = ntohl(ps_i->routerid);
n->ip = faddr; n->ip = faddr;
n->dr = ntohl(ps->dr); n->dr = ntohl(ps->dr);
n->bdr = ntohl(ps->bdr); n->bdr = ntohl(ps->bdr);