mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2025-01-20 16:01:53 +00:00
Code Releases Activity

Merge commit 'e550a37206528be39e4751865b46720885fd64ed' into integrated

Browse Source
This commit is contained in:
Ondrej Zajicek 2014-04-29 13:52:01 +02:00
commit 8f4159a911
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
proto/ospf/hello.c
View File

@ -133,16 +133,31 @@ ospf_hello_receive(struct ospf_packet *pkt, struct ospf_iface *ifa,
return; return;
} }
/* XXXX */ /* Check consistency of existing neighbor entry */
#ifdef OSPFv2 if (n)
if (n && (n->rid != ntohl(pkt->routerid)))
{ {
OSPF_TRACE(D_EVENTS, "Neighbor %I has changed router id from %R to %R", unsigned t = ifa->type;
if (ospf_is_v2(po) && ((t == OSPF_IT_BCAST) || (t == OSPF_IT_NBMA) || (t == OSPF_IT_PTMP)))
{
/* Neighbor identified by IP address; Router ID may change */
if (n->rid != ntohl(pkt->routerid))
{
OSPF_TRACE(D_EVENTS, "Neighbor %I has changed Router ID from %R to %R",
n->ip, n->rid, ntohl(pkt->routerid)); n->ip, n->rid, ntohl(pkt->routerid));
ospf_neigh_remove(n); ospf_neigh_remove(n);
n = NULL; n = NULL;
} }
#endif }
else /* OSPFv3 or OSPFv2/PtP */
{
/* Neighbor identified by Router ID; IP address may change */
if (!ipa_equal(faddr, n->ip))
{
OSPF_TRACE(D_EVENTS, "Neighbor address changed from %I to %I", n->ip, faddr);
n->ip = faddr;
}
}
}
if (!n) if (!n)
{ {
@ -183,15 +198,6 @@ ospf_hello_receive(struct ospf_packet *pkt, struct ospf_iface *ifa,
ospf_neigh_update_bfd(n, n->ifa->bfd); ospf_neigh_update_bfd(n, n->ifa->bfd);
} }
/* XXXX */
#ifdef OSPFv3 /* NOTE: this could also be relevant for OSPFv2 on PtP ifaces */
else if (!ipa_equal(faddr, n->ip))
{
OSPF_TRACE(D_EVENTS, "Neighbor address changed from %I to %I", n->ip, faddr);
n->ip = faddr;
}
#endif
ospf_neigh_sm(n, INM_HELLOREC); ospf_neigh_sm(n, INM_HELLOREC);
two_way = 0; two_way = 0;