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

Ignore Hello packets from different IP network (than primary).

Browse source
This commit is contained in:
Ondrej Zajicek 2009-05-24 17:51:27 +02:00
parent 050ceb867f
commit 8cc598a520
2 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
proto/ospf/hello.c
View file

@ -24,16 +24,36 @@ ospf_hello_receive(struct ospf_hello_packet *ps,
mask = ps->netmask; mask = ps->netmask;
ipa_ntoh(mask); ipa_ntoh(mask);
if (((ifa->type != OSPF_IT_VLINK) && (ifa->type != OSPF_IT_PTP)) && if (ifa->type != OSPF_IT_VLINK)
((unsigned) ipa_mklen(mask) != ifa->iface->addr->pxlen)) {
{ char *msg = L_WARN "Received HELLO packet %s (%I) is inconsistent "
log(L_ERR "%s%I%sbad netmask %I.", beg, faddr, rec, mask); "with the primary address of interface %s.";
return;
} if ((ifa->type != OSPF_IT_PTP) &&
!ipa_equal(mask, ipa_mkmask(ifa->iface->addr->pxlen)))
{
if (!n) log(msg, "netmask", mask, ifa->iface->name);
return;
}
/* This check is not specified in RFC 2328, but it is needed
* to handle the case when there is more IP networks on one
* physical network (which is not handled in RFC 2328).
* We allow OSPF on primary IP address only and ignore HELLO packets
* with secondary addresses (which are sent for example by Quagga.
*/
if ((ifa->iface->addr->flags & IA_UNNUMBERED) ?
!ipa_equal(faddr, ifa->iface->addr->opposite) :
!ipa_equal(ipa_and(faddr,mask), ifa->iface->addr->prefix))
{
if (!n) log(msg, "address", faddr, ifa->iface->name);
return;
}
}
if (ntohs(ps->helloint) != ifa->helloint) if (ntohs(ps->helloint) != ifa->helloint)
{ {
log(L_WARN "%s%I%shello interval mismatch (%d).", beg, faddr, rec, log(L_ERR "%s%I%shello interval mismatch (%d).", beg, faddr, rec,
ntohs(ps->helloint)); ntohs(ps->helloint));
return; return;
} }

3
proto/ospf/packet.c
View file

@ -323,6 +323,9 @@ ospf_rx_hook(sock * sk, int size)
return 1; return 1;
} }
/* This is deviation from RFC 2328 - neighbours should be identified by
* IP address on broadcast and NBMA networks.
*/
n = find_neigh(ifa, ntohl(((struct ospf_packet *) ps)->routerid)); n = find_neigh(ifa, ntohl(((struct ospf_packet *) ps)->routerid));
if(!n && (ps->type != HELLO_P)) if(!n && (ps->type != HELLO_P))