0
0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-11-10 05:08:42 +00:00

Merge v2.0.12 into thread-next

This commit is contained in:
Maria Matejka 2023-01-24 09:45:50 +01:00
commit 3ac628e0f0
8 changed files with 27 additions and 2 deletions

6
NEWS
View File

@ -1,3 +1,9 @@
Version 2.0.12 (2023-01-23)
o Filter: New 'onlink' route attribute
o Compile-time option to use 4-way tries instead of 16-way ones
o BSD: Support for kernel route metric and other improvements
o Important bugfixes
Version 2.0.11 (2022-11-12) Version 2.0.11 (2022-11-12)
o BGP roles (RFC 9234) o BGP roles (RFC 9234)
o BGP: Keepalive time scaling o BGP: Keepalive time scaling

View File

@ -1,6 +1,6 @@
Summary: BIRD Internet Routing Daemon Summary: BIRD Internet Routing Daemon
Name: bird Name: bird
Version: 2.0.11 Version: 2.0.12
Release: 1 Release: 1
Copyright: GPL Copyright: GPL
Group: Networking/Daemons Group: Networking/Daemons

View File

@ -1945,6 +1945,9 @@ babel_reconfigure_ifaces(struct babel_proto *p, struct babel_config *cf)
WALK_LIST(iface, iface_list) WALK_LIST(iface, iface_list)
{ {
if (p->p.vrf && p->p.vrf != iface->master)
continue;
if (!(iface->flags & IF_UP)) if (!(iface->flags & IF_UP))
continue; continue;

View File

@ -374,6 +374,10 @@ bfd_rx_hook(sock *sk, uint len)
/* FIXME: better session matching and message */ /* FIXME: better session matching and message */
if (!s) if (!s)
return 1; return 1;
/* For active sessions we require matching remote id */
if ((s->loc_state == BFD_STATE_UP) && (ntohl(pkt->snd_id) != s->rem_id))
DROP("mismatched remote id", ntohl(pkt->snd_id));
} }
/* bfd_check_authentication() has its own error logging */ /* bfd_check_authentication() has its own error logging */

View File

@ -1227,6 +1227,9 @@ ospf_reconfigure_ifaces2(struct ospf_proto *p)
WALK_LIST(iface, iface_list) WALK_LIST(iface, iface_list)
{ {
if (p->p.vrf && p->p.vrf != iface->master)
continue;
if (! (iface->flags & IF_UP)) if (! (iface->flags & IF_UP))
continue; continue;
@ -1273,6 +1276,9 @@ ospf_reconfigure_ifaces3(struct ospf_proto *p)
WALK_LIST(iface, iface_list) WALK_LIST(iface, iface_list)
{ {
if (p->p.vrf && p->p.vrf != iface->master)
continue;
if (! (iface->flags & IF_UP)) if (! (iface->flags & IF_UP))
continue; continue;

View File

@ -666,6 +666,9 @@ radv_reconfigure(struct proto *P, struct proto_config *CF)
struct iface *iface; struct iface *iface;
WALK_LIST(iface, iface_list) WALK_LIST(iface, iface_list)
{ {
if (p->p.vrf && p->p.vrf != iface->master)
continue;
if (!(iface->flags & IF_UP)) if (!(iface->flags & IF_UP))
continue; continue;

View File

@ -808,6 +808,9 @@ rip_reconfigure_ifaces(struct rip_proto *p, struct rip_config *cf)
WALK_LIST(iface, iface_list) WALK_LIST(iface, iface_list)
{ {
if (p->p.vrf && p->p.vrf != iface->master)
continue;
if (!(iface->flags & IF_UP)) if (!(iface->flags & IF_UP))
continue; continue;

View File

@ -13,7 +13,7 @@
#ifdef GIT_LABEL #ifdef GIT_LABEL
#define BIRD_VERSION XSTR1(GIT_LABEL) #define BIRD_VERSION XSTR1(GIT_LABEL)
#else #else
#define BIRD_VERSION "2.0.11" #define BIRD_VERSION "2.0.12"
#endif #endif
/* Include parameters determined by configure script */ /* Include parameters determined by configure script */