From: Maria Matejka <mq@ucw.cz>
Date: Thu, 9 Nov 2023 14:35:11 +0000 (+0100)
Subject: Merge branch 'mq-aggregator-for-v3' into thread-next
X-Git-Tag: v3.0.0~344
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e203c5a6dd7024190198afeeb2f94508226277c5;p=thirdparty%2Fbird.git

Merge branch 'mq-aggregator-for-v3' into thread-next
---

e203c5a6dd7024190198afeeb2f94508226277c5
diff --cc nest/config.Y
index b3831f1d8,6bd08481c..ea16b8fe7
--- a/nest/config.Y
+++ b/nest/config.Y
@@@ -171,9 -133,10 +171,10 @@@ CF_KEYWORDS(MPLS_LABEL, MPLS_POLICY, MP
  CF_KEYWORDS(IPV4, IPV4_MC, IPV4_MPLS, IPV6, IPV6_MC, IPV6_MPLS, IPV6_SADR, VPN4, VPN4_MC, VPN4_MPLS, VPN6, VPN6_MC, VPN6_MPLS, ROA4, ROA6, FLOW4, FLOW6, MPLS, PRI, SEC)
  
  CF_ENUM(T_ENUM_RTS, RTS_, STATIC, INHERIT, DEVICE, STATIC_DEVICE, REDIRECT,
- 	RIP, OSPF, OSPF_IA, OSPF_EXT1, OSPF_EXT2, BGP, PIPE, BABEL)
+ 	RIP, OSPF, OSPF_IA, OSPF_EXT1, OSPF_EXT2, BGP, PIPE, BABEL, RPKI, L3VPN,
+ 	AGGREGATED)
  CF_ENUM(T_ENUM_SCOPE, SCOPE_, HOST, LINK, SITE, ORGANIZATION, UNIVERSE, UNDEFINED)
 -CF_ENUM(T_ENUM_RTD, RTD_, UNICAST, BLACKHOLE, UNREACHABLE, PROHIBIT)
 +CF_ENUM(T_ENUM_RTD, RTD_, BLACKHOLE, UNREACHABLE, PROHIBIT)
  CF_ENUM(T_ENUM_ROA, ROA_, UNKNOWN, VALID, INVALID)
  CF_ENUM_PX(T_ENUM_AF, AF_, AFI_, IPV4, IPV6)
  CF_ENUM(T_ENUM_MPLS_POLICY, MPLS_POLICY_, NONE, STATIC, PREFIX, AGGREGATE, VRF)