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

OSPF: Skip out-of-state packets earlier

Browse source 
Sometimes multicast OSPF packet is received when neighbor adjacency is
not established. Such packet should be ignored earlier in packet
processing as otherwise it causes strange error messages when OSPFv3
authentication is enabled.
This commit is contained in:
Ondrej Zajicek (work) 2020-08-12 19:42:44 +02:00
parent c0e1f534c9
commit dc8d9dec4a
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
proto/ospf/packet.c
View file

@ -14,6 +14,14 @@
#include "lib/mac.h" #include "lib/mac.h"
#include "lib/socket.h" #include "lib/socket.h"
const char * const ospf_pkt_names[] = {
[HELLO_P] = "HELLO",
[DBDES_P] = "DBDES",
[LSREQ_P] = "LSREQ",
[LSUPD_P] = "LSUPD",
[LSACK_P] = "LSACK",
};
void void
ospf_pkt_fill_hdr(struct ospf_iface *ifa, void *buf, u8 h_type) ospf_pkt_fill_hdr(struct ospf_iface *ifa, void *buf, u8 h_type)
{ {
@ -550,6 +558,10 @@ found:
if (rid == 0) if (rid == 0)
DROP1("zero router ID"); DROP1("zero router ID");
/* Check packet type here, ospf_pkt_checkauth3() expects valid values */
if (pkt->type < HELLO_P || pkt->type > LSACK_P)
DROP("invalid packet type", pkt->type);
/* In OSPFv2, neighbors are identified by either IP or Router ID, based on network type */ /* In OSPFv2, neighbors are identified by either IP or Router ID, based on network type */
uint t = ifa->type; uint t = ifa->type;
struct ospf_neighbor *n; struct ospf_neighbor *n;
@ -565,11 +577,15 @@ found:
return 1; return 1;
} }
/* Check packet type here, ospf_pkt_checkauth3() expects valid values */ /* We need to ignore out-of-state packets before ospf_pkt_checkauth3() */
if (pkt->type < HELLO_P || pkt->type > LSACK_P) if ((pkt->type > DBDES_P) && (n->state < NEIGHBOR_EXCHANGE))
DROP("invalid packet type", pkt->type); {
OSPF_TRACE(D_PACKETS, "%s packet ignored - lesser state than Exchange",
ospf_pkt_names[pkt->type]);
return 1;
}
/* ospf_pkt_checkauth() has its own error logging */ /* ospf_pkt_checkauthX() has its own error logging */
if ((ospf_is_v2(p) ? if ((ospf_is_v2(p) ?
!ospf_pkt_checkauth2(n, ifa, pkt, len) : !ospf_pkt_checkauth2(n, ifa, pkt, len) :
!ospf_pkt_checkauth3(n, ifa, pkt, len, sk->faddr))) !ospf_pkt_checkauth3(n, ifa, pkt, len, sk->faddr)))