Merge branch 'dev'

pierky · Jul 24, 2022 · 3ac688b · 3ac688b
2 parents 67a2ddb + 9e3ed93
commit 3ac688b
Show file tree

Hide file tree

Showing 211 changed files with 85,986 additions and 1,720 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -68,9 +68,9 @@ jobs:
         run: |
           echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin
           docker pull pierky/bird:1.6.8
-          docker pull pierky/bird:2.0.9
-          docker pull pierky/openbgpd:7.3
+          docker pull pierky/bird:2.0.10
           docker pull pierky/openbgpd:7.4
+          docker pull pierky/openbgpd:7.5
           docker pull pierky/exabgp:4.2.7
           docker pull nlnetlabs/routinator:v0.8.3
         env:

diff --git a/README.rst b/README.rst
@@ -43,7 +43,7 @@ How it works
 
 #. `Jinja2`_ built-in templates are used to render the final route server's configuration file.
 
-   Currently, **BIRD** (>= 1.6.3 up to 1.6.8), **BIRD v2** (starting from 2.0.7) and **OpenBGPD** (OpenBSD 6.1 up to 7.4 and also OpenBGPD Portable 6.5p1 up to 7.4) are supported, with almost `feature parity <https://arouteserver.readthedocs.io/en/latest/SUPPORTED_SPEAKERS.html#supported-features>`__ between them.
+   Currently, **BIRD** (>= 1.6.3 up to 1.6.8), **BIRD v2** (starting from 2.0.7) and **OpenBGPD** (OpenBSD 6.1 up to 7.5 and also OpenBGPD Portable 6.5p1 up to 7.5) are supported, with almost `feature parity <https://arouteserver.readthedocs.io/en/latest/SUPPORTED_SPEAKERS.html#supported-features>`__ between them.
 
 **Validation** and testing of the configurations generated with this tool are performed using the built-in **live tests** framework: `Docker`_ instances are used to simulate several scenarios and to validate the behaviour of the route server after configuring it with ARouteServer. More details on the `Live tests <https://arouteserver.readthedocs.io/en/latest/LIVETESTS.html>`__ section.
 

diff --git a/config.d/arouteserver.yml b/config.d/arouteserver.yml
@@ -63,7 +63,7 @@
 
 # Sources used by bgpq4/bgpq3.
 # (-S argument).
-#bgpq3_sources: "RIPE,APNIC,AFRINIC,ARIN,NTTCOM,ALTDB,BBOI,BELL,JPIRR,LEVEL3,RADB,RGNET,TC"
+#bgpq3_sources: "RIPE,APNIC,AFRINIC,ARIN,NTTCOM,ALTDB,BBOI,BELL,JPIRR,LEVEL3,RADB,TC"
 
 # Path to the program used to determine the RTT of peers.
 #

diff --git a/config.d/general.yml b/config.d/general.yml
@@ -70,10 +70,10 @@ cfg:
   gtsm: False
 
   # Use ADD-PATH (RFC7911).
-  # The route server will be configure as "able to send multiple
+  # The route server will be configured as "able to send multiple
   # paths to its peer".
   #
-  # OpenBGPD: not supported.
+  # OpenBGPD: supported only from version 7.5.
   #
   # Can be overwritten on a client-by-client basis.
   #

diff --git a/docs/EXAMPLES.rst b/docs/EXAMPLES.rst
@@ -111,7 +111,7 @@ A list of BGP communities is also automatically built.
    limitations
    
    Which BGP daemon will be used? [bird/openbgpd] bird
-   Which version? [1.6.3/1.6.4/1.6.6/1.6.7/1.6.8/2.0.7/2.0.7+b962967e/2.0.8/2.0.9] 1.6.8
+   Which version? [1.6.3/1.6.4/1.6.6/1.6.7/1.6.8/2.0.7/2.0.7+b962967e/2.0.8/2.0.9/2.0.10] 1.6.8
    
    Router server's ASN
    ===================

diff --git a/docs/FEATURES.rst b/docs/FEATURES.rst
@@ -33,7 +33,7 @@ How it works
 
 #. `Jinja2`_ built-in templates are used to render the final route server's configuration file.
 
-   Currently, **BIRD** (>= 1.6.3 up to 1.6.8), **BIRD v2** (starting from 2.0.7) and **OpenBGPD** (OpenBSD 6.1 up to 7.4 and also OpenBGPD Portable 6.5p1 up to 7.4) are supported, with almost `feature parity <https://arouteserver.readthedocs.io/en/latest/SUPPORTED_SPEAKERS.html#supported-features>`__ between them.
+   Currently, **BIRD** (>= 1.6.3 up to 1.6.8), **BIRD v2** (starting from 2.0.7) and **OpenBGPD** (OpenBSD 6.1 up to 7.5 and also OpenBGPD Portable 6.5p1 up to 7.5) are supported, with almost `feature parity <https://arouteserver.readthedocs.io/en/latest/SUPPORTED_SPEAKERS.html#supported-features>`__ between them.
 
 **Validation** and testing of the configurations generated with this tool are performed using the built-in **live tests** framework: `Docker`_ instances are used to simulate several scenarios and to validate the behaviour of the route server after configuring it with ARouteServer. More details on the `Live tests <https://arouteserver.readthedocs.io/en/latest/LIVETESTS.html>`__ section.
 

diff --git a/docs/GENERAL.rst b/docs/GENERAL.rst
@@ -134,11 +134,11 @@ General options: ``cfg``
 
 - ``add_path``:
   Use ADD-PATH (RFC7911).
-  The route server will be configure as "able to send multiple
+  The route server will be configured as "able to send multiple
   paths to its peer".
 
 
-  OpenBGPD: not supported.
+  OpenBGPD: supported only from version 7.5.
 
 
   Can be overwritten on a client-by-client basis.

diff --git a/docs/SUPPORTED_SPEAKERS_CI.txt b/docs/SUPPORTED_SPEAKERS_CI.txt
diff --git a/docs/SUPPORTED_SPEAKERS_FEATURES.txt b/docs/SUPPORTED_SPEAKERS_FEATURES.txt
@@ -76,7 +76,7 @@ GTSM (Generalized TTL Security Mechanism)                  Yes          Yes
 ---------------------------------------------------------- ------------ ------------ ------------ ------------ 
 Multihop sessions                                          Yes :sup:`2` Yes :sup:`2` Yes          Yes          
 ---------------------------------------------------------- ------------ ------------ ------------ ------------ 
-ADD_PATH capability (RFC7911)                              Yes          Yes          N/A          N/A          
+ADD_PATH capability (RFC7911)                              Yes          Yes          Yes          Yes          
 ---------------------------------------------------------- ------------ ------------ ------------ ------------ 
 ========================================================== ============ ============ ============ ============ 
 

diff --git a/examples/auto-config/README.rst b/examples/auto-config/README.rst
@@ -22,7 +22,7 @@ A list of BGP communities is also automatically built.
    limitations
    
    Which BGP daemon will be used? [bird/openbgpd] bird
-   Which version? [1.6.3/1.6.4/1.6.6/1.6.7/1.6.8/2.0.7/2.0.7+b962967e/2.0.8/2.0.9] 1.6.8
+   Which version? [1.6.3/1.6.4/1.6.6/1.6.7/1.6.8/2.0.7/2.0.7+b962967e/2.0.8/2.0.9/2.0.10] 1.6.8
    
    Router server's ASN
    ===================

diff --git a/examples/auto-config/bird4.conf b/examples/auto-config/bird4.conf
@@ -65,7 +65,7 @@ define AS_SET_AS_RIPENCC_asns = [
 
 define AS_SET_AS_RIPENCC_prefixes_4 = [
 	23.128.24.0/24{24,32}, 	27.0.0.0/24{24,32}, 	27.50.0.0/22{22,32}, 	39.0.1.0/24{24,32},
-	84.205.64.0/19{24,32}, 	89.116.100.0/24{24,32}, 	93.175.144.0/24{24,32}, 	93.175.146.0/23{24,32},
+	84.205.64.0/19{24,32}, 	89.116.100.0/24{24,32}, 	93.175.144.0/24{24,32}, 	93.175.146.0/24{24,32},
 	93.175.148.0/22{24,32}, 	93.175.152.0/23{24,32}, 	103.1.0.0/22{22,32}, 	103.1.4.0/24{24,32},
 	106.0.1.0/24{24,32}, 	193.0.0.0/21{21,32}, 	193.0.10.0/23{23,32}, 	193.0.12.0/23{23,32},
 	193.0.18.0/23{23,32}, 	193.0.20.0/22{23,32}, 	193.0.24.0/21{21,32}
@@ -74,10 +74,10 @@ define AS_SET_AS_RIPENCC_prefixes_4 = [
 
 # ARIN Whois database records
 define ARIN_Whois_db_AS10745_4 = [
-	199.43.0.0/24{24,32}, 	192.136.136.0/24{24,32}, 	192.149.252.0/24{24,32}
+	192.136.136.0/24{24,32}, 	199.43.0.0/24{24,32}, 	192.149.252.0/24{24,32}
 ];
 define ARIN_Whois_db_AS12654_4 = [
-	23.128.124.0/24{24,32}, 	23.128.24.0/24{24,32}, 	23.128.125.0/24{24,32}, 	23.128.25.0/24{24,32}
+	23.128.25.0/24{24,32}, 	23.128.124.0/24{24,32}, 	23.128.125.0/24{24,32}, 	23.128.24.0/24{24,32}
 ];
 
 
@@ -813,7 +813,7 @@ filter receive_from_AS10745_1 {
 		{ tag_and_reject(8, 10745); reject "AS_PATH [", bgp_path ,"] contains transit-free ASN - REJECTING ", net; }
 
 	# AS_PATH: never via route-servers ASNs
-	if bgp_path ~ [92, 174, 278, 680, 714, 1273, 1299, 1955, 2152, 2914, 3257, 3265, 3292, 3320, 3491, 3630, 3754, 5391, 5432, 5511, 6079, 6730, 6805, 6830, 6908, 7155, 7843, 7862, 8075, 8365, 8455, 8607, 8943, 9908, 10013, 11164, 11260, 11290, 11670, 12322, 12353, 12822, 13030, 13032, 13760, 14295, 15692, 16509, 17012, 18520, 19237, 20115, 20161, 21396, 23888, 23961, 24282, 27947, 29169, 30967, 30983, 31764, 33983, 34108, 34209, 34587, 35836, 35900, 36165, 36459, 37271, 37529, 38713, 39326, 39651, 40029, 40063, 43470, 46450, 47377, 47583, 48237, 48265, 48408, 49127, 49910, 51530, 51630, 52946, 52965, 52973, 53859, 54295, 55244, 57433, 57468, 57866, 58768, 60412, 60757, 62164, 62567, 62623, 63290, 131398, 131996, 132563, 132829, 132996, 133317, 134022, 135706, 135848, 136106, 136874, 137207, 137610, 138023, 138769, 138953, 139667, 140287, 141091, 141120, 141134, 141140, 141411, 141856, 141892, 142164, 142348, 142369, 146846, 146904, 146958, 147059, 149296, 149663, 149826, 200807, 201978, 202561, 202793, 207353, 207484, 208425, 208548, 209699, 210030, 210715, 212512, 212539, 212623, 212706, 212953, 213202, 262191, 262888, 263258, 263328, 263686, 263801, 263856, 264424, 265337, 265630, 267214, 267442, 268091, 268772, 268952, 269156, 269190, 269367, 269512, 269535, 269574, 269654, 269906, 270407, 270544, 270653, 270781, 270796, 270828, 271053, 271172, 271200, 271203, 272018, 327732, 328445, 328572, 328582, 328959, 393573, 393684, 396304, 396477, 398203, 399338] then
+	if bgp_path ~ [92, 174, 278, 680, 714, 1273, 1299, 1955, 2152, 2914, 3257, 3265, 3292, 3320, 3491, 3630, 3754, 5391, 5432, 5511, 6079, 6730, 6805, 6830, 6908, 7155, 7843, 7862, 8075, 8365, 8455, 8607, 8943, 9908, 10013, 11164, 11260, 11290, 11670, 12322, 12353, 12822, 13030, 13032, 14295, 15692, 16509, 17012, 18520, 19237, 20115, 20161, 21396, 23888, 23961, 24282, 24800, 27947, 29169, 30967, 30983, 31764, 33983, 34108, 34209, 34587, 35836, 35900, 36165, 36459, 37271, 37529, 38713, 39326, 39651, 40029, 40063, 43470, 46450, 47377, 47583, 48237, 48265, 48408, 49127, 49910, 49922, 51530, 51630, 53859, 54295, 55244, 57433, 57468, 57866, 58768, 60412, 60757, 61756, 62164, 62567, 62623, 63290, 131398, 131996, 132563, 132829, 132996, 133317, 134022, 135706, 135848, 136106, 136874, 137207, 137610, 138023, 138769, 138953, 139667, 140287, 141091, 141120, 141134, 141140, 141411, 141856, 141892, 142164, 142348, 142369, 146846, 146958, 147059, 149296, 149663, 149826, 201978, 202561, 202793, 206275, 207353, 207484, 208425, 209699, 210030, 210715, 212512, 212539, 212623, 212706, 212953, 213202, 262191, 262888, 263258, 263686, 263801, 263856, 264424, 265337, 265630, 267214, 267442, 267561, 268091, 269156, 269190, 269367, 269512, 269654, 269906, 270407, 270544, 270781, 270828, 271053, 271172, 271200, 272018, 272124, 327732, 328445, 328572, 328582, 328959, 393573, 393684, 396304, 396477, 398203, 399338] then
 	{ tag_and_reject(15, 10745); reject "AS_PATH [", bgp_path ,"] contains never via route-servers ASN - REJECTING ", net; }
 
 
@@ -1035,7 +1035,7 @@ filter receive_from_AS3333_1 {
 		{ tag_and_reject(8, 3333); reject "AS_PATH [", bgp_path ,"] contains transit-free ASN - REJECTING ", net; }
 
 	# AS_PATH: never via route-servers ASNs
-	if bgp_path ~ [92, 174, 278, 680, 714, 1273, 1299, 1955, 2152, 2914, 3257, 3265, 3292, 3320, 3491, 3630, 3754, 5391, 5432, 5511, 6079, 6730, 6805, 6830, 6908, 7155, 7843, 7862, 8075, 8365, 8455, 8607, 8943, 9908, 10013, 11164, 11260, 11290, 11670, 12322, 12353, 12822, 13030, 13032, 13760, 14295, 15692, 16509, 17012, 18520, 19237, 20115, 20161, 21396, 23888, 23961, 24282, 27947, 29169, 30967, 30983, 31764, 33983, 34108, 34209, 34587, 35836, 35900, 36165, 36459, 37271, 37529, 38713, 39326, 39651, 40029, 40063, 43470, 46450, 47377, 47583, 48237, 48265, 48408, 49127, 49910, 51530, 51630, 52946, 52965, 52973, 53859, 54295, 55244, 57433, 57468, 57866, 58768, 60412, 60757, 62164, 62567, 62623, 63290, 131398, 131996, 132563, 132829, 132996, 133317, 134022, 135706, 135848, 136106, 136874, 137207, 137610, 138023, 138769, 138953, 139667, 140287, 141091, 141120, 141134, 141140, 141411, 141856, 141892, 142164, 142348, 142369, 146846, 146904, 146958, 147059, 149296, 149663, 149826, 200807, 201978, 202561, 202793, 207353, 207484, 208425, 208548, 209699, 210030, 210715, 212512, 212539, 212623, 212706, 212953, 213202, 262191, 262888, 263258, 263328, 263686, 263801, 263856, 264424, 265337, 265630, 267214, 267442, 268091, 268772, 268952, 269156, 269190, 269367, 269512, 269535, 269574, 269654, 269906, 270407, 270544, 270653, 270781, 270796, 270828, 271053, 271172, 271200, 271203, 272018, 327732, 328445, 328572, 328582, 328959, 393573, 393684, 396304, 396477, 398203, 399338] then
+	if bgp_path ~ [92, 174, 278, 680, 714, 1273, 1299, 1955, 2152, 2914, 3257, 3265, 3292, 3320, 3491, 3630, 3754, 5391, 5432, 5511, 6079, 6730, 6805, 6830, 6908, 7155, 7843, 7862, 8075, 8365, 8455, 8607, 8943, 9908, 10013, 11164, 11260, 11290, 11670, 12322, 12353, 12822, 13030, 13032, 14295, 15692, 16509, 17012, 18520, 19237, 20115, 20161, 21396, 23888, 23961, 24282, 24800, 27947, 29169, 30967, 30983, 31764, 33983, 34108, 34209, 34587, 35836, 35900, 36165, 36459, 37271, 37529, 38713, 39326, 39651, 40029, 40063, 43470, 46450, 47377, 47583, 48237, 48265, 48408, 49127, 49910, 49922, 51530, 51630, 53859, 54295, 55244, 57433, 57468, 57866, 58768, 60412, 60757, 61756, 62164, 62567, 62623, 63290, 131398, 131996, 132563, 132829, 132996, 133317, 134022, 135706, 135848, 136106, 136874, 137207, 137610, 138023, 138769, 138953, 139667, 140287, 141091, 141120, 141134, 141140, 141411, 141856, 141892, 142164, 142348, 142369, 146846, 146958, 147059, 149296, 149663, 149826, 201978, 202561, 202793, 206275, 207353, 207484, 208425, 209699, 210030, 210715, 212512, 212539, 212623, 212706, 212953, 213202, 262191, 262888, 263258, 263686, 263801, 263856, 264424, 265337, 265630, 267214, 267442, 267561, 268091, 269156, 269190, 269367, 269512, 269654, 269906, 270407, 270544, 270781, 270828, 271053, 271172, 271200, 272018, 272124, 327732, 328445, 328572, 328582, 328959, 393573, 393684, 396304, 396477, 398203, 399338] then
 	{ tag_and_reject(15, 3333); reject "AS_PATH [", bgp_path ,"] contains never via route-servers ASN - REJECTING ", net; }
 
 

diff --git a/examples/auto-config/openbgpd.conf b/examples/auto-config/openbgpd.conf
@@ -71,7 +71,7 @@ prefix-set "AS_SET_AS_RIPENCC_prefixes" {
     84.205.64.0/19 prefixlen 24 - 32
     89.116.100.0/24 prefixlen 24 - 32
     93.175.144.0/24 prefixlen 24 - 32
-    93.175.146.0/23 prefixlen 24 - 32
+    93.175.146.0/24 prefixlen 24 - 32
     93.175.148.0/22 prefixlen 24 - 32
     93.175.152.0/23 prefixlen 24 - 32
     103.1.0.0/22 prefixlen 22 - 32
@@ -85,7 +85,7 @@ prefix-set "AS_SET_AS_RIPENCC_prefixes" {
     193.0.24.0/21 prefixlen 21 - 32
     2001:67c:64::/48 prefixlen 48 - 128
     2001:67c:2e8::/48 prefixlen 48 - 128
-    2001:7fb:fd02::/47 prefixlen 48 - 128
+    2001:7fb:fd02::/48 prefixlen 48 - 128
     2001:7fb:fd04::/48 prefixlen 48 - 128
     2001:7fb:fe00::/45 prefixlen 48 - 128
     2001:7fb:fe0a::/47 prefixlen 48 - 128
@@ -237,7 +237,7 @@ prefix-set "bogons" {
 
 # never via route-servers ASNs
 as-set "neverviarouteserver" {
-	92, 174, 278, 680, 714, 1273, 1299, 1955, 2152, 2914, 3257, 3265, 3292, 3320, 3491, 3630, 3754, 5391, 5432, 5511, 6079, 6730, 6805, 6830, 6908, 7155, 7843, 7862, 8075, 8365, 8455, 8607, 8943, 9908, 10013, 11164, 11260, 11290, 11670, 12322, 12353, 12822, 13030, 13032, 13760, 14295, 15692, 16509, 17012, 18520, 19237, 20115, 20161, 21396, 23888, 23961, 24282, 27947, 29169, 30967, 30983, 31764, 33983, 34108, 34209, 34587, 35836, 35900, 36165, 36459, 37271, 37529, 38713, 39326, 39651, 40029, 40063, 43470, 46450, 47377, 47583, 48237, 48265, 48408, 49127, 49910, 51530, 51630, 52946, 52965, 52973, 53859, 54295, 55244, 57433, 57468, 57866, 58768, 60412, 60757, 62164, 62567, 62623, 63290, 131398, 131996, 132563, 132829, 132996, 133317, 134022, 135706, 135848, 136106, 136874, 137207, 137610, 138023, 138769, 138953, 139667, 140287, 141091, 141120, 141134, 141140, 141411, 141856, 141892, 142164, 142348, 142369, 146846, 146904, 146958, 147059, 149296, 149663, 149826, 200807, 201978, 202561, 202793, 207353, 207484, 208425, 208548, 209699, 210030, 210715, 212512, 212539, 212623, 212706, 212953, 213202, 262191, 262888, 263258, 263328, 263686, 263801, 263856, 264424, 265337, 265630, 267214, 267442, 268091, 268772, 268952, 269156, 269190, 269367, 269512, 269535, 269574, 269654, 269906, 270407, 270544, 270653, 270781, 270796, 270828, 271053, 271172, 271200, 271203, 272018, 327732, 328445, 328572, 328582, 328959, 393573, 393684, 396304, 396477, 398203, 399338
+	92, 174, 278, 680, 714, 1273, 1299, 1955, 2152, 2914, 3257, 3265, 3292, 3320, 3491, 3630, 3754, 5391, 5432, 5511, 6079, 6730, 6805, 6830, 6908, 7155, 7843, 7862, 8075, 8365, 8455, 8607, 8943, 9908, 10013, 11164, 11260, 11290, 11670, 12322, 12353, 12822, 13030, 13032, 14295, 15692, 16509, 17012, 18520, 19237, 20115, 20161, 21396, 23888, 23961, 24282, 24800, 27947, 29169, 30967, 30983, 31764, 33983, 34108, 34209, 34587, 35836, 35900, 36165, 36459, 37271, 37529, 38713, 39326, 39651, 40029, 40063, 43470, 46450, 47377, 47583, 48237, 48265, 48408, 49127, 49910, 49922, 51530, 51630, 53859, 54295, 55244, 57433, 57468, 57866, 58768, 60412, 60757, 61756, 62164, 62567, 62623, 63290, 131398, 131996, 132563, 132829, 132996, 133317, 134022, 135706, 135848, 136106, 136874, 137207, 137610, 138023, 138769, 138953, 139667, 140287, 141091, 141120, 141134, 141140, 141411, 141856, 141892, 142164, 142348, 142369, 146846, 146958, 147059, 149296, 149663, 149826, 201978, 202561, 202793, 206275, 207353, 207484, 208425, 209699, 210030, 210715, 212512, 212539, 212623, 212706, 212953, 213202, 262191, 262888, 263258, 263686, 263801, 263856, 264424, 265337, 265630, 267214, 267442, 267561, 268091, 269156, 269190, 269367, 269512, 269654, 269906, 270407, 270544, 270781, 270828, 271053, 271172, 271200, 272018, 272124, 327732, 328445, 328572, 328582, 328959, 393573, 393684, 396304, 396477, 398203, 399338
 }
 
 # =====================================================================================