Merge commit 'v2.14-18-g1d0371a6' into mq-merge-step-2

NEWS

@@ -1,3 +1,33 @@
+Version 2.14 (2023-10-06)
+  o MPLS subsystem
+  o L3VPN: BGP/MPLS VPNs (RFC 4364)
+  o BGP: Access to unknown route attributes
+  o RAdv: Custom options
+  o Babel: RTT metric extension
+  o BMP: Refactored route monitoring
+  o BMP: Multiple instances of BMP protocol
+  o BMP: Both pre-policy and post-policy monitoring
+  o Experimental route aggregation
+  o Filter: Method framework
+  o Filter: Functions have return type statements
+  o Filter: New bytestring data type
+  o Kernel: Option to learn kernel routes
+  o Many bugfixes and improvements
+
+  Notes:
+
+  User-defined filter functions that return values now should have return type
+  statements. We still accept functions without such statement, if they could be
+  properly typed.
+
+  For loops allowed to use both existing iterator variables or ones defined in
+  the for statement. We no longer support the first case, all iterator variables
+  must be defined in the for statement (e.g. 'for int i in bgp_path ...').
+
+  Due to oversight, VRF interfaces were not included in respective VRFs, this is
+  fixed now.
+
+
 Version 2.13.1 (2023-06-23)
   o BGP: Fix role check when no capability option is present
   o Filter: Fixed segfault when a case option had an empty block

doc/bird.sgml

@@ -1127,7 +1127,11 @@ protocol bgp from  {
 <p>The MPLS domain definition is mandatory for a MPLS router. All MPLS channels
 and MPLS-aware protocols are associated with some MPLS domain (although usually
 implicitly with the sole one). In the MPLS domain definition you can configure
-details of MPLS label allocation. Currently, there is just one option:
+details of MPLS label allocation. Currently, there is just one option,
+<cf/label range/.
+
+<p>Note that the MPLS subsystem is experimental, it is likely that there will be
+some backward-incompatible changes in the future.
 
 <descrip>
 	<tag><label id="mpls-domain-label-range">label range <m/name/ { start <m/number/; length <m/number/; [<m/.../] }</tag>
@@ -3632,10 +3636,9 @@ future. It is not ready for production usage and therefore it is not compiled
 by default and have to be enabled during installation by the configure option
 <tt/--with-protocols=/.
 
-<p>The implementation is limited to monitor protocol state changes and routes
+<p>The implementation supports monitoring protocol state changes, pre-policy
-in <ref id="bgp-import-table" name="BGP import tables"> (not regular routing
+routes (in <ref id="bgp-import-table" name="BGP import tables">) and post-policy
-tables), therefore import table must be enabled in BGP protocols. All BGP
+routes (in regular routing tables). All BGP protocols are monitored automatically.
-protocols are monitored automatically.
 
 <sect1>Example
 <label id="bmp-exam">
@@ -3645,8 +3648,11 @@ protocol bmp {
 	# The monitoring station to connect to
 	station address ip 198.51.100.10 port 1790;
 
-	# required option
+	# Monitor received routes (in import table)
 	monitoring rib in pre_policy;
+
+	# Monitor accepted routes (passed import filters)
+	monitoring rib in post_policy;
 }
 </code>
 

misc/bird.spec

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

sysdep/config.h

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