Merge remote-tracking branch 'origin/master' into thread-next

diff --cc .gitlab-ci.yml
index 99904465f07ab54e5d008749d919dfb52a565f98,65039bcb2b0618813ae40e45fdbdb1f1e9896af1..7293cde9917036d03a73ddc2261ba043d37583e4
--- 1/.gitlab-ci.yml
--- 2/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -721,9 -715,15 +724,15 @@@ build-netlab
      - netlab
      - amd64
    script:
-     - cd $TOOLS_DIR/netlab
+     - DIR=$(pwd)
+     - cd $TOOLS_DIR
+     - sudo git clean -fx
+     - git pull --ff-only
+     - mv $DIR/build-netlab/* netlab/common/
+     - ln -s $STAYRTR_BINARY netlab/common/stayrtr
+     - cd netlab
      - sudo ./stop
 -    - sudo ./runtest -s v2 -m check $TEST_NAME
 +    - sudo ./runtest -s v3 -m check $TEST_NAME
  
  test-ospf-base:
    <<: *test-base

diff --cc Makefile.in
Simple merge

diff --cc NEWS
index 2e8dea071b0a37c1387f8abdad9f43db46bb4f0d,7fd06ce8202f7780f43c766c3a685bfd07f33c09..18ca846d0340849ed809caaba819b9907acc3d46
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,94 -1,22 +1,113 @@@
- Version 2.16.1 (2025-01-10)
-   o ASPA: fixed parser bug in static protocol
-   o ASPA: fixed static protocol reconfiguration
-   o Babel: fixed seqno comparison
-   o BSD: fixed onlink flag assumption with Netlink
-   o Fixed memory alignment issues
-   o Fixed possible rte src collisions in L3VPN
- 
 +Version 3.1.0 (2025-04-01)
 +  o CLI v2 compatibility layer for show route
 +  o Thread configuration rework
 +  o Merged 2.17
 +
 +Version 3.0.2 (2025-04-01)
 +  o Multiple route propagation crash fixes
 +  o BGP export table route source leak
 +  o Kernel export of source.specific routes fix
 +  o Filter gw setting fix
 +  o Merged 2.16.2
 +
 +Version 3.0.1 (2025-01-10)
 +  o BGP: Fixed crash in dynamic spawn
 +  o BGP: Fixed crash in graceful recovery
 +  o BGP: Fixed crash with deterministic med
 +  o BGP: Renamed the otc attribute to bgp_otc
 +  o BFD: Fixed crash in session reconfiguration
 +  o Kernel: Fixed crash with merged paths
 +  o Kernel: Simplified initial scan
 +  o Tables: Fixed old best route propagation
 +  o Tables: Fixed debug configuration propagation
 +  o Tables: Fixed initial feeds
 +  o CLI: Fixed buffer allocation heap bloating
 +  o Reduced route attribute normalization heap bloating
 +  o Merged 2.16.1
 +
 +Version 3.0.0 (2024-12-17)
 +  - from 2.16
 +    o Multithreaded execution
 +    o Decoupled exports from imports
 +    o Unified route attribute names
 +    o Slightly different log format
 +    o Separate reload command for filters and protocols
 +    o BGP: Export tables show the state as on wire
 +    o Lots of internal changes
 +  - from 3.0alpha3
 +    o Merged changes from 2.16
 +    o BMP and MRT converted to the new API and working
 +    o Internal protocol state journal
 +    o Optimized table journal cleanup
 +    o Fixed "show route export"
 +    o Fixed minor bugs
 +
 +Version 3.0alpha3 (2024-07-01)
 +  o Merged 2.15.1
 +  o Fixed major issues with channel reloads
 +  o Fixed data inconsistencies in many corner cases
 +  o Fixed internal scheduler corner cases
 +  o MRT and BMP still switched off
 +  o Expected one more alpha before stable
 +
 +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.17 (2025-04-01)
+   o Babel: next hop control for IPv4
+   o BGP: link-local next hop format configuration
+   o TCP-AO implementation for Linux
+ 
+ Version 2.16.2 (2025-04-01)
+   o BFD: password reconfiguration crash fix
+   o L3VPN attribute fix
+   o Table removal rare crash fix
+   o Logging minor fix
+ 
++Version 2.16.1 (2025-01-10)
++  o ASPA: fixed parser bug in static protocol
++  o ASPA: fixed static protocol reconfiguration
++  o Babel: fixed seqno comparison
++  o BSD: fixed onlink flag assumption with Netlink
++  o Fixed memory alignment issues
++  o Fixed possible rte src collisions in L3VPN
++
+ Version 2.16.1 (2025-01-10)
+   o ASPA: fixed parser bug in static protocol
+   o ASPA: fixed static protocol reconfiguration
+   o Babel: fixed seqno comparison
+   o BSD: fixed onlink flag assumption with Netlink
+   o Fixed memory alignment issues
+   o Fixed possible rte src collisions in L3VPN
+ 
  Version 2.16 (2024-12-04)
    o BFD: Set password per session
    o BFD: Accept zero checksum for IPv6-UDP