Merge commit '66d6ac70856bdb29840983454373bb10a532e4f7' into thread-next

diff --cc NEWS
index df00d50908f81be030610f6dfc3a9e27cabebc07,0637fc240019041ec88eb531d2f3065efe579936..aecaa725e9b092a8049f4cb52b2df5fe2821b91e
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,35 -1,15 +1,47 @@@
 +Version 3.0alpha2 (2023-05-11)
 +  o Fixed memory leaks and use-after free bugs
 +  o Simple thread work balancing
 +  o MRT switched off
 +  o Slow kernel route synchronization to be fixed later
 +
 +Version 3.0alpha1 (2023-04-18)
 +  o Worker threads for BGP, Pipe, RPKI and BFD
 +  o Configurable number of threads
 +  o Asynchronous route export
 +  o Flat attribute structure
 +  o Inline import tables
 +  o Export tables merged with BGP prefix / attribute buckets
 +  o Fixed ROA check locking inversion in route table dumps
 +  o MRT switched off
 +
 +Version 3.0-alpha0 (2022-02-07)
 +  o Removal of fixed protocol-specific route attributes
 +  o Asynchronous route export
 +  o Explicit table import / export hooks
 +  o Partially lockless route attribute cache
 +  o Thread-safe resource management
 +  o Thread-safe interface notifications
 +  o Thread-safe protocol API
 +  o Adoption of BFD IO loop for general use
 +  o Parallel Pipe protocol
 +  o Parallel RPKI protocol
 +  o Parallel BGP protocol
 +  o Lots of refactoring
 +  o Bugfixes and improvements as they came along
 +
 +
+ Version 2.15 (2024-03-10)
+   o BGP: Send hold timer
+   o BGP: New options to specify required BGP capabilities
+   o BFD: Improvements to 'show bfd sessions' command
+   o RPKI: New 'local address' configuration option
+   o Linux: Support for more route attributes, including
+     TCP congestion control algorithm
+   o Support for UDP logging
+   o Static routes can have both nexthop and interface specified
+   o Completion of command options in BIRD client
+   o Many bugfixes and improvements
+ 
  Version 2.14 (2023-10-06)
    o MPLS subsystem
    o L3VPN: BGP/MPLS VPNs (RFC 4364)

diff --cc proto/aggregator/config.Y
index 2bf2d9b8563d9deb806be37abc5b009000dd1d03,0eb160cbeb85d17bb2810a78d53e4c58bc4746fb..6185eb7787bc9670d5b6b275205977621f2bba6d
--- 1/proto/aggregator/config.Y
--- 2/proto/aggregator/config.Y
+++ b/proto/aggregator/config.Y
@@@ -17,11 -17,12 +17,11 @@@ CF_DEFINE
  #define AGGREGATOR_CFG ((struct aggregator_config *) this_proto)
  #define AGGR_ITEM_ALLOC ((struct aggr_item_node *) cfg_allocz(sizeof(struct aggr_item_node)))
  
 -
  CF_DECLS
  
- CF_KEYWORDS(AGGREGATOR, AGGREGATE, ON, MERGE, BY)
+ CF_KEYWORDS(AGGREGATOR, PEER, AGGREGATE, ON, MERGE, BY)
  
 -%type <ai> aggr_item aggr_list
 +%type <xp> aggr_item aggr_list
  
  CF_GRAMMAR
  

diff --cc proto/babel/config.Y
index 28bf8027bce147565da9f8ae1bc1b31f7c9a8544,d412a54b575feca507438e9807739052a92f1daa..6a7c071f951751e0a3050199670625ffd4bd512e
--- 1/proto/babel/config.Y
--- 2/proto/babel/config.Y
+++ b/proto/babel/config.Y
@@@ -24,9 -24,9 +24,9 @@@ CF_DECL
  
  CF_KEYWORDS(BABEL, INTERFACE, METRIC, RXCOST, HELLO, UPDATE, INTERVAL, PORT,
        TYPE, WIRED, WIRELESS, RX, TX, BUFFER, PRIORITY, LENGTH, CHECK, LINK,
 -      NEXT, HOP, IPV4, IPV6, BABEL_METRIC, SHOW, INTERFACES, NEIGHBORS,
 +      NEXT, HOP, IPV4, IPV6, SHOW, INTERFACES, NEIGHBORS,
        ENTRIES, RANDOMIZE, ROUTER, ID, AUTHENTICATION, NONE, MAC, PERMISSIVE,
-       EXTENDED, TUNNEL, RTT, MIN, MAX, DECAY, SEND, TIMESTAMPS)
+       EXTENDED, TUNNEL, RTT, MIN, MAX, DECAY, SEND, TIMESTAMPS, COST, DELAY)
  
  CF_GRAMMAR
  

diff --cc proto/static/config.Y
Simple merge