diff --git a/docs/SUPPORTED_SPEAKERS_CI.txt b/docs/SUPPORTED_SPEAKERS_CI.txt index 77571c71..bf5e1e1d 100644 --- a/docs/SUPPORTED_SPEAKERS_CI.txt +++ b/docs/SUPPORTED_SPEAKERS_CI.txt @@ -6,7 +6,7 @@ Total test cases per BGP speaker =============== ========= ============ ============ =========== **BGP speaker** **Total** **Passed ✔** **Failed ✖** **Skipped** BIRD 830 821 0 9 -BIRD v2 939 929 0 10 +BIRD v2 940 930 0 10 BIRD v3 846 837 0 9 OpenBGPD 8.4 458 455 0 3 =============== ========= ============ ============ =========== @@ -131,18 +131,19 @@ reconfigure ✔ ✔ ✔ RFC8950 +++++++ -================================= ======== =========== =========== ================ -**Test** **BIRD** **BIRD v2** **BIRD v3** **OpenBGPD 8.4** -RPKI VALID routes ✔ -RPKI rejected routes, AS0 ✔ -RPKI rejected routes, INVALID ✔ -accepted routes ✔ -dropped routes, not in r_set ✔ -log contains errors ✔ -next hop authorized address AS2_1 ✔ -next hop same-as AS1_2 ✔ -next hop strict mode on AS1_1 ✔ -================================= ======== =========== =========== ================ +================================================================= ======== =========== =========== ================ +**Test** **BIRD** **BIRD v2** **BIRD v3** **OpenBGPD 8.4** +IPv4 prefix length within ipv6_pref_len but outside ipv4_pref_len ✔ +RPKI VALID routes ✔ +RPKI rejected routes, AS0 ✔ +RPKI rejected routes, INVALID ✔ +accepted routes ✔ +dropped routes, not in r_set ✔ +log contains errors ✔ +next hop authorized address AS2_1 ✔ +next hop same-as AS1_2 ✔ +next hop strict mode on AS1_1 ✔ +================================================================= ======== =========== =========== ================ RPKI INVALID tagging, IPv4 ++++++++++++++++++++++++++ diff --git a/examples/auto-config/bird4.conf b/examples/auto-config/bird4.conf index de66afd2..a10daf7a 100644 --- a/examples/auto-config/bird4.conf +++ b/examples/auto-config/bird4.conf @@ -934,7 +934,7 @@ filter receive_from_AS10745_1 { { tag_and_reject(14, 10745); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 10745); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } honor_graceful_shutdown(); @@ -1167,7 +1167,7 @@ filter receive_from_AS3333_1 { { tag_and_reject(14, 3333); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 3333); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } honor_graceful_shutdown(); @@ -1393,7 +1393,7 @@ filter receive_from_AS65551_1 { { tag_and_reject(14, 65551); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 65551); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } honor_graceful_shutdown(); diff --git a/examples/bird_hooks/bird4.conf b/examples/bird_hooks/bird4.conf index 236bd168..370aa1a9 100644 --- a/examples/bird_hooks/bird4.conf +++ b/examples/bird_hooks/bird4.conf @@ -620,7 +620,7 @@ filter receive_from_AS10745_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -835,7 +835,7 @@ filter receive_from_AS3333_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; diff --git a/examples/bird_hooks/bird6.conf b/examples/bird_hooks/bird6.conf index fec95858..0385265a 100644 --- a/examples/bird_hooks/bird6.conf +++ b/examples/bird_hooks/bird6.conf @@ -662,7 +662,7 @@ filter receive_from_AS10745_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/examples/default/bird4.conf b/examples/default/bird4.conf index 871d42af..23d7dbdb 100644 --- a/examples/default/bird4.conf +++ b/examples/default/bird4.conf @@ -361,7 +361,7 @@ filter receive_from_AS10745_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -539,7 +539,7 @@ filter receive_from_AS3333_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -715,7 +715,7 @@ filter receive_from_AS65551_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; diff --git a/examples/default/bird6.conf b/examples/default/bird6.conf index d264a48d..c6fd0f1d 100644 --- a/examples/default/bird6.conf +++ b/examples/default/bird6.conf @@ -396,7 +396,7 @@ filter receive_from_AS10745_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/examples/default/bird_v2.conf b/examples/default/bird_v2.conf index f17c88aa..6b3cb80b 100644 --- a/examples/default/bird_v2.conf +++ b/examples/default/bird_v2.conf @@ -471,7 +471,7 @@ filter receive_from_AS10745_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -653,7 +653,7 @@ filter receive_from_AS10745_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -831,7 +831,7 @@ filter receive_from_AS3333_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1007,7 +1007,7 @@ filter receive_from_AS65551_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; diff --git a/examples/rich/bird4.conf b/examples/rich/bird4.conf index a55b11bf..d91270ac 100644 --- a/examples/rich/bird4.conf +++ b/examples/rich/bird4.conf @@ -1878,7 +1878,7 @@ filter receive_from_AS10745_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2102,7 +2102,7 @@ filter receive_from_AS197000_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2331,7 +2331,7 @@ filter receive_from_AS3333_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; diff --git a/examples/rich/bird6.conf b/examples/rich/bird6.conf index 46e8cee0..ee1837a9 100644 --- a/examples/rich/bird6.conf +++ b/examples/rich/bird6.conf @@ -1897,7 +1897,7 @@ filter receive_from_AS10745_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -2123,7 +2123,7 @@ filter receive_from_AS197000_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/examples/rich/bird_v2.conf b/examples/rich/bird_v2.conf index 3dc09cec..1e2b9f64 100644 --- a/examples/rich/bird_v2.conf +++ b/examples/rich/bird_v2.conf @@ -2028,7 +2028,7 @@ filter receive_from_AS10745_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2254,7 +2254,7 @@ filter receive_from_AS10745_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -2476,7 +2476,7 @@ filter receive_from_AS197000_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2702,7 +2702,7 @@ filter receive_from_AS197000_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -2929,7 +2929,7 @@ filter receive_from_AS3333_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; diff --git a/examples/rpki_rtr/bird_v2.conf b/examples/rpki_rtr/bird_v2.conf index 24f21b2d..24a7e955 100644 --- a/examples/rpki_rtr/bird_v2.conf +++ b/examples/rpki_rtr/bird_v2.conf @@ -504,7 +504,7 @@ filter receive_from_AS10745_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -688,7 +688,7 @@ filter receive_from_AS10745_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -868,7 +868,7 @@ filter receive_from_AS1_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1048,7 +1048,7 @@ filter receive_from_AS3333_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; diff --git a/templates/bird/clients.j2 b/templates/bird/clients.j2 index ccc630f3..c982c4b8 100644 --- a/templates/bird/clients.j2 +++ b/templates/bird/clients.j2 @@ -368,15 +368,18 @@ filter receive_from_{{ client.id }} { {% endif %} # Prefix: length - {% if client.ip|ipaddr_ver == 4 %} - {% set min_pref_len = client.cfg.filtering.ipv4_pref_len.min %} - {% set max_pref_len = client.cfg.filtering.ipv4_pref_len.max %} + {% if "2.0.0"|target_version_ge and client.cfg.rfc8950 and client.ip|ipaddr_ver == 6 %} + {% set afis = [4, 6] %} {% else %} - {% set min_pref_len = client.cfg.filtering.ipv6_pref_len.min %} - {% set max_pref_len = client.cfg.filtering.ipv6_pref_len.max %} + {% set afis = [ client.ip|ipaddr_ver ] %} {% endif %} - if !prefix_len_is_valid({{ min_pref_len }}, {{ max_pref_len }}) then + {% for current_afi in afis %} + {% set min_pref_len = client.cfg.filtering["ipv" ~ current_afi ~ "_pref_len"].min %} + {% set max_pref_len = client.cfg.filtering["ipv" ~ current_afi ~ "_pref_len"].max %} + if {%- if "2.0"|target_version_ge %} net.type = NET_IP{{ current_afi }} && {% else %} {% endif -%} + !prefix_len_is_valid({{ min_pref_len }}, {{ max_pref_len }}) then {{ reject(client, 13, '"prefix len [", net.len, "] not in ' ~ min_pref_len ~ '-' ~ max_pref_len ~ ' - REJECTING ", net') }} + {% endfor %} {% if cfg.graceful_shutdown.enabled %} {% if client.cfg.graceful_shutdown.enabled %} diff --git a/templates/fingerprints.yml b/templates/fingerprints.yml index 21ba48bf..10bd8694 100644 --- a/templates/fingerprints.yml +++ b/templates/fingerprints.yml @@ -1,5 +1,5 @@ bird: - clients.j2: f4d3d45e77a793ec11d52de030aef3178a289d38c535ab111803494933b8c03f02c0f85c0d0570718f2d1b482d6d6eeea40e1f7c48bcb9b4b3069cec1ecb3233 + clients.j2: 2b59e328f8f183a9d47af70d7a48b6ed573779696e23e1fa48049b0503d4d53daa5b29bd9e5047083d9d1f0f365f5d25ef1a6c14a43d7bb92452dd121368580a common.j2: 1888f590f24415b2df86b3f86f4a36ca8c348ae6e5ddfac664e1663928fd5093863b605d5165b4075da38df5bb041f1cbeebee9991efc1be02eb4a696d95e420 header.j2: 25f219ef4d0a4ee64c18b338bc557c246c4759b438f31865a7483ebef8a9a3795e09c85ba301da24d7036b474f7936f7a9ed758f93d66bca36e0624c23729170 irrdb.j2: 4ff9a0dba41a02737c17a2497613f2dcc179a80b79714f18d61162e9503907cfd53765ab426036119e8bcb716d9d24a5380d724235373ae4ab7340d6c6eb074a diff --git a/tests/last b/tests/last index d1e7a1b1..f3ca70ea 100644 --- a/tests/last +++ b/tests/last @@ -270,7 +270,7 @@ RTT getter parser: empty PASSED RTT getter parser: new line only PASSED RTT getter parser: none PASSED -============================= 264 passed in 40.33s ============================= +============================= 264 passed in 40.31s ============================= ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -293,7 +293,7 @@ External resources: RPKI ROAs, rpki-client PASSED External resources: prefixes from AS-SET via bgpq3 PASSED External resources: prefixes from AS-SET via bgpq4 PASSED -============================= 14 passed in 40.65s ============================== +============================= 14 passed in 43.68s ============================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -322,7 +322,7 @@ Live test, BIRD, hooks example, IPv6: dumping routes... Live test, BIRD, hooks example, IPv6: stopping instances... -============================== 4 passed in 10.57s ============================== +============================== 4 passed in 10.54s ============================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -373,7 +373,7 @@ Live test, BIRD, BGP communities, IPv6: dumping routes... Live test, BIRD, BGP communities, IPv6: stopping instances... -============================= 26 passed in 42.07s ============================== +============================= 26 passed in 42.33s ============================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -402,7 +402,7 @@ Live test, BIRD, default config, IPv6: dumping routes... Live test, BIRD, default config, IPv6: stopping instances... -============================== 4 passed in 10.19s ============================== +============================== 4 passed in 10.37s ============================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -983,7 +983,7 @@ Live test, BIRD, global scenario, IPv6, tag&reject: dumping routes... Live test, BIRD, global scenario, IPv6, tag&reject: stopping instances... -================== 518 passed, 6 skipped in 354.22s (0:05:54) ================== +================== 518 passed, 6 skipped in 375.56s (0:06:15) ================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -1018,7 +1018,7 @@ Live test, BIRD, gshut, IPv6: dumping routes... Live test, BIRD, gshut, IPv6: stopping instances... -============================= 10 passed in 30.05s ============================== +============================= 10 passed in 32.76s ============================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -1069,7 +1069,7 @@ Live test, BIRD, max-prefix, IPv6: dumping routes... Live test, BIRD, max-prefix, IPv6: stopping instances... -======================== 26 passed in 133.27s (0:02:13) ======================== +======================== 26 passed in 132.96s (0:02:12) ======================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -1148,7 +1148,7 @@ Live test, BIRD, path hiding, mitigation off, IPv6: dumping routes... Live test, BIRD, path hiding, mitigation off, IPv6: stopping instances... -================== 36 passed, 2 skipped in 127.79s (0:02:07) =================== +================== 36 passed, 2 skipped in 128.79s (0:02:08) =================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -1177,7 +1177,7 @@ Live test, BIRD, examples, rich config, IPv6: dumping routes... Live test, BIRD, examples, rich config, IPv6: stopping instances... -============================== 4 passed in 10.94s ============================== +============================== 4 passed in 11.52s ============================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -1230,7 +1230,7 @@ Live test, BIRD, RPKI INVALID tagging, IPv6: dumping routes... Live test, BIRD, RPKI INVALID tagging, IPv6: stopping instances... -============================= 28 passed in 56.34s ============================== +============================= 28 passed in 59.30s ============================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -1267,7 +1267,7 @@ Live test, BIRD, BOV custom comms, IPv6: dumping routes... Live test, BIRD, BOV custom comms, IPv6: stopping instances... -============================= 12 passed in 33.05s ============================== +============================= 12 passed in 33.61s ============================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -1474,7 +1474,7 @@ Live test, BIRD, tag prefix/origin empty AS-SET, IPv6: dumping routes... Live test, BIRD, tag prefix/origin empty AS-SET, IPv6: stopping instances... -======================= 166 passed in 122.15s (0:02:02) ======================== +======================= 166 passed in 122.78s (0:02:02) ======================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -1545,7 +1545,7 @@ Live test, BIRD, 'tag' reject policy scenario, IPv6: dumping routes... Live test, BIRD, 'tag' reject policy scenario, IPv6: stopping instances... -=================== 45 passed, 1 skipped in 91.99s (0:01:31) =================== +=================== 45 passed, 1 skipped in 93.61s (0:01:33) =================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -1574,7 +1574,7 @@ Live test, BIRD v2, hooks example, IPv6: dumping routes... Live test, BIRD v2, hooks example, IPv6: stopping instances... -============================== 4 passed in 11.37s ============================== +============================== 4 passed in 11.02s ============================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -1625,7 +1625,7 @@ Live test, BIRD v2, BGP communities, IPv6: dumping routes... Live test, BIRD v2, BGP communities, IPv6: stopping instances... -============================= 26 passed in 45.11s ============================== +============================= 26 passed in 45.10s ============================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -1654,7 +1654,7 @@ Live test, BIRD v2, default config, IPv6: dumping routes... Live test, BIRD v2, default config, IPv6: stopping instances... -============================== 4 passed in 10.94s ============================== +============================== 4 passed in 10.85s ============================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -2329,7 +2329,7 @@ Live test, BIRD v2, global scenario, RFC8950: dumping routes... Live test, BIRD v2, global scenario, RFC8950: stopping instances... -================== 603 passed, 7 skipped in 459.10s (0:07:39) ================== +================== 603 passed, 7 skipped in 464.33s (0:07:44) ================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -2364,7 +2364,7 @@ Live test, BIRD v2, gshut, IPv6: dumping routes... Live test, BIRD v2, gshut, IPv6: stopping instances... -============================= 10 passed in 32.00s ============================== +============================= 10 passed in 32.19s ============================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -2415,7 +2415,7 @@ Live test, BIRD v2, max-prefix, IPv6: dumping routes... Live test, BIRD v2, max-prefix, IPv6: stopping instances... -======================== 26 passed in 134.66s (0:02:14) ======================== +======================== 26 passed in 128.76s (0:02:08) ======================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -2494,19 +2494,20 @@ Live test, BIRD v2, path hiding, mitigation off, IPv6: dumping routes... Live test, BIRD v2, path hiding, mitigation off, IPv6: stopping instances... -================== 36 passed, 2 skipped in 128.88s (0:02:08) =================== +================== 36 passed, 2 skipped in 127.45s (0:02:07) =================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache rootdir: /Users/pchiodi/github/public/arouteserver plugins: requests-mock-1.9.3 -collecting ... collected 11 items +collecting ... collected 12 items Live test, BIRD v2, RFC8950: instances setup Live test, BIRD v2, RFC8950: setting instances up... PASSED Live test, BIRD v2, RFC8950: sessions are up PASSED Live test, BIRD v2, RFC8950: accepted routes PASSED +Live test, BIRD v2, RFC8950: IPv4 prefix length within ipv6_pref_len but outside ipv4_pref_len PASSED Live test, BIRD v2, RFC8950: next hop authorized address AS2_1 PASSED Live test, BIRD v2, RFC8950: next hop same-as AS1_2 PASSED Live test, BIRD v2, RFC8950: next hop strict mode on AS1_1 PASSED @@ -2522,7 +2523,7 @@ Live test, BIRD v2, RFC8950: dumping routes... Live test, BIRD v2, RFC8950: stopping instances... -============================= 11 passed in 20.56s ============================== +============================= 12 passed in 20.35s ============================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -2551,7 +2552,7 @@ Live test, BIRD v2, examples, rich config, IPv6: dumping routes... Live test, BIRD v2, examples, rich config, IPv6: stopping instances... -============================== 4 passed in 11.18s ============================== +============================== 4 passed in 11.20s ============================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -2590,7 +2591,7 @@ Live test, BIRD v2, roles, IPv6: dumping routes... Live test, BIRD v2, roles, IPv6: stopping instances... -============================= 14 passed in 45.42s ============================== +============================= 14 passed in 44.48s ============================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -2643,7 +2644,7 @@ Live test, BIRD v2, RPKI INVALID tagging, IPv6: dumping routes... Live test, BIRD v2, RPKI INVALID tagging, IPv6: stopping instances... -============================= 28 passed in 57.70s ============================== +============================= 28 passed in 58.82s ============================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -2680,7 +2681,7 @@ Live test, BIRD v2, BOV custom comms, IPv6: dumping routes... Live test, BIRD v2, BOV custom comms, IPv6: stopping instances... -============================= 12 passed in 32.91s ============================== +============================= 12 passed in 34.20s ============================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -2705,7 +2706,7 @@ Live test, BIRD v2, RTR protocol: dumping routes... Live test, BIRD v2, RTR protocol: stopping instances... -============================== 8 passed in 35.37s ============================== +============================== 8 passed in 37.25s ============================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -2912,7 +2913,7 @@ Live test, BIRD v2, tag prefix/origin empty AS-SET, IPv6: dumping routes... Live test, BIRD v2, tag prefix/origin empty AS-SET, IPv6: stopping instances... -======================= 166 passed in 122.48s (0:02:02) ======================== +======================= 166 passed in 114.22s (0:01:54) ======================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -2983,7 +2984,7 @@ Live test, BIRD v2, 'tag' reject policy scenario, IPv6: dumping routes... Live test, BIRD v2, 'tag' reject policy scenario, IPv6: stopping instances... -=================== 45 passed, 1 skipped in 91.36s (0:01:31) =================== +=================== 45 passed, 1 skipped in 84.36s (0:01:24) =================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -3012,7 +3013,7 @@ Live test, BIRD v3, hooks example, IPv6: dumping routes... Live test, BIRD v3, hooks example, IPv6: stopping instances... -============================== 4 passed in 11.44s ============================== +============================== 4 passed in 10.09s ============================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -3063,7 +3064,7 @@ Live test, BIRD v3, BGP communities, IPv6: dumping routes... Live test, BIRD v3, BGP communities, IPv6: stopping instances... -============================= 26 passed in 46.39s ============================== +============================= 26 passed in 41.56s ============================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -3092,7 +3093,7 @@ Live test, BIRD v3, default config, IPv6: dumping routes... Live test, BIRD v3, default config, IPv6: stopping instances... -============================== 4 passed in 11.22s ============================== +============================== 4 passed in 10.26s ============================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -3673,7 +3674,7 @@ Live test, BIRD v3, global scenario, IPv6, tag&reject: dumping routes... Live test, BIRD v3, global scenario, IPv6, tag&reject: stopping instances... -================== 518 passed, 6 skipped in 395.82s (0:06:35) ================== +================== 518 passed, 6 skipped in 364.99s (0:06:04) ================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -3708,7 +3709,7 @@ Live test, BIRD v3, gshut, IPv6: dumping routes... Live test, BIRD v3, gshut, IPv6: stopping instances... -============================= 10 passed in 32.65s ============================== +============================= 10 passed in 32.47s ============================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -3759,7 +3760,7 @@ Live test, BIRD v3, max-prefix, IPv6: dumping routes... Live test, BIRD v3, max-prefix, IPv6: stopping instances... -======================== 26 passed in 132.16s (0:02:12) ======================== +======================== 26 passed in 130.34s (0:02:10) ======================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -3838,7 +3839,7 @@ Live test, BIRD v3, path hiding, mitigation off, IPv6: dumping routes... Live test, BIRD v3, path hiding, mitigation off, IPv6: stopping instances... -================== 36 passed, 2 skipped in 125.90s (0:02:05) =================== +================== 36 passed, 2 skipped in 130.88s (0:02:10) =================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -3867,7 +3868,7 @@ Live test, BIRD v3, examples, rich config, IPv6: dumping routes... Live test, BIRD v3, examples, rich config, IPv6: stopping instances... -============================== 4 passed in 11.79s ============================== +============================== 4 passed in 11.10s ============================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -3906,7 +3907,7 @@ Live test, BIRD v3, roles, IPv6: dumping routes... Live test, BIRD v3, roles, IPv6: stopping instances... -============================= 14 passed in 50.58s ============================== +============================= 14 passed in 46.41s ============================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -3959,7 +3960,7 @@ Live test, BIRD v3, RPKI INVALID tagging, IPv6: dumping routes... Live test, BIRD v3, RPKI INVALID tagging, IPv6: stopping instances... -============================= 28 passed in 57.15s ============================== +============================= 28 passed in 56.98s ============================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -3996,7 +3997,7 @@ Live test, BIRD v3, BOV custom comms, IPv6: dumping routes... Live test, BIRD v3, BOV custom comms, IPv6: stopping instances... -============================= 12 passed in 32.58s ============================== +============================= 12 passed in 33.02s ============================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -4021,7 +4022,7 @@ Live test, BIRD v3, RTR protocol: dumping routes... Live test, BIRD v3, RTR protocol: stopping instances... -============================== 8 passed in 35.44s ============================== +============================== 8 passed in 35.67s ============================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -4228,7 +4229,7 @@ Live test, BIRD v3, tag prefix/origin empty AS-SET, IPv6: dumping routes... Live test, BIRD v3, tag prefix/origin empty AS-SET, IPv6: stopping instances... -======================= 166 passed in 124.61s (0:02:04) ======================== +======================= 166 passed in 128.66s (0:02:08) ======================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -4299,7 +4300,7 @@ Live test, BIRD v3, 'tag' reject policy scenario, IPv6: dumping routes... Live test, BIRD v3, 'tag' reject policy scenario, IPv6: stopping instances... -=================== 45 passed, 1 skipped in 92.24s (0:01:32) =================== +=================== 45 passed, 1 skipped in 92.49s (0:01:32) =================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -4350,7 +4351,7 @@ Live test, OpenBGPD 8.4, BGP communities, IPv6: dumping routes... Live test, OpenBGPD 8.4, BGP communities, IPv6: stopping instances... -============================= 26 passed in 51.94s ============================== +============================= 26 passed in 52.02s ============================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -4379,7 +4380,7 @@ Live test, OpenBGPD 8.4, default config, IPv6: dumping routes... Live test, OpenBGPD 8.4, default config, IPv6: stopping instances... -============================== 4 passed in 9.59s =============================== +============================== 4 passed in 9.83s =============================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -4772,7 +4773,7 @@ Live test, OpenBGPD 8.0, global scenario, IPv6: dumping routes... Live test, OpenBGPD 8.0, global scenario, IPv6: stopping instances... -================== 348 passed, 4 skipped in 251.25s (0:04:11) ================== +================== 348 passed, 4 skipped in 276.12s (0:04:36) ================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -4807,7 +4808,7 @@ Live test, OpenBGPD 8.4, gshut, IPv6: dumping routes... Live test, OpenBGPD 8.4, gshut, IPv6: stopping instances... -============================= 10 passed in 38.57s ============================== +============================= 10 passed in 40.17s ============================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -4842,7 +4843,7 @@ Live test, OpenBGPD 8.4, max-prefix, IPv6: dumping routes... Live test, OpenBGPD 8.4, max-prefix, IPv6: stopping instances... -======================== 10 passed in 296.23s (0:04:56) ======================== +======================== 10 passed in 302.00s (0:05:02) ======================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -4921,7 +4922,7 @@ Live test, OpenBGPD 8.4, path hiding, mitigation off, IPv6: dumping routes... Live test, OpenBGPD 8.4, path hiding, mitigation off, IPv6: stopping instances... -======================== 38 passed in 138.70s (0:02:18) ======================== +======================== 38 passed in 140.71s (0:02:20) ======================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -4950,7 +4951,7 @@ Live test, OpenBGPD 8.4, examples, rich config, IPv6: dumping routes... Live test, OpenBGPD 8.4, examples, rich config, IPv6: stopping instances... -============================== 4 passed in 9.61s =============================== +============================== 4 passed in 9.36s =============================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -4989,7 +4990,7 @@ Live test, OpenBGPD 8.4, roles, IPv6: dumping routes... Live test, OpenBGPD 8.4, roles, IPv6: stopping instances... -============================= 14 passed in 44.54s ============================== +============================= 14 passed in 39.49s ============================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -5014,7 +5015,7 @@ Live test, OpenBGPD 8.4, RTR protocol: dumping routes... Live test, OpenBGPD 8.4, RTR protocol: stopping instances... -============================== 8 passed in 37.95s ============================== +============================== 8 passed in 37.78s ============================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -5221,7 +5222,7 @@ Live test, OpenBGPD 8.4, tag prefix/origin empty AS-SET, IPv6: dumping routes... Live test, OpenBGPD 8.4, tag prefix/origin empty AS-SET, IPv6: stopping instances... -======================= 166 passed in 132.21s (0:02:12) ======================== +======================= 166 passed in 133.31s (0:02:13) ======================== ============================= test session starts ============================== platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/.virtualenvs/arouteserver/bin/python3.11 cachedir: .pytest_cache @@ -5292,4 +5293,4 @@ Live test, OpenBGPD 8.4, 'tag' reject policy scenario, IPv6: dumping routes... Live test, OpenBGPD 8.4, 'tag' reject policy scenario, IPv6: stopping instances... -=================== 45 passed, 1 skipped in 92.96s (0:01:32) =================== +================== 45 passed, 1 skipped in 104.99s (0:01:44) =================== diff --git a/tests/last.json b/tests/last.json index 51af9ccb..fee803c3 100644 --- a/tests/last.json +++ b/tests/last.json @@ -1 +1 @@ -{"unique_test_cases": 3597} +{"unique_test_cases": 3598} diff --git a/tests/last_results/extres.last b/tests/last_results/extres.last index 7a9818cd..0886e7bb 100644 --- a/tests/last_results/extres.last +++ b/tests/last_results/extres.last @@ -20,4 +20,4 @@ External resources: RPKI ROAs, rpki-client PASSED External resources: prefixes from AS-SET via bgpq3 PASSED External resources: prefixes from AS-SET via bgpq4 PASSED -============================= 14 passed in 40.65s ============================== +============================= 14 passed in 43.68s ============================== diff --git a/tests/last_results/live_bird_hooks_example_bird1.last b/tests/last_results/live_bird_hooks_example_bird1.last index e7e8e2b4..94574f04 100644 --- a/tests/last_results/live_bird_hooks_example_bird1.last +++ b/tests/last_results/live_bird_hooks_example_bird1.last @@ -26,4 +26,4 @@ Live test, BIRD, hooks example, IPv6: dumping routes... Live test, BIRD, hooks example, IPv6: stopping instances... -============================== 4 passed in 10.57s ============================== +============================== 4 passed in 10.54s ============================== diff --git a/tests/last_results/live_bird_hooks_example_bird2.last b/tests/last_results/live_bird_hooks_example_bird2.last index ec654627..7ab5b099 100644 --- a/tests/last_results/live_bird_hooks_example_bird2.last +++ b/tests/last_results/live_bird_hooks_example_bird2.last @@ -26,4 +26,4 @@ Live test, BIRD v2, hooks example, IPv6: dumping routes... Live test, BIRD v2, hooks example, IPv6: stopping instances... -============================== 4 passed in 11.37s ============================== +============================== 4 passed in 11.02s ============================== diff --git a/tests/last_results/live_bird_hooks_example_bird3.last b/tests/last_results/live_bird_hooks_example_bird3.last index 1e40b29a..b088ee46 100644 --- a/tests/last_results/live_bird_hooks_example_bird3.last +++ b/tests/last_results/live_bird_hooks_example_bird3.last @@ -26,4 +26,4 @@ Live test, BIRD v3, hooks example, IPv6: dumping routes... Live test, BIRD v3, hooks example, IPv6: stopping instances... -============================== 4 passed in 11.44s ============================== +============================== 4 passed in 10.09s ============================== diff --git a/tests/last_results/live_communities_bird1.last b/tests/last_results/live_communities_bird1.last index 3fca4a3f..a3e1dd8b 100644 --- a/tests/last_results/live_communities_bird1.last +++ b/tests/last_results/live_communities_bird1.last @@ -48,4 +48,4 @@ Live test, BIRD, BGP communities, IPv6: dumping routes... Live test, BIRD, BGP communities, IPv6: stopping instances... -============================= 26 passed in 42.07s ============================== +============================= 26 passed in 42.33s ============================== diff --git a/tests/last_results/live_communities_bird2.last b/tests/last_results/live_communities_bird2.last index 66378440..1936d44c 100644 --- a/tests/last_results/live_communities_bird2.last +++ b/tests/last_results/live_communities_bird2.last @@ -48,4 +48,4 @@ Live test, BIRD v2, BGP communities, IPv6: dumping routes... Live test, BIRD v2, BGP communities, IPv6: stopping instances... -============================= 26 passed in 45.11s ============================== +============================= 26 passed in 45.10s ============================== diff --git a/tests/last_results/live_communities_bird3.last b/tests/last_results/live_communities_bird3.last index b572dc87..d4e735b3 100644 --- a/tests/last_results/live_communities_bird3.last +++ b/tests/last_results/live_communities_bird3.last @@ -48,4 +48,4 @@ Live test, BIRD v3, BGP communities, IPv6: dumping routes... Live test, BIRD v3, BGP communities, IPv6: stopping instances... -============================= 26 passed in 46.39s ============================== +============================= 26 passed in 41.56s ============================== diff --git a/tests/last_results/live_communities_openbgpd_portable.last b/tests/last_results/live_communities_openbgpd_portable.last index 015cc509..4a7291bc 100644 --- a/tests/last_results/live_communities_openbgpd_portable.last +++ b/tests/last_results/live_communities_openbgpd_portable.last @@ -48,4 +48,4 @@ Live test, OpenBGPD 8.4, BGP communities, IPv6: dumping routes... Live test, OpenBGPD 8.4, BGP communities, IPv6: stopping instances... -============================= 26 passed in 51.94s ============================== +============================= 26 passed in 52.02s ============================== diff --git a/tests/last_results/live_default_bird1.last b/tests/last_results/live_default_bird1.last index 39399996..107440d7 100644 --- a/tests/last_results/live_default_bird1.last +++ b/tests/last_results/live_default_bird1.last @@ -26,4 +26,4 @@ Live test, BIRD, default config, IPv6: dumping routes... Live test, BIRD, default config, IPv6: stopping instances... -============================== 4 passed in 10.19s ============================== +============================== 4 passed in 10.37s ============================== diff --git a/tests/last_results/live_default_bird2.last b/tests/last_results/live_default_bird2.last index a46a7233..e573d106 100644 --- a/tests/last_results/live_default_bird2.last +++ b/tests/last_results/live_default_bird2.last @@ -26,4 +26,4 @@ Live test, BIRD v2, default config, IPv6: dumping routes... Live test, BIRD v2, default config, IPv6: stopping instances... -============================== 4 passed in 10.94s ============================== +============================== 4 passed in 10.85s ============================== diff --git a/tests/last_results/live_default_bird3.last b/tests/last_results/live_default_bird3.last index 6c70d0b4..017db5e0 100644 --- a/tests/last_results/live_default_bird3.last +++ b/tests/last_results/live_default_bird3.last @@ -26,4 +26,4 @@ Live test, BIRD v3, default config, IPv6: dumping routes... Live test, BIRD v3, default config, IPv6: stopping instances... -============================== 4 passed in 11.22s ============================== +============================== 4 passed in 10.26s ============================== diff --git a/tests/last_results/live_default_openbgpd_portable.last b/tests/last_results/live_default_openbgpd_portable.last index 42712782..822180fb 100644 --- a/tests/last_results/live_default_openbgpd_portable.last +++ b/tests/last_results/live_default_openbgpd_portable.last @@ -26,4 +26,4 @@ Live test, OpenBGPD 8.4, default config, IPv6: dumping routes... Live test, OpenBGPD 8.4, default config, IPv6: stopping instances... -============================== 4 passed in 9.59s =============================== +============================== 4 passed in 9.83s =============================== diff --git a/tests/last_results/live_global_bird1.last b/tests/last_results/live_global_bird1.last index 7568d621..af1a613b 100644 --- a/tests/last_results/live_global_bird1.last +++ b/tests/last_results/live_global_bird1.last @@ -578,4 +578,4 @@ Live test, BIRD, global scenario, IPv6, tag&reject: dumping routes... Live test, BIRD, global scenario, IPv6, tag&reject: stopping instances... -================== 518 passed, 6 skipped in 354.22s (0:05:54) ================== +================== 518 passed, 6 skipped in 375.56s (0:06:15) ================== diff --git a/tests/last_results/live_global_bird2.last b/tests/last_results/live_global_bird2.last index 9aeeffee..bb913425 100644 --- a/tests/last_results/live_global_bird2.last +++ b/tests/last_results/live_global_bird2.last @@ -672,4 +672,4 @@ Live test, BIRD v2, global scenario, RFC8950: dumping routes... Live test, BIRD v2, global scenario, RFC8950: stopping instances... -================== 603 passed, 7 skipped in 459.10s (0:07:39) ================== +================== 603 passed, 7 skipped in 464.33s (0:07:44) ================== diff --git a/tests/last_results/live_global_bird3.last b/tests/last_results/live_global_bird3.last index db5588c0..9aece383 100644 --- a/tests/last_results/live_global_bird3.last +++ b/tests/last_results/live_global_bird3.last @@ -578,4 +578,4 @@ Live test, BIRD v3, global scenario, IPv6, tag&reject: dumping routes... Live test, BIRD v3, global scenario, IPv6, tag&reject: stopping instances... -================== 518 passed, 6 skipped in 395.82s (0:06:35) ================== +================== 518 passed, 6 skipped in 364.99s (0:06:04) ================== diff --git a/tests/last_results/live_global_openbgpd_portable.last b/tests/last_results/live_global_openbgpd_portable.last index 36fb0a4c..6ee09b4c 100644 --- a/tests/last_results/live_global_openbgpd_portable.last +++ b/tests/last_results/live_global_openbgpd_portable.last @@ -390,4 +390,4 @@ Live test, OpenBGPD 8.0, global scenario, IPv6: dumping routes... Live test, OpenBGPD 8.0, global scenario, IPv6: stopping instances... -================== 348 passed, 4 skipped in 251.25s (0:04:11) ================== +================== 348 passed, 4 skipped in 276.12s (0:04:36) ================== diff --git a/tests/last_results/live_gshut_bird1.last b/tests/last_results/live_gshut_bird1.last index edfd81a9..389de555 100644 --- a/tests/last_results/live_gshut_bird1.last +++ b/tests/last_results/live_gshut_bird1.last @@ -32,4 +32,4 @@ Live test, BIRD, gshut, IPv6: dumping routes... Live test, BIRD, gshut, IPv6: stopping instances... -============================= 10 passed in 30.05s ============================== +============================= 10 passed in 32.76s ============================== diff --git a/tests/last_results/live_gshut_bird2.last b/tests/last_results/live_gshut_bird2.last index 68f5c25d..f5979d7a 100644 --- a/tests/last_results/live_gshut_bird2.last +++ b/tests/last_results/live_gshut_bird2.last @@ -32,4 +32,4 @@ Live test, BIRD v2, gshut, IPv6: dumping routes... Live test, BIRD v2, gshut, IPv6: stopping instances... -============================= 10 passed in 32.00s ============================== +============================= 10 passed in 32.19s ============================== diff --git a/tests/last_results/live_gshut_bird3.last b/tests/last_results/live_gshut_bird3.last index 7900b9db..baec88ce 100644 --- a/tests/last_results/live_gshut_bird3.last +++ b/tests/last_results/live_gshut_bird3.last @@ -32,4 +32,4 @@ Live test, BIRD v3, gshut, IPv6: dumping routes... Live test, BIRD v3, gshut, IPv6: stopping instances... -============================= 10 passed in 32.65s ============================== +============================= 10 passed in 32.47s ============================== diff --git a/tests/last_results/live_gshut_openbgpd_portable.last b/tests/last_results/live_gshut_openbgpd_portable.last index 9110d176..620ff0f1 100644 --- a/tests/last_results/live_gshut_openbgpd_portable.last +++ b/tests/last_results/live_gshut_openbgpd_portable.last @@ -32,4 +32,4 @@ Live test, OpenBGPD 8.4, gshut, IPv6: dumping routes... Live test, OpenBGPD 8.4, gshut, IPv6: stopping instances... -============================= 10 passed in 38.57s ============================== +============================= 10 passed in 40.17s ============================== diff --git a/tests/last_results/live_max_prefix_bird1.last b/tests/last_results/live_max_prefix_bird1.last index a3559968..b57ed098 100644 --- a/tests/last_results/live_max_prefix_bird1.last +++ b/tests/last_results/live_max_prefix_bird1.last @@ -48,4 +48,4 @@ Live test, BIRD, max-prefix, IPv6: dumping routes... Live test, BIRD, max-prefix, IPv6: stopping instances... -======================== 26 passed in 133.27s (0:02:13) ======================== +======================== 26 passed in 132.96s (0:02:12) ======================== diff --git a/tests/last_results/live_max_prefix_bird2.last b/tests/last_results/live_max_prefix_bird2.last index aeff5d60..dbf8b90b 100644 --- a/tests/last_results/live_max_prefix_bird2.last +++ b/tests/last_results/live_max_prefix_bird2.last @@ -48,4 +48,4 @@ Live test, BIRD v2, max-prefix, IPv6: dumping routes... Live test, BIRD v2, max-prefix, IPv6: stopping instances... -======================== 26 passed in 134.66s (0:02:14) ======================== +======================== 26 passed in 128.76s (0:02:08) ======================== diff --git a/tests/last_results/live_max_prefix_bird3.last b/tests/last_results/live_max_prefix_bird3.last index 49c92450..2d2c3e47 100644 --- a/tests/last_results/live_max_prefix_bird3.last +++ b/tests/last_results/live_max_prefix_bird3.last @@ -48,4 +48,4 @@ Live test, BIRD v3, max-prefix, IPv6: dumping routes... Live test, BIRD v3, max-prefix, IPv6: stopping instances... -======================== 26 passed in 132.16s (0:02:12) ======================== +======================== 26 passed in 130.34s (0:02:10) ======================== diff --git a/tests/last_results/live_max_prefix_openbgpd_portable.last b/tests/last_results/live_max_prefix_openbgpd_portable.last index 153226f3..ade012c8 100644 --- a/tests/last_results/live_max_prefix_openbgpd_portable.last +++ b/tests/last_results/live_max_prefix_openbgpd_portable.last @@ -32,4 +32,4 @@ Live test, OpenBGPD 8.4, max-prefix, IPv6: dumping routes... Live test, OpenBGPD 8.4, max-prefix, IPv6: stopping instances... -======================== 10 passed in 296.23s (0:04:56) ======================== +======================== 10 passed in 302.00s (0:05:02) ======================== diff --git a/tests/last_results/live_path_hiding_bird1.last b/tests/last_results/live_path_hiding_bird1.last index a8dddd78..9f0da559 100644 --- a/tests/last_results/live_path_hiding_bird1.last +++ b/tests/last_results/live_path_hiding_bird1.last @@ -76,4 +76,4 @@ Live test, BIRD, path hiding, mitigation off, IPv6: dumping routes... Live test, BIRD, path hiding, mitigation off, IPv6: stopping instances... -================== 36 passed, 2 skipped in 127.79s (0:02:07) =================== +================== 36 passed, 2 skipped in 128.79s (0:02:08) =================== diff --git a/tests/last_results/live_path_hiding_bird2.last b/tests/last_results/live_path_hiding_bird2.last index 185557dd..23af17fe 100644 --- a/tests/last_results/live_path_hiding_bird2.last +++ b/tests/last_results/live_path_hiding_bird2.last @@ -76,4 +76,4 @@ Live test, BIRD v2, path hiding, mitigation off, IPv6: dumping routes... Live test, BIRD v2, path hiding, mitigation off, IPv6: stopping instances... -================== 36 passed, 2 skipped in 128.88s (0:02:08) =================== +================== 36 passed, 2 skipped in 127.45s (0:02:07) =================== diff --git a/tests/last_results/live_path_hiding_bird3.last b/tests/last_results/live_path_hiding_bird3.last index 11ad6f97..e6d4ce92 100644 --- a/tests/last_results/live_path_hiding_bird3.last +++ b/tests/last_results/live_path_hiding_bird3.last @@ -76,4 +76,4 @@ Live test, BIRD v3, path hiding, mitigation off, IPv6: dumping routes... Live test, BIRD v3, path hiding, mitigation off, IPv6: stopping instances... -================== 36 passed, 2 skipped in 125.90s (0:02:05) =================== +================== 36 passed, 2 skipped in 130.88s (0:02:10) =================== diff --git a/tests/last_results/live_path_hiding_openbgpd_portable.last b/tests/last_results/live_path_hiding_openbgpd_portable.last index 1bd32e17..5018d6f8 100644 --- a/tests/last_results/live_path_hiding_openbgpd_portable.last +++ b/tests/last_results/live_path_hiding_openbgpd_portable.last @@ -76,4 +76,4 @@ Live test, OpenBGPD 8.4, path hiding, mitigation off, IPv6: dumping routes... Live test, OpenBGPD 8.4, path hiding, mitigation off, IPv6: stopping instances... -======================== 38 passed in 138.70s (0:02:18) ======================== +======================== 38 passed in 140.71s (0:02:20) ======================== diff --git a/tests/last_results/live_rfc8950_bird2.last b/tests/last_results/live_rfc8950_bird2.last index 4601581b..c92bdf9a 100644 --- a/tests/last_results/live_rfc8950_bird2.last +++ b/tests/last_results/live_rfc8950_bird2.last @@ -3,13 +3,14 @@ platform darwin -- Python 3.11.7, pytest-7.2.0, pluggy-1.0.0 -- /Users/pchiodi/. cachedir: .pytest_cache rootdir: /Users/pchiodi/github/public/arouteserver plugins: requests-mock-1.9.3 -collecting ... collected 11 items +collecting ... collected 12 items Live test, BIRD v2, RFC8950: instances setup Live test, BIRD v2, RFC8950: setting instances up... PASSED Live test, BIRD v2, RFC8950: sessions are up PASSED Live test, BIRD v2, RFC8950: accepted routes PASSED +Live test, BIRD v2, RFC8950: IPv4 prefix length within ipv6_pref_len but outside ipv4_pref_len PASSED Live test, BIRD v2, RFC8950: next hop authorized address AS2_1 PASSED Live test, BIRD v2, RFC8950: next hop same-as AS1_2 PASSED Live test, BIRD v2, RFC8950: next hop strict mode on AS1_1 PASSED @@ -25,4 +26,4 @@ Live test, BIRD v2, RFC8950: dumping routes... Live test, BIRD v2, RFC8950: stopping instances... -============================= 11 passed in 20.56s ============================== +============================= 12 passed in 20.35s ============================== diff --git a/tests/last_results/live_rich_example_bird1.last b/tests/last_results/live_rich_example_bird1.last index c8235dfb..66bf17e3 100644 --- a/tests/last_results/live_rich_example_bird1.last +++ b/tests/last_results/live_rich_example_bird1.last @@ -26,4 +26,4 @@ Live test, BIRD, examples, rich config, IPv6: dumping routes... Live test, BIRD, examples, rich config, IPv6: stopping instances... -============================== 4 passed in 10.94s ============================== +============================== 4 passed in 11.52s ============================== diff --git a/tests/last_results/live_rich_example_bird2.last b/tests/last_results/live_rich_example_bird2.last index 82c6d3da..17e39825 100644 --- a/tests/last_results/live_rich_example_bird2.last +++ b/tests/last_results/live_rich_example_bird2.last @@ -26,4 +26,4 @@ Live test, BIRD v2, examples, rich config, IPv6: dumping routes... Live test, BIRD v2, examples, rich config, IPv6: stopping instances... -============================== 4 passed in 11.18s ============================== +============================== 4 passed in 11.20s ============================== diff --git a/tests/last_results/live_rich_example_bird3.last b/tests/last_results/live_rich_example_bird3.last index c544f9a9..77dcc39f 100644 --- a/tests/last_results/live_rich_example_bird3.last +++ b/tests/last_results/live_rich_example_bird3.last @@ -26,4 +26,4 @@ Live test, BIRD v3, examples, rich config, IPv6: dumping routes... Live test, BIRD v3, examples, rich config, IPv6: stopping instances... -============================== 4 passed in 11.79s ============================== +============================== 4 passed in 11.10s ============================== diff --git a/tests/last_results/live_rich_example_openbgpd_portable.last b/tests/last_results/live_rich_example_openbgpd_portable.last index 6e54fc92..45c9df30 100644 --- a/tests/last_results/live_rich_example_openbgpd_portable.last +++ b/tests/last_results/live_rich_example_openbgpd_portable.last @@ -26,4 +26,4 @@ Live test, OpenBGPD 8.4, examples, rich config, IPv6: dumping routes... Live test, OpenBGPD 8.4, examples, rich config, IPv6: stopping instances... -============================== 4 passed in 9.61s =============================== +============================== 4 passed in 9.36s =============================== diff --git a/tests/last_results/live_roles_bird2.last b/tests/last_results/live_roles_bird2.last index 254a16cf..db372d6b 100644 --- a/tests/last_results/live_roles_bird2.last +++ b/tests/last_results/live_roles_bird2.last @@ -36,4 +36,4 @@ Live test, BIRD v2, roles, IPv6: dumping routes... Live test, BIRD v2, roles, IPv6: stopping instances... -============================= 14 passed in 45.42s ============================== +============================= 14 passed in 44.48s ============================== diff --git a/tests/last_results/live_roles_bird3.last b/tests/last_results/live_roles_bird3.last index 5963bb29..bea99371 100644 --- a/tests/last_results/live_roles_bird3.last +++ b/tests/last_results/live_roles_bird3.last @@ -36,4 +36,4 @@ Live test, BIRD v3, roles, IPv6: dumping routes... Live test, BIRD v3, roles, IPv6: stopping instances... -============================= 14 passed in 50.58s ============================== +============================= 14 passed in 46.41s ============================== diff --git a/tests/last_results/live_roles_openbgpd_portable.last b/tests/last_results/live_roles_openbgpd_portable.last index 59e66fe4..5a472ea9 100644 --- a/tests/last_results/live_roles_openbgpd_portable.last +++ b/tests/last_results/live_roles_openbgpd_portable.last @@ -36,4 +36,4 @@ Live test, OpenBGPD 8.4, roles, IPv6: dumping routes... Live test, OpenBGPD 8.4, roles, IPv6: stopping instances... -============================= 14 passed in 44.54s ============================== +============================= 14 passed in 39.49s ============================== diff --git a/tests/last_results/live_rpki_bird1.last b/tests/last_results/live_rpki_bird1.last index 381a6474..29d7b4c9 100644 --- a/tests/last_results/live_rpki_bird1.last +++ b/tests/last_results/live_rpki_bird1.last @@ -50,4 +50,4 @@ Live test, BIRD, RPKI INVALID tagging, IPv6: dumping routes... Live test, BIRD, RPKI INVALID tagging, IPv6: stopping instances... -============================= 28 passed in 56.34s ============================== +============================= 28 passed in 59.30s ============================== diff --git a/tests/last_results/live_rpki_bird2.last b/tests/last_results/live_rpki_bird2.last index 15200f8a..0d9fc752 100644 --- a/tests/last_results/live_rpki_bird2.last +++ b/tests/last_results/live_rpki_bird2.last @@ -50,4 +50,4 @@ Live test, BIRD v2, RPKI INVALID tagging, IPv6: dumping routes... Live test, BIRD v2, RPKI INVALID tagging, IPv6: stopping instances... -============================= 28 passed in 57.70s ============================== +============================= 28 passed in 58.82s ============================== diff --git a/tests/last_results/live_rpki_bird3.last b/tests/last_results/live_rpki_bird3.last index 2337b066..9a8d76c9 100644 --- a/tests/last_results/live_rpki_bird3.last +++ b/tests/last_results/live_rpki_bird3.last @@ -50,4 +50,4 @@ Live test, BIRD v3, RPKI INVALID tagging, IPv6: dumping routes... Live test, BIRD v3, RPKI INVALID tagging, IPv6: stopping instances... -============================= 28 passed in 57.15s ============================== +============================= 28 passed in 56.98s ============================== diff --git a/tests/last_results/live_rpki_bov_comms_bird1.last b/tests/last_results/live_rpki_bov_comms_bird1.last index 7bad49e4..17a927a9 100644 --- a/tests/last_results/live_rpki_bov_comms_bird1.last +++ b/tests/last_results/live_rpki_bov_comms_bird1.last @@ -34,4 +34,4 @@ Live test, BIRD, BOV custom comms, IPv6: dumping routes... Live test, BIRD, BOV custom comms, IPv6: stopping instances... -============================= 12 passed in 33.05s ============================== +============================= 12 passed in 33.61s ============================== diff --git a/tests/last_results/live_rpki_bov_comms_bird2.last b/tests/last_results/live_rpki_bov_comms_bird2.last index 8589cb77..aaae53fa 100644 --- a/tests/last_results/live_rpki_bov_comms_bird2.last +++ b/tests/last_results/live_rpki_bov_comms_bird2.last @@ -34,4 +34,4 @@ Live test, BIRD v2, BOV custom comms, IPv6: dumping routes... Live test, BIRD v2, BOV custom comms, IPv6: stopping instances... -============================= 12 passed in 32.91s ============================== +============================= 12 passed in 34.20s ============================== diff --git a/tests/last_results/live_rpki_bov_comms_bird3.last b/tests/last_results/live_rpki_bov_comms_bird3.last index 26dc2521..9ba12ee6 100644 --- a/tests/last_results/live_rpki_bov_comms_bird3.last +++ b/tests/last_results/live_rpki_bov_comms_bird3.last @@ -34,4 +34,4 @@ Live test, BIRD v3, BOV custom comms, IPv6: dumping routes... Live test, BIRD v3, BOV custom comms, IPv6: stopping instances... -============================= 12 passed in 32.58s ============================== +============================= 12 passed in 33.02s ============================== diff --git a/tests/last_results/live_rpki_rtr_example_bird2.last b/tests/last_results/live_rpki_rtr_example_bird2.last index 3ef903cb..7a5221c6 100644 --- a/tests/last_results/live_rpki_rtr_example_bird2.last +++ b/tests/last_results/live_rpki_rtr_example_bird2.last @@ -22,4 +22,4 @@ Live test, BIRD v2, RTR protocol: dumping routes... Live test, BIRD v2, RTR protocol: stopping instances... -============================== 8 passed in 35.37s ============================== +============================== 8 passed in 37.25s ============================== diff --git a/tests/last_results/live_rpki_rtr_example_bird3.last b/tests/last_results/live_rpki_rtr_example_bird3.last index e58aaeda..8f63492b 100644 --- a/tests/last_results/live_rpki_rtr_example_bird3.last +++ b/tests/last_results/live_rpki_rtr_example_bird3.last @@ -22,4 +22,4 @@ Live test, BIRD v3, RTR protocol: dumping routes... Live test, BIRD v3, RTR protocol: stopping instances... -============================== 8 passed in 35.44s ============================== +============================== 8 passed in 35.67s ============================== diff --git a/tests/last_results/live_rpki_rtr_example_openbgpd_portable.last b/tests/last_results/live_rpki_rtr_example_openbgpd_portable.last index dd549929..112bc1d2 100644 --- a/tests/last_results/live_rpki_rtr_example_openbgpd_portable.last +++ b/tests/last_results/live_rpki_rtr_example_openbgpd_portable.last @@ -22,4 +22,4 @@ Live test, OpenBGPD 8.4, RTR protocol: dumping routes... Live test, OpenBGPD 8.4, RTR protocol: stopping instances... -============================== 8 passed in 37.95s ============================== +============================== 8 passed in 37.78s ============================== diff --git a/tests/last_results/live_tag_as_set_bird1.last b/tests/last_results/live_tag_as_set_bird1.last index 2bda6297..a4953de9 100644 --- a/tests/last_results/live_tag_as_set_bird1.last +++ b/tests/last_results/live_tag_as_set_bird1.last @@ -204,4 +204,4 @@ Live test, BIRD, tag prefix/origin empty AS-SET, IPv6: dumping routes... Live test, BIRD, tag prefix/origin empty AS-SET, IPv6: stopping instances... -======================= 166 passed in 122.15s (0:02:02) ======================== +======================= 166 passed in 122.78s (0:02:02) ======================== diff --git a/tests/last_results/live_tag_as_set_bird2.last b/tests/last_results/live_tag_as_set_bird2.last index be99a7cf..2ade5acc 100644 --- a/tests/last_results/live_tag_as_set_bird2.last +++ b/tests/last_results/live_tag_as_set_bird2.last @@ -204,4 +204,4 @@ Live test, BIRD v2, tag prefix/origin empty AS-SET, IPv6: dumping routes... Live test, BIRD v2, tag prefix/origin empty AS-SET, IPv6: stopping instances... -======================= 166 passed in 122.48s (0:02:02) ======================== +======================= 166 passed in 114.22s (0:01:54) ======================== diff --git a/tests/last_results/live_tag_as_set_bird3.last b/tests/last_results/live_tag_as_set_bird3.last index f4a44b1e..81d3817e 100644 --- a/tests/last_results/live_tag_as_set_bird3.last +++ b/tests/last_results/live_tag_as_set_bird3.last @@ -204,4 +204,4 @@ Live test, BIRD v3, tag prefix/origin empty AS-SET, IPv6: dumping routes... Live test, BIRD v3, tag prefix/origin empty AS-SET, IPv6: stopping instances... -======================= 166 passed in 124.61s (0:02:04) ======================== +======================= 166 passed in 128.66s (0:02:08) ======================== diff --git a/tests/last_results/live_tag_as_set_openbgpd_portable.last b/tests/last_results/live_tag_as_set_openbgpd_portable.last index 8bc7509a..fe3e5ef7 100644 --- a/tests/last_results/live_tag_as_set_openbgpd_portable.last +++ b/tests/last_results/live_tag_as_set_openbgpd_portable.last @@ -204,4 +204,4 @@ Live test, OpenBGPD 8.4, tag prefix/origin empty AS-SET, IPv6: dumping routes... Live test, OpenBGPD 8.4, tag prefix/origin empty AS-SET, IPv6: stopping instances... -======================= 166 passed in 132.21s (0:02:12) ======================== +======================= 166 passed in 133.31s (0:02:13) ======================== diff --git a/tests/last_results/live_tag_reject_policy_bird1.last b/tests/last_results/live_tag_reject_policy_bird1.last index 4294f9c7..90ba93dc 100644 --- a/tests/last_results/live_tag_reject_policy_bird1.last +++ b/tests/last_results/live_tag_reject_policy_bird1.last @@ -68,4 +68,4 @@ Live test, BIRD, 'tag' reject policy scenario, IPv6: dumping routes... Live test, BIRD, 'tag' reject policy scenario, IPv6: stopping instances... -=================== 45 passed, 1 skipped in 91.99s (0:01:31) =================== +=================== 45 passed, 1 skipped in 93.61s (0:01:33) =================== diff --git a/tests/last_results/live_tag_reject_policy_bird2.last b/tests/last_results/live_tag_reject_policy_bird2.last index 6d201a30..dc4e812f 100644 --- a/tests/last_results/live_tag_reject_policy_bird2.last +++ b/tests/last_results/live_tag_reject_policy_bird2.last @@ -68,4 +68,4 @@ Live test, BIRD v2, 'tag' reject policy scenario, IPv6: dumping routes... Live test, BIRD v2, 'tag' reject policy scenario, IPv6: stopping instances... -=================== 45 passed, 1 skipped in 91.36s (0:01:31) =================== +=================== 45 passed, 1 skipped in 84.36s (0:01:24) =================== diff --git a/tests/last_results/live_tag_reject_policy_bird3.last b/tests/last_results/live_tag_reject_policy_bird3.last index 9fc5f572..fc9e2b25 100644 --- a/tests/last_results/live_tag_reject_policy_bird3.last +++ b/tests/last_results/live_tag_reject_policy_bird3.last @@ -68,4 +68,4 @@ Live test, BIRD v3, 'tag' reject policy scenario, IPv6: dumping routes... Live test, BIRD v3, 'tag' reject policy scenario, IPv6: stopping instances... -=================== 45 passed, 1 skipped in 92.24s (0:01:32) =================== +=================== 45 passed, 1 skipped in 92.49s (0:01:32) =================== diff --git a/tests/last_results/live_tag_reject_policy_openbgpd_portable.last b/tests/last_results/live_tag_reject_policy_openbgpd_portable.last index 9e2246b6..9faa8a2c 100644 --- a/tests/last_results/live_tag_reject_policy_openbgpd_portable.last +++ b/tests/last_results/live_tag_reject_policy_openbgpd_portable.last @@ -68,4 +68,4 @@ Live test, OpenBGPD 8.4, 'tag' reject policy scenario, IPv6: dumping routes... Live test, OpenBGPD 8.4, 'tag' reject policy scenario, IPv6: stopping instances... -=================== 45 passed, 1 skipped in 92.96s (0:01:32) =================== +================== 45 passed, 1 skipped in 104.99s (0:01:44) =================== diff --git a/tests/last_results/static.last b/tests/last_results/static.last index 84179517..49639768 100644 --- a/tests/last_results/static.last +++ b/tests/last_results/static.last @@ -270,4 +270,4 @@ RTT getter parser: empty PASSED RTT getter parser: new line only PASSED RTT getter parser: none PASSED -============================= 264 passed in 40.33s ============================= +============================= 264 passed in 40.31s ============================= diff --git a/tests/live_tests/scenarios/bird_hooks_example/configs/BIRD2HooksExampleScenario_IPv4/bird2.conf b/tests/live_tests/scenarios/bird_hooks_example/configs/BIRD2HooksExampleScenario_IPv4/bird2.conf index dcd18698..eefc0ffb 100644 --- a/tests/live_tests/scenarios/bird_hooks_example/configs/BIRD2HooksExampleScenario_IPv4/bird2.conf +++ b/tests/live_tests/scenarios/bird_hooks_example/configs/BIRD2HooksExampleScenario_IPv4/bird2.conf @@ -615,7 +615,7 @@ filter receive_from_AS10745_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -826,7 +826,7 @@ filter receive_from_AS3333_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/bird_hooks_example/configs/BIRD2HooksExampleScenario_IPv6/bird2.conf b/tests/live_tests/scenarios/bird_hooks_example/configs/BIRD2HooksExampleScenario_IPv6/bird2.conf index b665e4f3..178d4875 100644 --- a/tests/live_tests/scenarios/bird_hooks_example/configs/BIRD2HooksExampleScenario_IPv6/bird2.conf +++ b/tests/live_tests/scenarios/bird_hooks_example/configs/BIRD2HooksExampleScenario_IPv6/bird2.conf @@ -658,7 +658,7 @@ filter receive_from_AS10745_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/bird_hooks_example/configs/BIRD3HooksExampleScenario_IPv4/bird3.conf b/tests/live_tests/scenarios/bird_hooks_example/configs/BIRD3HooksExampleScenario_IPv4/bird3.conf index 331b1a3b..16d2abd4 100644 --- a/tests/live_tests/scenarios/bird_hooks_example/configs/BIRD3HooksExampleScenario_IPv4/bird3.conf +++ b/tests/live_tests/scenarios/bird_hooks_example/configs/BIRD3HooksExampleScenario_IPv4/bird3.conf @@ -615,7 +615,7 @@ filter receive_from_AS10745_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -826,7 +826,7 @@ filter receive_from_AS3333_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/bird_hooks_example/configs/BIRD3HooksExampleScenario_IPv6/bird3.conf b/tests/live_tests/scenarios/bird_hooks_example/configs/BIRD3HooksExampleScenario_IPv6/bird3.conf index f77cc036..104b72ef 100644 --- a/tests/live_tests/scenarios/bird_hooks_example/configs/BIRD3HooksExampleScenario_IPv6/bird3.conf +++ b/tests/live_tests/scenarios/bird_hooks_example/configs/BIRD3HooksExampleScenario_IPv6/bird3.conf @@ -658,7 +658,7 @@ filter receive_from_AS10745_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/communities/configs/BGPCommunitiesScenario_BIRD2IPv4/bird2.conf b/tests/live_tests/scenarios/communities/configs/BGPCommunitiesScenario_BIRD2IPv4/bird2.conf index a12aae84..c285024c 100644 --- a/tests/live_tests/scenarios/communities/configs/BGPCommunitiesScenario_BIRD2IPv4/bird2.conf +++ b/tests/live_tests/scenarios/communities/configs/BGPCommunitiesScenario_BIRD2IPv4/bird2.conf @@ -439,7 +439,7 @@ filter receive_from_AS131073_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -583,7 +583,7 @@ filter receive_from_AS131073_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -729,7 +729,7 @@ filter receive_from_AS1_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -879,7 +879,7 @@ filter receive_from_AS1_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1019,7 +1019,7 @@ filter receive_from_AS2_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1163,7 +1163,7 @@ filter receive_from_AS2_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/communities/configs/BGPCommunitiesScenario_BIRD2IPv6/bird2.conf b/tests/live_tests/scenarios/communities/configs/BGPCommunitiesScenario_BIRD2IPv6/bird2.conf index a12aae84..c285024c 100644 --- a/tests/live_tests/scenarios/communities/configs/BGPCommunitiesScenario_BIRD2IPv6/bird2.conf +++ b/tests/live_tests/scenarios/communities/configs/BGPCommunitiesScenario_BIRD2IPv6/bird2.conf @@ -439,7 +439,7 @@ filter receive_from_AS131073_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -583,7 +583,7 @@ filter receive_from_AS131073_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -729,7 +729,7 @@ filter receive_from_AS1_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -879,7 +879,7 @@ filter receive_from_AS1_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1019,7 +1019,7 @@ filter receive_from_AS2_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1163,7 +1163,7 @@ filter receive_from_AS2_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/communities/configs/BGPCommunitiesScenario_BIRD3IPv4/bird3.conf b/tests/live_tests/scenarios/communities/configs/BGPCommunitiesScenario_BIRD3IPv4/bird3.conf index eb8d4c9c..75a8a0a1 100644 --- a/tests/live_tests/scenarios/communities/configs/BGPCommunitiesScenario_BIRD3IPv4/bird3.conf +++ b/tests/live_tests/scenarios/communities/configs/BGPCommunitiesScenario_BIRD3IPv4/bird3.conf @@ -439,7 +439,7 @@ filter receive_from_AS131073_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -583,7 +583,7 @@ filter receive_from_AS131073_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -729,7 +729,7 @@ filter receive_from_AS1_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -879,7 +879,7 @@ filter receive_from_AS1_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1019,7 +1019,7 @@ filter receive_from_AS2_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1163,7 +1163,7 @@ filter receive_from_AS2_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/communities/configs/BGPCommunitiesScenario_BIRD3IPv6/bird3.conf b/tests/live_tests/scenarios/communities/configs/BGPCommunitiesScenario_BIRD3IPv6/bird3.conf index eb8d4c9c..75a8a0a1 100644 --- a/tests/live_tests/scenarios/communities/configs/BGPCommunitiesScenario_BIRD3IPv6/bird3.conf +++ b/tests/live_tests/scenarios/communities/configs/BGPCommunitiesScenario_BIRD3IPv6/bird3.conf @@ -439,7 +439,7 @@ filter receive_from_AS131073_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -583,7 +583,7 @@ filter receive_from_AS131073_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -729,7 +729,7 @@ filter receive_from_AS1_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -879,7 +879,7 @@ filter receive_from_AS1_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1019,7 +1019,7 @@ filter receive_from_AS2_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1163,7 +1163,7 @@ filter receive_from_AS2_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/default/configs/DefaultConfigScenarioBIRD2_IPv4/bird2.conf b/tests/live_tests/scenarios/default/configs/DefaultConfigScenarioBIRD2_IPv4/bird2.conf index 2c382663..88aa2e5e 100644 --- a/tests/live_tests/scenarios/default/configs/DefaultConfigScenarioBIRD2_IPv4/bird2.conf +++ b/tests/live_tests/scenarios/default/configs/DefaultConfigScenarioBIRD2_IPv4/bird2.conf @@ -460,7 +460,7 @@ filter receive_from_AS10745_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -636,7 +636,7 @@ filter receive_from_AS10745_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -810,7 +810,7 @@ filter receive_from_AS3333_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -981,7 +981,7 @@ filter receive_from_AS65551_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/default/configs/DefaultConfigScenarioBIRD2_IPv6/bird2.conf b/tests/live_tests/scenarios/default/configs/DefaultConfigScenarioBIRD2_IPv6/bird2.conf index 068e3ed8..237ecd05 100644 --- a/tests/live_tests/scenarios/default/configs/DefaultConfigScenarioBIRD2_IPv6/bird2.conf +++ b/tests/live_tests/scenarios/default/configs/DefaultConfigScenarioBIRD2_IPv6/bird2.conf @@ -458,7 +458,7 @@ filter receive_from_AS10745_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -636,7 +636,7 @@ filter receive_from_AS10745_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -808,7 +808,7 @@ filter receive_from_AS3333_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -979,7 +979,7 @@ filter receive_from_AS65551_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/default/configs/DefaultConfigScenarioBIRD3_IPv4/bird3.conf b/tests/live_tests/scenarios/default/configs/DefaultConfigScenarioBIRD3_IPv4/bird3.conf index 3f2489ac..e13a1c48 100644 --- a/tests/live_tests/scenarios/default/configs/DefaultConfigScenarioBIRD3_IPv4/bird3.conf +++ b/tests/live_tests/scenarios/default/configs/DefaultConfigScenarioBIRD3_IPv4/bird3.conf @@ -460,7 +460,7 @@ filter receive_from_AS10745_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -636,7 +636,7 @@ filter receive_from_AS10745_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -810,7 +810,7 @@ filter receive_from_AS3333_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -981,7 +981,7 @@ filter receive_from_AS65551_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/default/configs/DefaultConfigScenarioBIRD3_IPv6/bird3.conf b/tests/live_tests/scenarios/default/configs/DefaultConfigScenarioBIRD3_IPv6/bird3.conf index cdce8bae..823882ba 100644 --- a/tests/live_tests/scenarios/default/configs/DefaultConfigScenarioBIRD3_IPv6/bird3.conf +++ b/tests/live_tests/scenarios/default/configs/DefaultConfigScenarioBIRD3_IPv6/bird3.conf @@ -458,7 +458,7 @@ filter receive_from_AS10745_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -636,7 +636,7 @@ filter receive_from_AS10745_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -808,7 +808,7 @@ filter receive_from_AS3333_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -979,7 +979,7 @@ filter receive_from_AS65551_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD2IPv4_Reject/bird2.conf b/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD2IPv4_Reject/bird2.conf index 544de192..3c14bf17 100644 --- a/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD2IPv4_Reject/bird2.conf +++ b/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD2IPv4_Reject/bird2.conf @@ -2073,7 +2073,7 @@ filter receive_from_AS151866_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2286,7 +2286,7 @@ filter receive_from_AS151866_2 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; @@ -2513,7 +2513,7 @@ filter receive_from_AS1_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2743,7 +2743,7 @@ filter receive_from_AS1_2 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; @@ -2957,7 +2957,7 @@ filter receive_from_AS1_3 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -3174,7 +3174,7 @@ filter receive_from_AS1_4 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; @@ -3391,7 +3391,7 @@ filter receive_from_AS222_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -3610,7 +3610,7 @@ filter receive_from_AS222_2 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; @@ -3824,7 +3824,7 @@ filter receive_from_AS2_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -4041,7 +4041,7 @@ filter receive_from_AS2_2 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; @@ -4229,7 +4229,7 @@ filter receive_from_AS3_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -4425,7 +4425,7 @@ filter receive_from_AS3_2 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; @@ -4594,7 +4594,7 @@ filter receive_from_AS4_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -4765,7 +4765,7 @@ filter receive_from_AS4_2 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD2IPv4_Tag/bird2.conf b/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD2IPv4_Tag/bird2.conf index 45df43fc..4d7e82dd 100644 --- a/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD2IPv4_Tag/bird2.conf +++ b/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD2IPv4_Tag/bird2.conf @@ -2125,7 +2125,7 @@ filter receive_from_AS151866_1 { { tag_and_reject(14, 151866); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 151866); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -2327,7 +2327,7 @@ filter receive_from_AS151866_2 { { tag_and_reject(14, 151866); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 151866); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -2544,7 +2544,7 @@ filter receive_from_AS1_1 { { tag_and_reject(14, 1); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -2763,7 +2763,7 @@ filter receive_from_AS1_2 { { tag_and_reject(14, 1); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -2967,7 +2967,7 @@ filter receive_from_AS1_3 { { tag_and_reject(14, 1); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -3173,7 +3173,7 @@ filter receive_from_AS1_4 { { tag_and_reject(14, 1); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -3380,7 +3380,7 @@ filter receive_from_AS222_1 { { tag_and_reject(14, 222); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 222); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -3588,7 +3588,7 @@ filter receive_from_AS222_2 { { tag_and_reject(14, 222); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 222); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -3792,7 +3792,7 @@ filter receive_from_AS2_1 { { tag_and_reject(14, 2); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 2); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } prevent_graceful_shutdown(); @@ -3998,7 +3998,7 @@ filter receive_from_AS2_2 { { tag_and_reject(14, 2); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 2); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } prevent_graceful_shutdown(); @@ -4177,7 +4177,7 @@ filter receive_from_AS3_1 { { tag_and_reject(14, 3); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 3); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -4363,7 +4363,7 @@ filter receive_from_AS3_2 { { tag_and_reject(14, 3); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 3); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -4524,7 +4524,7 @@ filter receive_from_AS4_1 { { tag_and_reject(14, 4); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 4); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -4686,7 +4686,7 @@ filter receive_from_AS4_2 { { tag_and_reject(14, 4); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 4); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); diff --git a/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD2IPv4_TagAndReject/bird2.conf b/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD2IPv4_TagAndReject/bird2.conf index 159faa3c..f8457262 100644 --- a/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD2IPv4_TagAndReject/bird2.conf +++ b/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD2IPv4_TagAndReject/bird2.conf @@ -2125,7 +2125,7 @@ filter receive_from_AS151866_1 { { tag_and_reject(14, 151866); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 151866); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } honor_graceful_shutdown(); @@ -2327,7 +2327,7 @@ filter receive_from_AS151866_2 { { tag_and_reject(14, 151866); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 151866); reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; } honor_graceful_shutdown(); @@ -2544,7 +2544,7 @@ filter receive_from_AS1_1 { { tag_and_reject(14, 1); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 1); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } honor_graceful_shutdown(); @@ -2763,7 +2763,7 @@ filter receive_from_AS1_2 { { tag_and_reject(14, 1); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 1); reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; } honor_graceful_shutdown(); @@ -2967,7 +2967,7 @@ filter receive_from_AS1_3 { { tag_and_reject(14, 1); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 1); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } honor_graceful_shutdown(); @@ -3173,7 +3173,7 @@ filter receive_from_AS1_4 { { tag_and_reject(14, 1); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 1); reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; } honor_graceful_shutdown(); @@ -3380,7 +3380,7 @@ filter receive_from_AS222_1 { { tag_and_reject(14, 222); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 222); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } honor_graceful_shutdown(); @@ -3588,7 +3588,7 @@ filter receive_from_AS222_2 { { tag_and_reject(14, 222); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 222); reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; } honor_graceful_shutdown(); @@ -3792,7 +3792,7 @@ filter receive_from_AS2_1 { { tag_and_reject(14, 2); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 2); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } prevent_graceful_shutdown(); @@ -3998,7 +3998,7 @@ filter receive_from_AS2_2 { { tag_and_reject(14, 2); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 2); reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; } prevent_graceful_shutdown(); @@ -4177,7 +4177,7 @@ filter receive_from_AS3_1 { { tag_and_reject(14, 3); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 3); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } honor_graceful_shutdown(); @@ -4363,7 +4363,7 @@ filter receive_from_AS3_2 { { tag_and_reject(14, 3); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 3); reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; } honor_graceful_shutdown(); @@ -4524,7 +4524,7 @@ filter receive_from_AS4_1 { { tag_and_reject(14, 4); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 4); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } honor_graceful_shutdown(); @@ -4686,7 +4686,7 @@ filter receive_from_AS4_2 { { tag_and_reject(14, 4); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 4); reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; } honor_graceful_shutdown(); diff --git a/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD2IPv6_Reject/bird2.conf b/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD2IPv6_Reject/bird2.conf index d987d144..930a585d 100644 --- a/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD2IPv6_Reject/bird2.conf +++ b/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD2IPv6_Reject/bird2.conf @@ -2073,7 +2073,7 @@ filter receive_from_AS151866_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2285,7 +2285,7 @@ filter receive_from_AS151866_2 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; @@ -2511,7 +2511,7 @@ filter receive_from_AS1_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2742,7 +2742,7 @@ filter receive_from_AS1_2 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; @@ -2955,7 +2955,7 @@ filter receive_from_AS1_3 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -3173,7 +3173,7 @@ filter receive_from_AS1_4 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; @@ -3389,7 +3389,7 @@ filter receive_from_AS222_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -3610,7 +3610,7 @@ filter receive_from_AS222_2 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; @@ -3822,7 +3822,7 @@ filter receive_from_AS2_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -4040,7 +4040,7 @@ filter receive_from_AS2_2 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; @@ -4229,7 +4229,7 @@ filter receive_from_AS3_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -4424,7 +4424,7 @@ filter receive_from_AS3_2 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; @@ -4594,7 +4594,7 @@ filter receive_from_AS4_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -4764,7 +4764,7 @@ filter receive_from_AS4_2 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD2IPv6_Tag/bird2.conf b/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD2IPv6_Tag/bird2.conf index fac8898d..1fcc3217 100644 --- a/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD2IPv6_Tag/bird2.conf +++ b/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD2IPv6_Tag/bird2.conf @@ -2125,7 +2125,7 @@ filter receive_from_AS151866_1 { { tag_and_reject(14, 151866); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 151866); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -2326,7 +2326,7 @@ filter receive_from_AS151866_2 { { tag_and_reject(14, 151866); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 151866); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -2542,7 +2542,7 @@ filter receive_from_AS1_1 { { tag_and_reject(14, 1); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -2762,7 +2762,7 @@ filter receive_from_AS1_2 { { tag_and_reject(14, 1); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -2965,7 +2965,7 @@ filter receive_from_AS1_3 { { tag_and_reject(14, 1); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -3172,7 +3172,7 @@ filter receive_from_AS1_4 { { tag_and_reject(14, 1); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -3378,7 +3378,7 @@ filter receive_from_AS222_1 { { tag_and_reject(14, 222); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 222); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -3588,7 +3588,7 @@ filter receive_from_AS222_2 { { tag_and_reject(14, 222); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 222); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -3790,7 +3790,7 @@ filter receive_from_AS2_1 { { tag_and_reject(14, 2); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 2); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } prevent_graceful_shutdown(); @@ -3997,7 +3997,7 @@ filter receive_from_AS2_2 { { tag_and_reject(14, 2); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 2); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } prevent_graceful_shutdown(); @@ -4177,7 +4177,7 @@ filter receive_from_AS3_1 { { tag_and_reject(14, 3); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 3); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -4362,7 +4362,7 @@ filter receive_from_AS3_2 { { tag_and_reject(14, 3); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 3); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -4524,7 +4524,7 @@ filter receive_from_AS4_1 { { tag_and_reject(14, 4); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 4); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -4685,7 +4685,7 @@ filter receive_from_AS4_2 { { tag_and_reject(14, 4); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 4); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); diff --git a/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD2IPv6_TagAndReject/bird2.conf b/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD2IPv6_TagAndReject/bird2.conf index 2ee17ddb..452483d3 100644 --- a/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD2IPv6_TagAndReject/bird2.conf +++ b/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD2IPv6_TagAndReject/bird2.conf @@ -2125,7 +2125,7 @@ filter receive_from_AS151866_1 { { tag_and_reject(14, 151866); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 151866); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } honor_graceful_shutdown(); @@ -2326,7 +2326,7 @@ filter receive_from_AS151866_2 { { tag_and_reject(14, 151866); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 151866); reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; } honor_graceful_shutdown(); @@ -2542,7 +2542,7 @@ filter receive_from_AS1_1 { { tag_and_reject(14, 1); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 1); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } honor_graceful_shutdown(); @@ -2762,7 +2762,7 @@ filter receive_from_AS1_2 { { tag_and_reject(14, 1); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 1); reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; } honor_graceful_shutdown(); @@ -2965,7 +2965,7 @@ filter receive_from_AS1_3 { { tag_and_reject(14, 1); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 1); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } honor_graceful_shutdown(); @@ -3172,7 +3172,7 @@ filter receive_from_AS1_4 { { tag_and_reject(14, 1); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 1); reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; } honor_graceful_shutdown(); @@ -3378,7 +3378,7 @@ filter receive_from_AS222_1 { { tag_and_reject(14, 222); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 222); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } honor_graceful_shutdown(); @@ -3588,7 +3588,7 @@ filter receive_from_AS222_2 { { tag_and_reject(14, 222); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 222); reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; } honor_graceful_shutdown(); @@ -3790,7 +3790,7 @@ filter receive_from_AS2_1 { { tag_and_reject(14, 2); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 2); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } prevent_graceful_shutdown(); @@ -3997,7 +3997,7 @@ filter receive_from_AS2_2 { { tag_and_reject(14, 2); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 2); reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; } prevent_graceful_shutdown(); @@ -4177,7 +4177,7 @@ filter receive_from_AS3_1 { { tag_and_reject(14, 3); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 3); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } honor_graceful_shutdown(); @@ -4362,7 +4362,7 @@ filter receive_from_AS3_2 { { tag_and_reject(14, 3); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 3); reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; } honor_graceful_shutdown(); @@ -4524,7 +4524,7 @@ filter receive_from_AS4_1 { { tag_and_reject(14, 4); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 4); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } honor_graceful_shutdown(); @@ -4685,7 +4685,7 @@ filter receive_from_AS4_2 { { tag_and_reject(14, 4); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 4); reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; } honor_graceful_shutdown(); diff --git a/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD2RFC8950/bird2.conf b/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD2RFC8950/bird2.conf index f2b38e6e..7ee2f084 100644 --- a/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD2RFC8950/bird2.conf +++ b/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD2RFC8950/bird2.conf @@ -2073,7 +2073,7 @@ filter receive_from_AS151866_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2286,7 +2286,10 @@ filter receive_from_AS151866_2 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then + reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; + + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; @@ -2529,7 +2532,7 @@ filter receive_from_AS1_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2773,7 +2776,10 @@ filter receive_from_AS1_2 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then + reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; + + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; @@ -3005,7 +3011,7 @@ filter receive_from_AS1_3 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -3227,7 +3233,10 @@ filter receive_from_AS1_4 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then + reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; + + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; @@ -3460,7 +3469,7 @@ filter receive_from_AS222_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -3686,7 +3695,10 @@ filter receive_from_AS222_2 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then + reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; + + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; @@ -3915,7 +3927,7 @@ filter receive_from_AS2_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -4135,7 +4147,10 @@ filter receive_from_AS2_2 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then + reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; + + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; @@ -4341,7 +4356,7 @@ filter receive_from_AS3_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -4536,7 +4551,10 @@ filter receive_from_AS3_2 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then + reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; + + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; @@ -4724,7 +4742,7 @@ filter receive_from_AS4_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -4894,7 +4912,10 @@ filter receive_from_AS4_2 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then + reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; + + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD3IPv4_Reject/bird3.conf b/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD3IPv4_Reject/bird3.conf index 50ff093d..a6d2175a 100644 --- a/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD3IPv4_Reject/bird3.conf +++ b/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD3IPv4_Reject/bird3.conf @@ -2073,7 +2073,7 @@ filter receive_from_AS151866_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2286,7 +2286,7 @@ filter receive_from_AS151866_2 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; @@ -2513,7 +2513,7 @@ filter receive_from_AS1_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2743,7 +2743,7 @@ filter receive_from_AS1_2 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; @@ -2957,7 +2957,7 @@ filter receive_from_AS1_3 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -3174,7 +3174,7 @@ filter receive_from_AS1_4 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; @@ -3391,7 +3391,7 @@ filter receive_from_AS222_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -3610,7 +3610,7 @@ filter receive_from_AS222_2 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; @@ -3824,7 +3824,7 @@ filter receive_from_AS2_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -4041,7 +4041,7 @@ filter receive_from_AS2_2 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; @@ -4229,7 +4229,7 @@ filter receive_from_AS3_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -4425,7 +4425,7 @@ filter receive_from_AS3_2 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; @@ -4594,7 +4594,7 @@ filter receive_from_AS4_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -4765,7 +4765,7 @@ filter receive_from_AS4_2 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD3IPv4_Tag/bird3.conf b/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD3IPv4_Tag/bird3.conf index bbdb3450..ca250cd5 100644 --- a/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD3IPv4_Tag/bird3.conf +++ b/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD3IPv4_Tag/bird3.conf @@ -2125,7 +2125,7 @@ filter receive_from_AS151866_1 { { tag_and_reject(14, 151866); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 151866); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -2327,7 +2327,7 @@ filter receive_from_AS151866_2 { { tag_and_reject(14, 151866); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 151866); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -2544,7 +2544,7 @@ filter receive_from_AS1_1 { { tag_and_reject(14, 1); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -2763,7 +2763,7 @@ filter receive_from_AS1_2 { { tag_and_reject(14, 1); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -2967,7 +2967,7 @@ filter receive_from_AS1_3 { { tag_and_reject(14, 1); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -3173,7 +3173,7 @@ filter receive_from_AS1_4 { { tag_and_reject(14, 1); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -3380,7 +3380,7 @@ filter receive_from_AS222_1 { { tag_and_reject(14, 222); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 222); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -3588,7 +3588,7 @@ filter receive_from_AS222_2 { { tag_and_reject(14, 222); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 222); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -3792,7 +3792,7 @@ filter receive_from_AS2_1 { { tag_and_reject(14, 2); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 2); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } prevent_graceful_shutdown(); @@ -3998,7 +3998,7 @@ filter receive_from_AS2_2 { { tag_and_reject(14, 2); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 2); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } prevent_graceful_shutdown(); @@ -4177,7 +4177,7 @@ filter receive_from_AS3_1 { { tag_and_reject(14, 3); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 3); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -4363,7 +4363,7 @@ filter receive_from_AS3_2 { { tag_and_reject(14, 3); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 3); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -4524,7 +4524,7 @@ filter receive_from_AS4_1 { { tag_and_reject(14, 4); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 4); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -4686,7 +4686,7 @@ filter receive_from_AS4_2 { { tag_and_reject(14, 4); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 4); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); diff --git a/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD3IPv4_TagAndReject/bird3.conf b/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD3IPv4_TagAndReject/bird3.conf index 779f6493..37406556 100644 --- a/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD3IPv4_TagAndReject/bird3.conf +++ b/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD3IPv4_TagAndReject/bird3.conf @@ -2125,7 +2125,7 @@ filter receive_from_AS151866_1 { { tag_and_reject(14, 151866); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 151866); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } honor_graceful_shutdown(); @@ -2327,7 +2327,7 @@ filter receive_from_AS151866_2 { { tag_and_reject(14, 151866); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 151866); reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; } honor_graceful_shutdown(); @@ -2544,7 +2544,7 @@ filter receive_from_AS1_1 { { tag_and_reject(14, 1); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 1); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } honor_graceful_shutdown(); @@ -2763,7 +2763,7 @@ filter receive_from_AS1_2 { { tag_and_reject(14, 1); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 1); reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; } honor_graceful_shutdown(); @@ -2967,7 +2967,7 @@ filter receive_from_AS1_3 { { tag_and_reject(14, 1); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 1); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } honor_graceful_shutdown(); @@ -3173,7 +3173,7 @@ filter receive_from_AS1_4 { { tag_and_reject(14, 1); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 1); reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; } honor_graceful_shutdown(); @@ -3380,7 +3380,7 @@ filter receive_from_AS222_1 { { tag_and_reject(14, 222); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 222); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } honor_graceful_shutdown(); @@ -3588,7 +3588,7 @@ filter receive_from_AS222_2 { { tag_and_reject(14, 222); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 222); reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; } honor_graceful_shutdown(); @@ -3792,7 +3792,7 @@ filter receive_from_AS2_1 { { tag_and_reject(14, 2); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 2); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } prevent_graceful_shutdown(); @@ -3998,7 +3998,7 @@ filter receive_from_AS2_2 { { tag_and_reject(14, 2); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 2); reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; } prevent_graceful_shutdown(); @@ -4177,7 +4177,7 @@ filter receive_from_AS3_1 { { tag_and_reject(14, 3); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 3); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } honor_graceful_shutdown(); @@ -4363,7 +4363,7 @@ filter receive_from_AS3_2 { { tag_and_reject(14, 3); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 3); reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; } honor_graceful_shutdown(); @@ -4524,7 +4524,7 @@ filter receive_from_AS4_1 { { tag_and_reject(14, 4); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 4); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } honor_graceful_shutdown(); @@ -4686,7 +4686,7 @@ filter receive_from_AS4_2 { { tag_and_reject(14, 4); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 4); reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; } honor_graceful_shutdown(); diff --git a/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD3IPv6_Reject/bird3.conf b/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD3IPv6_Reject/bird3.conf index 0259ae90..7a5f6e30 100644 --- a/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD3IPv6_Reject/bird3.conf +++ b/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD3IPv6_Reject/bird3.conf @@ -2073,7 +2073,7 @@ filter receive_from_AS151866_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2285,7 +2285,7 @@ filter receive_from_AS151866_2 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; @@ -2511,7 +2511,7 @@ filter receive_from_AS1_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2742,7 +2742,7 @@ filter receive_from_AS1_2 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; @@ -2955,7 +2955,7 @@ filter receive_from_AS1_3 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -3173,7 +3173,7 @@ filter receive_from_AS1_4 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; @@ -3389,7 +3389,7 @@ filter receive_from_AS222_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -3610,7 +3610,7 @@ filter receive_from_AS222_2 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; @@ -3822,7 +3822,7 @@ filter receive_from_AS2_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -4040,7 +4040,7 @@ filter receive_from_AS2_2 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; @@ -4229,7 +4229,7 @@ filter receive_from_AS3_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -4424,7 +4424,7 @@ filter receive_from_AS3_2 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; @@ -4594,7 +4594,7 @@ filter receive_from_AS4_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -4764,7 +4764,7 @@ filter receive_from_AS4_2 { # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD3IPv6_Tag/bird3.conf b/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD3IPv6_Tag/bird3.conf index ac4f0212..b5faacb0 100644 --- a/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD3IPv6_Tag/bird3.conf +++ b/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD3IPv6_Tag/bird3.conf @@ -2125,7 +2125,7 @@ filter receive_from_AS151866_1 { { tag_and_reject(14, 151866); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 151866); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -2326,7 +2326,7 @@ filter receive_from_AS151866_2 { { tag_and_reject(14, 151866); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 151866); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -2542,7 +2542,7 @@ filter receive_from_AS1_1 { { tag_and_reject(14, 1); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -2762,7 +2762,7 @@ filter receive_from_AS1_2 { { tag_and_reject(14, 1); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -2965,7 +2965,7 @@ filter receive_from_AS1_3 { { tag_and_reject(14, 1); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -3172,7 +3172,7 @@ filter receive_from_AS1_4 { { tag_and_reject(14, 1); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -3378,7 +3378,7 @@ filter receive_from_AS222_1 { { tag_and_reject(14, 222); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 222); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -3588,7 +3588,7 @@ filter receive_from_AS222_2 { { tag_and_reject(14, 222); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 222); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -3790,7 +3790,7 @@ filter receive_from_AS2_1 { { tag_and_reject(14, 2); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 2); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } prevent_graceful_shutdown(); @@ -3997,7 +3997,7 @@ filter receive_from_AS2_2 { { tag_and_reject(14, 2); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 2); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } prevent_graceful_shutdown(); @@ -4177,7 +4177,7 @@ filter receive_from_AS3_1 { { tag_and_reject(14, 3); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 3); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -4362,7 +4362,7 @@ filter receive_from_AS3_2 { { tag_and_reject(14, 3); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 3); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -4524,7 +4524,7 @@ filter receive_from_AS4_1 { { tag_and_reject(14, 4); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 4); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -4685,7 +4685,7 @@ filter receive_from_AS4_2 { { tag_and_reject(14, 4); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 4); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); diff --git a/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD3IPv6_TagAndReject/bird3.conf b/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD3IPv6_TagAndReject/bird3.conf index 1c94e715..9c9dc978 100644 --- a/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD3IPv6_TagAndReject/bird3.conf +++ b/tests/live_tests/scenarios/global/configs/BasicScenario_BIRD3IPv6_TagAndReject/bird3.conf @@ -2125,7 +2125,7 @@ filter receive_from_AS151866_1 { { tag_and_reject(14, 151866); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 151866); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } honor_graceful_shutdown(); @@ -2326,7 +2326,7 @@ filter receive_from_AS151866_2 { { tag_and_reject(14, 151866); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 151866); reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; } honor_graceful_shutdown(); @@ -2542,7 +2542,7 @@ filter receive_from_AS1_1 { { tag_and_reject(14, 1); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 1); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } honor_graceful_shutdown(); @@ -2762,7 +2762,7 @@ filter receive_from_AS1_2 { { tag_and_reject(14, 1); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 1); reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; } honor_graceful_shutdown(); @@ -2965,7 +2965,7 @@ filter receive_from_AS1_3 { { tag_and_reject(14, 1); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 1); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } honor_graceful_shutdown(); @@ -3172,7 +3172,7 @@ filter receive_from_AS1_4 { { tag_and_reject(14, 1); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 1); reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; } honor_graceful_shutdown(); @@ -3378,7 +3378,7 @@ filter receive_from_AS222_1 { { tag_and_reject(14, 222); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 222); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } honor_graceful_shutdown(); @@ -3588,7 +3588,7 @@ filter receive_from_AS222_2 { { tag_and_reject(14, 222); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 222); reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; } honor_graceful_shutdown(); @@ -3790,7 +3790,7 @@ filter receive_from_AS2_1 { { tag_and_reject(14, 2); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 2); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } prevent_graceful_shutdown(); @@ -3997,7 +3997,7 @@ filter receive_from_AS2_2 { { tag_and_reject(14, 2); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 2); reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; } prevent_graceful_shutdown(); @@ -4177,7 +4177,7 @@ filter receive_from_AS3_1 { { tag_and_reject(14, 3); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 3); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } honor_graceful_shutdown(); @@ -4362,7 +4362,7 @@ filter receive_from_AS3_2 { { tag_and_reject(14, 3); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 3); reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; } honor_graceful_shutdown(); @@ -4524,7 +4524,7 @@ filter receive_from_AS4_1 { { tag_and_reject(14, 4); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 4); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } honor_graceful_shutdown(); @@ -4685,7 +4685,7 @@ filter receive_from_AS4_2 { { tag_and_reject(14, 4); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 4); reject "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; } honor_graceful_shutdown(); diff --git a/tests/live_tests/scenarios/global/routes/BasicScenario_OpenBGPDIPv6/openbgpd80p/AS3.txt b/tests/live_tests/scenarios/global/routes/BasicScenario_OpenBGPDIPv6/openbgpd80p/AS3.txt index 9696674d..86ea2ff0 100644 --- a/tests/live_tests/scenarios/global/routes/BasicScenario_OpenBGPDIPv6/openbgpd80p/AS3.txt +++ b/tests/live_tests/scenarios/global/routes/BasicScenario_OpenBGPDIPv6/openbgpd80p/AS3.txt @@ -2,28 +2,28 @@ std comms: ext comms: lrg comms: - best: False, LOCAL_PREF: 101 + best: True, LOCAL_PREF: 101 filtered: False () 2a01:0:1::/48, AS_PATH: 999 1, NEXT_HOP: 2001:db8:1:1::12, via 2001:db8:1:1::2 std comms: ext comms: lrg comms: - best: True, LOCAL_PREF: 101 + best: False, LOCAL_PREF: 101 filtered: False () 2a01:0:2::/48, AS_PATH: 999 1, NEXT_HOP: 2001:db8:1:1::11, via 2001:db8:1:1::2 std comms: ext comms: lrg comms: - best: False, LOCAL_PREF: 101 + best: True, LOCAL_PREF: 101 filtered: False () 2a01:0:2::/48, AS_PATH: 999 1, NEXT_HOP: 2001:db8:1:1::12, via 2001:db8:1:1::2 std comms: ext comms: lrg comms: - best: True, LOCAL_PREF: 101 + best: False, LOCAL_PREF: 101 filtered: False () 2a01:0:3::/48, AS_PATH: 999 1, NEXT_HOP: 2001:db8:1:1::11, via 2001:db8:1:1::2 diff --git a/tests/live_tests/scenarios/gshut/configs/GShutScenario_BIRD2IPv4/bird2.conf b/tests/live_tests/scenarios/gshut/configs/GShutScenario_BIRD2IPv4/bird2.conf index 1b9479b2..549b0658 100644 --- a/tests/live_tests/scenarios/gshut/configs/GShutScenario_BIRD2IPv4/bird2.conf +++ b/tests/live_tests/scenarios/gshut/configs/GShutScenario_BIRD2IPv4/bird2.conf @@ -390,7 +390,7 @@ filter receive_from_AS1_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -536,7 +536,7 @@ filter receive_from_AS1_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -678,7 +678,7 @@ filter receive_from_AS2_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -824,7 +824,7 @@ filter receive_from_AS2_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/gshut/configs/GShutScenario_BIRD2IPv6/bird2.conf b/tests/live_tests/scenarios/gshut/configs/GShutScenario_BIRD2IPv6/bird2.conf index 1b9479b2..549b0658 100644 --- a/tests/live_tests/scenarios/gshut/configs/GShutScenario_BIRD2IPv6/bird2.conf +++ b/tests/live_tests/scenarios/gshut/configs/GShutScenario_BIRD2IPv6/bird2.conf @@ -390,7 +390,7 @@ filter receive_from_AS1_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -536,7 +536,7 @@ filter receive_from_AS1_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -678,7 +678,7 @@ filter receive_from_AS2_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -824,7 +824,7 @@ filter receive_from_AS2_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/gshut/configs/GShutScenario_BIRD3IPv4/bird3.conf b/tests/live_tests/scenarios/gshut/configs/GShutScenario_BIRD3IPv4/bird3.conf index eda2344a..8685fa69 100644 --- a/tests/live_tests/scenarios/gshut/configs/GShutScenario_BIRD3IPv4/bird3.conf +++ b/tests/live_tests/scenarios/gshut/configs/GShutScenario_BIRD3IPv4/bird3.conf @@ -390,7 +390,7 @@ filter receive_from_AS1_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -536,7 +536,7 @@ filter receive_from_AS1_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -678,7 +678,7 @@ filter receive_from_AS2_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -824,7 +824,7 @@ filter receive_from_AS2_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/gshut/configs/GShutScenario_BIRD3IPv6/bird3.conf b/tests/live_tests/scenarios/gshut/configs/GShutScenario_BIRD3IPv6/bird3.conf index eda2344a..8685fa69 100644 --- a/tests/live_tests/scenarios/gshut/configs/GShutScenario_BIRD3IPv6/bird3.conf +++ b/tests/live_tests/scenarios/gshut/configs/GShutScenario_BIRD3IPv6/bird3.conf @@ -390,7 +390,7 @@ filter receive_from_AS1_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -536,7 +536,7 @@ filter receive_from_AS1_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -678,7 +678,7 @@ filter receive_from_AS2_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -824,7 +824,7 @@ filter receive_from_AS2_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/max_prefix/configs/MaxPrefixScenario_BIRD2IPv4/bird2.conf b/tests/live_tests/scenarios/max_prefix/configs/MaxPrefixScenario_BIRD2IPv4/bird2.conf index dcbf5416..14a81fe9 100644 --- a/tests/live_tests/scenarios/max_prefix/configs/MaxPrefixScenario_BIRD2IPv4/bird2.conf +++ b/tests/live_tests/scenarios/max_prefix/configs/MaxPrefixScenario_BIRD2IPv4/bird2.conf @@ -387,7 +387,7 @@ filter receive_from_AS1_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -533,7 +533,7 @@ filter receive_from_AS1_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -675,7 +675,7 @@ filter receive_from_AS2_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -821,7 +821,7 @@ filter receive_from_AS2_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -963,7 +963,7 @@ filter receive_from_AS3_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1109,7 +1109,7 @@ filter receive_from_AS3_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1251,7 +1251,7 @@ filter receive_from_AS4_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1397,7 +1397,7 @@ filter receive_from_AS4_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1539,7 +1539,7 @@ filter receive_from_AS5_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1685,7 +1685,7 @@ filter receive_from_AS5_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1827,7 +1827,7 @@ filter receive_from_AS6_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1973,7 +1973,7 @@ filter receive_from_AS6_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/max_prefix/configs/MaxPrefixScenario_BIRD2IPv6/bird2.conf b/tests/live_tests/scenarios/max_prefix/configs/MaxPrefixScenario_BIRD2IPv6/bird2.conf index dcbf5416..14a81fe9 100644 --- a/tests/live_tests/scenarios/max_prefix/configs/MaxPrefixScenario_BIRD2IPv6/bird2.conf +++ b/tests/live_tests/scenarios/max_prefix/configs/MaxPrefixScenario_BIRD2IPv6/bird2.conf @@ -387,7 +387,7 @@ filter receive_from_AS1_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -533,7 +533,7 @@ filter receive_from_AS1_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -675,7 +675,7 @@ filter receive_from_AS2_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -821,7 +821,7 @@ filter receive_from_AS2_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -963,7 +963,7 @@ filter receive_from_AS3_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1109,7 +1109,7 @@ filter receive_from_AS3_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1251,7 +1251,7 @@ filter receive_from_AS4_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1397,7 +1397,7 @@ filter receive_from_AS4_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1539,7 +1539,7 @@ filter receive_from_AS5_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1685,7 +1685,7 @@ filter receive_from_AS5_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1827,7 +1827,7 @@ filter receive_from_AS6_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1973,7 +1973,7 @@ filter receive_from_AS6_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/max_prefix/configs/MaxPrefixScenario_BIRD3IPv4/bird3.conf b/tests/live_tests/scenarios/max_prefix/configs/MaxPrefixScenario_BIRD3IPv4/bird3.conf index eab0ef0a..c63899bf 100644 --- a/tests/live_tests/scenarios/max_prefix/configs/MaxPrefixScenario_BIRD3IPv4/bird3.conf +++ b/tests/live_tests/scenarios/max_prefix/configs/MaxPrefixScenario_BIRD3IPv4/bird3.conf @@ -387,7 +387,7 @@ filter receive_from_AS1_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -533,7 +533,7 @@ filter receive_from_AS1_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -675,7 +675,7 @@ filter receive_from_AS2_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -821,7 +821,7 @@ filter receive_from_AS2_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -963,7 +963,7 @@ filter receive_from_AS3_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1109,7 +1109,7 @@ filter receive_from_AS3_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1251,7 +1251,7 @@ filter receive_from_AS4_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1397,7 +1397,7 @@ filter receive_from_AS4_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1539,7 +1539,7 @@ filter receive_from_AS5_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1685,7 +1685,7 @@ filter receive_from_AS5_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1827,7 +1827,7 @@ filter receive_from_AS6_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1973,7 +1973,7 @@ filter receive_from_AS6_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/max_prefix/configs/MaxPrefixScenario_BIRD3IPv6/bird3.conf b/tests/live_tests/scenarios/max_prefix/configs/MaxPrefixScenario_BIRD3IPv6/bird3.conf index eab0ef0a..c63899bf 100644 --- a/tests/live_tests/scenarios/max_prefix/configs/MaxPrefixScenario_BIRD3IPv6/bird3.conf +++ b/tests/live_tests/scenarios/max_prefix/configs/MaxPrefixScenario_BIRD3IPv6/bird3.conf @@ -387,7 +387,7 @@ filter receive_from_AS1_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -533,7 +533,7 @@ filter receive_from_AS1_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -675,7 +675,7 @@ filter receive_from_AS2_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -821,7 +821,7 @@ filter receive_from_AS2_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -963,7 +963,7 @@ filter receive_from_AS3_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1109,7 +1109,7 @@ filter receive_from_AS3_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1251,7 +1251,7 @@ filter receive_from_AS4_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1397,7 +1397,7 @@ filter receive_from_AS4_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1539,7 +1539,7 @@ filter receive_from_AS5_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1685,7 +1685,7 @@ filter receive_from_AS5_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1827,7 +1827,7 @@ filter receive_from_AS6_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1973,7 +1973,7 @@ filter receive_from_AS6_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/max_prefix/routes/MaxPrefixScenario_BIRDIPv4/bird16/AS3.txt b/tests/live_tests/scenarios/max_prefix/routes/MaxPrefixScenario_BIRDIPv4/bird16/AS3.txt index 32a35ad8..3f5fd104 100644 --- a/tests/live_tests/scenarios/max_prefix/routes/MaxPrefixScenario_BIRDIPv4/bird16/AS3.txt +++ b/tests/live_tests/scenarios/max_prefix/routes/MaxPrefixScenario_BIRDIPv4/bird16/AS3.txt @@ -89,6 +89,20 @@ best: True, LOCAL_PREF: 100 filtered: False () +5.0.1.0/24, AS_PATH: 5, NEXT_HOP: 192.0.2.51, via 192.0.2.2 + std comms: + ext comms: + lrg comms: + best: True, LOCAL_PREF: 100 + filtered: False () + +5.0.2.0/24, AS_PATH: 5, NEXT_HOP: 192.0.2.51, via 192.0.2.2 + std comms: + ext comms: + lrg comms: + best: True, LOCAL_PREF: 100 + filtered: False () + 6.0.1.0/24, AS_PATH: 6, NEXT_HOP: 192.0.2.61, via 192.0.2.2 std comms: ext comms: diff --git a/tests/live_tests/scenarios/max_prefix/routes/MaxPrefixScenario_BIRDIPv4/bird16/AS4.txt b/tests/live_tests/scenarios/max_prefix/routes/MaxPrefixScenario_BIRDIPv4/bird16/AS4.txt index ebdca79e..887e4bf2 100644 --- a/tests/live_tests/scenarios/max_prefix/routes/MaxPrefixScenario_BIRDIPv4/bird16/AS4.txt +++ b/tests/live_tests/scenarios/max_prefix/routes/MaxPrefixScenario_BIRDIPv4/bird16/AS4.txt @@ -61,6 +61,20 @@ best: True, LOCAL_PREF: 100 filtered: False () +5.0.1.0/24, AS_PATH: 5, NEXT_HOP: 192.0.2.51, via 192.0.2.2 + std comms: + ext comms: + lrg comms: + best: True, LOCAL_PREF: 100 + filtered: False () + +5.0.2.0/24, AS_PATH: 5, NEXT_HOP: 192.0.2.51, via 192.0.2.2 + std comms: + ext comms: + lrg comms: + best: True, LOCAL_PREF: 100 + filtered: False () + 6.0.1.0/24, AS_PATH: 6, NEXT_HOP: 192.0.2.61, via 192.0.2.2 std comms: ext comms: diff --git a/tests/live_tests/scenarios/max_prefix/routes/MaxPrefixScenario_BIRDIPv6/bird16/AS4.txt b/tests/live_tests/scenarios/max_prefix/routes/MaxPrefixScenario_BIRDIPv6/bird16/AS4.txt index e1b1d57b..06eae5e5 100644 --- a/tests/live_tests/scenarios/max_prefix/routes/MaxPrefixScenario_BIRDIPv6/bird16/AS4.txt +++ b/tests/live_tests/scenarios/max_prefix/routes/MaxPrefixScenario_BIRDIPv6/bird16/AS4.txt @@ -61,6 +61,20 @@ best: True, LOCAL_PREF: 100 filtered: False () +2a05:0:1::/48, AS_PATH: 5, NEXT_HOP: 2001:db8:1:1::51, via 2001:db8:1:1::2 + std comms: + ext comms: + lrg comms: + best: True, LOCAL_PREF: 100 + filtered: False () + +2a05:0:2::/48, AS_PATH: 5, NEXT_HOP: 2001:db8:1:1::51, via 2001:db8:1:1::2 + std comms: + ext comms: + lrg comms: + best: True, LOCAL_PREF: 100 + filtered: False () + 2a06:0:1::/48, AS_PATH: 6, NEXT_HOP: 2001:db8:1:1::61, via 2001:db8:1:1::2 std comms: ext comms: diff --git a/tests/live_tests/scenarios/path_hiding/configs/PathHidingScenario_MitigationOff_BIRD2IPv4/bird2.conf b/tests/live_tests/scenarios/path_hiding/configs/PathHidingScenario_MitigationOff_BIRD2IPv4/bird2.conf index 0d5558e8..85b0546a 100644 --- a/tests/live_tests/scenarios/path_hiding/configs/PathHidingScenario_MitigationOff_BIRD2IPv4/bird2.conf +++ b/tests/live_tests/scenarios/path_hiding/configs/PathHidingScenario_MitigationOff_BIRD2IPv4/bird2.conf @@ -394,7 +394,7 @@ filter receive_from_AS1_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -538,7 +538,7 @@ filter receive_from_AS1_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -678,7 +678,7 @@ filter receive_from_AS2_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -822,7 +822,7 @@ filter receive_from_AS2_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -962,7 +962,7 @@ filter receive_from_AS3_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1106,7 +1106,7 @@ filter receive_from_AS3_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1246,7 +1246,7 @@ filter receive_from_AS4_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1390,7 +1390,7 @@ filter receive_from_AS4_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/path_hiding/configs/PathHidingScenario_MitigationOff_BIRD3IPv4/bird3.conf b/tests/live_tests/scenarios/path_hiding/configs/PathHidingScenario_MitigationOff_BIRD3IPv4/bird3.conf index 642a1e69..7ac7e602 100644 --- a/tests/live_tests/scenarios/path_hiding/configs/PathHidingScenario_MitigationOff_BIRD3IPv4/bird3.conf +++ b/tests/live_tests/scenarios/path_hiding/configs/PathHidingScenario_MitigationOff_BIRD3IPv4/bird3.conf @@ -394,7 +394,7 @@ filter receive_from_AS1_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -538,7 +538,7 @@ filter receive_from_AS1_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -678,7 +678,7 @@ filter receive_from_AS2_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -822,7 +822,7 @@ filter receive_from_AS2_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -962,7 +962,7 @@ filter receive_from_AS3_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1106,7 +1106,7 @@ filter receive_from_AS3_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1246,7 +1246,7 @@ filter receive_from_AS4_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1390,7 +1390,7 @@ filter receive_from_AS4_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/path_hiding/configs/PathHidingScenario_MitigationOff_BIRD3IPv6/bird3.conf b/tests/live_tests/scenarios/path_hiding/configs/PathHidingScenario_MitigationOff_BIRD3IPv6/bird3.conf index 642a1e69..7ac7e602 100644 --- a/tests/live_tests/scenarios/path_hiding/configs/PathHidingScenario_MitigationOff_BIRD3IPv6/bird3.conf +++ b/tests/live_tests/scenarios/path_hiding/configs/PathHidingScenario_MitigationOff_BIRD3IPv6/bird3.conf @@ -394,7 +394,7 @@ filter receive_from_AS1_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -538,7 +538,7 @@ filter receive_from_AS1_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -678,7 +678,7 @@ filter receive_from_AS2_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -822,7 +822,7 @@ filter receive_from_AS2_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -962,7 +962,7 @@ filter receive_from_AS3_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1106,7 +1106,7 @@ filter receive_from_AS3_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1246,7 +1246,7 @@ filter receive_from_AS4_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1390,7 +1390,7 @@ filter receive_from_AS4_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/path_hiding/configs/PathHidingScenario_MitigationOff_BIRDIPv6/bird2.conf b/tests/live_tests/scenarios/path_hiding/configs/PathHidingScenario_MitigationOff_BIRDIPv6/bird2.conf index 0d5558e8..85b0546a 100644 --- a/tests/live_tests/scenarios/path_hiding/configs/PathHidingScenario_MitigationOff_BIRDIPv6/bird2.conf +++ b/tests/live_tests/scenarios/path_hiding/configs/PathHidingScenario_MitigationOff_BIRDIPv6/bird2.conf @@ -394,7 +394,7 @@ filter receive_from_AS1_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -538,7 +538,7 @@ filter receive_from_AS1_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -678,7 +678,7 @@ filter receive_from_AS2_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -822,7 +822,7 @@ filter receive_from_AS2_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -962,7 +962,7 @@ filter receive_from_AS3_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1106,7 +1106,7 @@ filter receive_from_AS3_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1246,7 +1246,7 @@ filter receive_from_AS4_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1390,7 +1390,7 @@ filter receive_from_AS4_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/path_hiding/configs/PathHidingScenario_MitigationOn_BIRD2IPv4/bird2.conf b/tests/live_tests/scenarios/path_hiding/configs/PathHidingScenario_MitigationOn_BIRD2IPv4/bird2.conf index a0ad7be4..2b077b33 100644 --- a/tests/live_tests/scenarios/path_hiding/configs/PathHidingScenario_MitigationOn_BIRD2IPv4/bird2.conf +++ b/tests/live_tests/scenarios/path_hiding/configs/PathHidingScenario_MitigationOn_BIRD2IPv4/bird2.conf @@ -396,7 +396,7 @@ filter receive_from_AS1_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -541,7 +541,7 @@ filter receive_from_AS1_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -682,7 +682,7 @@ filter receive_from_AS2_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -827,7 +827,7 @@ filter receive_from_AS2_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -968,7 +968,7 @@ filter receive_from_AS3_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1113,7 +1113,7 @@ filter receive_from_AS3_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1254,7 +1254,7 @@ filter receive_from_AS4_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1399,7 +1399,7 @@ filter receive_from_AS4_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/path_hiding/configs/PathHidingScenario_MitigationOn_BIRD3IPv4/bird3.conf b/tests/live_tests/scenarios/path_hiding/configs/PathHidingScenario_MitigationOn_BIRD3IPv4/bird3.conf index 534e3022..9a51b9a7 100644 --- a/tests/live_tests/scenarios/path_hiding/configs/PathHidingScenario_MitigationOn_BIRD3IPv4/bird3.conf +++ b/tests/live_tests/scenarios/path_hiding/configs/PathHidingScenario_MitigationOn_BIRD3IPv4/bird3.conf @@ -396,7 +396,7 @@ filter receive_from_AS1_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -541,7 +541,7 @@ filter receive_from_AS1_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -682,7 +682,7 @@ filter receive_from_AS2_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -827,7 +827,7 @@ filter receive_from_AS2_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -968,7 +968,7 @@ filter receive_from_AS3_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1113,7 +1113,7 @@ filter receive_from_AS3_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1254,7 +1254,7 @@ filter receive_from_AS4_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1399,7 +1399,7 @@ filter receive_from_AS4_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/path_hiding/configs/PathHidingScenario_MitigationOn_BIRD3IPv6/bird3.conf b/tests/live_tests/scenarios/path_hiding/configs/PathHidingScenario_MitigationOn_BIRD3IPv6/bird3.conf index 534e3022..9a51b9a7 100644 --- a/tests/live_tests/scenarios/path_hiding/configs/PathHidingScenario_MitigationOn_BIRD3IPv6/bird3.conf +++ b/tests/live_tests/scenarios/path_hiding/configs/PathHidingScenario_MitigationOn_BIRD3IPv6/bird3.conf @@ -396,7 +396,7 @@ filter receive_from_AS1_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -541,7 +541,7 @@ filter receive_from_AS1_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -682,7 +682,7 @@ filter receive_from_AS2_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -827,7 +827,7 @@ filter receive_from_AS2_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -968,7 +968,7 @@ filter receive_from_AS3_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1113,7 +1113,7 @@ filter receive_from_AS3_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1254,7 +1254,7 @@ filter receive_from_AS4_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1399,7 +1399,7 @@ filter receive_from_AS4_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/path_hiding/configs/PathHidingScenario_MitigationOn_BIRDIPv6/bird2.conf b/tests/live_tests/scenarios/path_hiding/configs/PathHidingScenario_MitigationOn_BIRDIPv6/bird2.conf index a0ad7be4..2b077b33 100644 --- a/tests/live_tests/scenarios/path_hiding/configs/PathHidingScenario_MitigationOn_BIRDIPv6/bird2.conf +++ b/tests/live_tests/scenarios/path_hiding/configs/PathHidingScenario_MitigationOn_BIRDIPv6/bird2.conf @@ -396,7 +396,7 @@ filter receive_from_AS1_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -541,7 +541,7 @@ filter receive_from_AS1_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -682,7 +682,7 @@ filter receive_from_AS2_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -827,7 +827,7 @@ filter receive_from_AS2_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -968,7 +968,7 @@ filter receive_from_AS3_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1113,7 +1113,7 @@ filter receive_from_AS3_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1254,7 +1254,7 @@ filter receive_from_AS4_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1399,7 +1399,7 @@ filter receive_from_AS4_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/rfc8950/AS1_1.j2 b/tests/live_tests/scenarios/rfc8950/AS1_1.j2 index 69e5b451..310563c8 100644 --- a/tests/live_tests/scenarios/rfc8950/AS1_1.j2 +++ b/tests/live_tests/scenarios/rfc8950/AS1_1.j2 @@ -26,6 +26,8 @@ protocol static { route {{ data.AS1_v4_route9 }} unreachable; route {{ data.AS1_v4_route10 }} unreachable; route {{ data.AS1_v4_route11 }} unreachable; + route {{ data.AS1_v4_route13 }} unreachable; + route {{ data.AS1_v4_route14 }} unreachable; } protocol static { ipv6 { table master6; }; diff --git a/tests/live_tests/scenarios/rfc8950/README.rst b/tests/live_tests/scenarios/rfc8950/README.rst index 04caf9eb..b51242ca 100644 --- a/tests/live_tests/scenarios/rfc8950/README.rst +++ b/tests/live_tests/scenarios/rfc8950/README.rst @@ -16,6 +16,8 @@ AS1_1 - `AS1_v4_route9`: rejected (RPKI BOV AS0). - `AS1_v4_route10`: accepted (RPKI BOV VALID). - `AS1_v4_route11`: rejected (RPKI BOC INVALID). +- `AS1_v4_route13`: accepted (/8, within the ``ipv4_pref_len`` range). +- `AS1_v4_route14`: reject (/25, outise the ``ipv4_pref_len`` range). AS1_2 ----- diff --git a/tests/live_tests/scenarios/rfc8950/base.py b/tests/live_tests/scenarios/rfc8950/base.py index 7b4ecff5..14f2060d 100644 --- a/tests/live_tests/scenarios/rfc8950/base.py +++ b/tests/live_tests/scenarios/rfc8950/base.py @@ -48,6 +48,8 @@ class RFC8950Scenario(LiveScenario_TagAndRejectRejectPolicy, LiveScenario): "AS1_v4_route9": "1.1.5.0/24", "AS1_v4_route10": "1.1.6.0/24", "AS1_v4_route11": "1.1.7.0/24", + "AS1_v4_route13": "1.0.0.0/8", + "AS1_v4_route14": "1.1.8.0/25", "AS2_v4_route12": "2.2.1.0/24", @@ -153,6 +155,8 @@ def test_030_accepted_routes(self): self.DATA["AS1_v4_route5"], self.DATA["AS1_v4_route7"], self.DATA["AS1_v4_route8"], + self.DATA["AS1_v4_route10"], + self.DATA["AS1_v4_route13"], ): self.receive_route(self.rs, prefix, self.AS1_1, next_hop=self.AS1_1, as_path="1", @@ -209,3 +213,9 @@ def test_030_rpki_rejected_invalid(self): self.receive_route(self.rs, prefix, filtered=True, reject_reason=14, ext_comms=["rfc8097-invalid"]) self.log_contains(self.rs, "RPKI, route is INVALID - REJECTING " + prefix) + + def test_030_ipv4_prefixlen_ok(self): + """{}: IPv4 prefix length within ipv6_pref_len but outside ipv4_pref_len""" + for prefix in (self.DATA["AS1_v4_route14"],): + self.receive_route(self.rs, prefix, filtered=True, reject_reason=13) + self.log_contains(self.rs, "prefix len [25] not in 8-24 - REJECTING " + prefix) diff --git a/tests/live_tests/scenarios/rfc8950/configs/RFC8950Scenario_BIRD2IPv6/bird2.conf b/tests/live_tests/scenarios/rfc8950/configs/RFC8950Scenario_BIRD2IPv6/bird2.conf index cd7be75b..08507702 100644 --- a/tests/live_tests/scenarios/rfc8950/configs/RFC8950Scenario_BIRD2IPv6/bird2.conf +++ b/tests/live_tests/scenarios/rfc8950/configs/RFC8950Scenario_BIRD2IPv6/bird2.conf @@ -675,7 +675,9 @@ filter receive_from_AS1_1 { { tag_and_reject(14, 1); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then + { tag_and_reject(13, 1); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then { tag_and_reject(13, 1); reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; } } @@ -891,7 +893,9 @@ filter receive_from_AS1_2 { { tag_and_reject(14, 1); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then + { tag_and_reject(13, 1); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then { tag_and_reject(13, 1); reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; } } @@ -1105,7 +1109,9 @@ filter receive_from_AS2_1 { { tag_and_reject(14, 2); reject "RPKI, route is INVALID - REJECTING ", net; } # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then + { tag_and_reject(13, 2); reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; } + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then { tag_and_reject(13, 2); reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; } } diff --git a/tests/live_tests/scenarios/rfc8950/general.yml b/tests/live_tests/scenarios/rfc8950/general.yml index 1e1e3674..41e2bf4d 100644 --- a/tests/live_tests/scenarios/rfc8950/general.yml +++ b/tests/live_tests/scenarios/rfc8950/general.yml @@ -5,6 +5,12 @@ cfg: path_hiding: True rfc8950: true filtering: + ipv4_pref_len: + min: 8 + max: 24 + ipv6_pref_len: + min: 12 + max: 48 never_via_route_servers: peering_db: False next_hop_policy: "strict" diff --git a/tests/live_tests/scenarios/rfc8950/routes/RFC8950Scenario_BIRD2IPv6/bird2/AS2_1.txt b/tests/live_tests/scenarios/rfc8950/routes/RFC8950Scenario_BIRD2IPv6/bird2/AS2_1.txt index 3517dec9..9b3eff33 100644 --- a/tests/live_tests/scenarios/rfc8950/routes/RFC8950Scenario_BIRD2IPv6/bird2/AS2_1.txt +++ b/tests/live_tests/scenarios/rfc8950/routes/RFC8950Scenario_BIRD2IPv6/bird2/AS2_1.txt @@ -1,3 +1,10 @@ +1.0.0.0/8, AS_PATH: 1, NEXT_HOP: 2001:db8:1:1::11, via 2001:db8:1:1::2 + std comms: + ext comms: + lrg comms: + best: False, LOCAL_PREF: 100 + filtered: True () + 1.1.1.0/24, AS_PATH: 1, NEXT_HOP: 2001:db8:1:1::11, via 2001:db8:1:1::2 std comms: ext comms: diff --git a/tests/live_tests/scenarios/rfc8950/routes/RFC8950Scenario_BIRD2IPv6/bird2/rs.txt b/tests/live_tests/scenarios/rfc8950/routes/RFC8950Scenario_BIRD2IPv6/bird2/rs.txt index 9605353a..b8604cea 100644 --- a/tests/live_tests/scenarios/rfc8950/routes/RFC8950Scenario_BIRD2IPv6/bird2/rs.txt +++ b/tests/live_tests/scenarios/rfc8950/routes/RFC8950Scenario_BIRD2IPv6/bird2/rs.txt @@ -1,3 +1,10 @@ +1.0.0.0/8, AS_PATH: 1, NEXT_HOP: 2001:db8:1:1::11, via 2001:db8:1:1::11 + std comms: + ext comms: rfc8097-not-found + lrg comms: + best: True, LOCAL_PREF: 100 + filtered: False () + 1.1.1.0/24, AS_PATH: 1, NEXT_HOP: 2001:db8:1:1::11, via 2001:db8:1:1::11 std comms: ext comms: rfc8097-not-found @@ -40,6 +47,13 @@ best: False, LOCAL_PREF: 1 filtered: True (14) +1.1.8.0/25, AS_PATH: 1, NEXT_HOP: 2001:db8:1:1::11, via 2001:db8:1:1::11 + std comms: 65524:1 + ext comms: rfc8097-not-found + lrg comms: + best: False, LOCAL_PREF: 1 + filtered: True (13) + 104.0.0.0/24, AS_PATH: 1, NEXT_HOP: 2001:db8:1:1::11, via 2001:db8:1:1::11 std comms: ext comms: rfc8097-not-found diff --git a/tests/live_tests/scenarios/rich_example/configs/RichConfigExampleScenario_BIRD2IPv4/bird2.conf b/tests/live_tests/scenarios/rich_example/configs/RichConfigExampleScenario_BIRD2IPv4/bird2.conf index 915244bd..cb797840 100644 --- a/tests/live_tests/scenarios/rich_example/configs/RichConfigExampleScenario_BIRD2IPv4/bird2.conf +++ b/tests/live_tests/scenarios/rich_example/configs/RichConfigExampleScenario_BIRD2IPv4/bird2.conf @@ -1996,7 +1996,7 @@ filter receive_from_AS10745_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2222,7 +2222,7 @@ filter receive_from_AS10745_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -2443,7 +2443,7 @@ filter receive_from_AS197000_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2667,7 +2667,7 @@ filter receive_from_AS197000_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -2892,7 +2892,7 @@ filter receive_from_AS3333_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/rich_example/configs/RichConfigExampleScenario_BIRD2IPv6/bird2.conf b/tests/live_tests/scenarios/rich_example/configs/RichConfigExampleScenario_BIRD2IPv6/bird2.conf index 008636bf..98b6ad34 100644 --- a/tests/live_tests/scenarios/rich_example/configs/RichConfigExampleScenario_BIRD2IPv6/bird2.conf +++ b/tests/live_tests/scenarios/rich_example/configs/RichConfigExampleScenario_BIRD2IPv6/bird2.conf @@ -1994,7 +1994,7 @@ filter receive_from_AS10745_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2222,7 +2222,7 @@ filter receive_from_AS10745_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -2443,7 +2443,7 @@ filter receive_from_AS197000_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2667,7 +2667,7 @@ filter receive_from_AS197000_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -2890,7 +2890,7 @@ filter receive_from_AS3333_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/rich_example/configs/RichConfigExampleScenario_BIRD3IPv4/bird3.conf b/tests/live_tests/scenarios/rich_example/configs/RichConfigExampleScenario_BIRD3IPv4/bird3.conf index 23243b48..81d29860 100644 --- a/tests/live_tests/scenarios/rich_example/configs/RichConfigExampleScenario_BIRD3IPv4/bird3.conf +++ b/tests/live_tests/scenarios/rich_example/configs/RichConfigExampleScenario_BIRD3IPv4/bird3.conf @@ -1996,7 +1996,7 @@ filter receive_from_AS10745_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2222,7 +2222,7 @@ filter receive_from_AS10745_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -2443,7 +2443,7 @@ filter receive_from_AS197000_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2667,7 +2667,7 @@ filter receive_from_AS197000_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -2892,7 +2892,7 @@ filter receive_from_AS3333_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/rich_example/configs/RichConfigExampleScenario_BIRD3IPv6/bird3.conf b/tests/live_tests/scenarios/rich_example/configs/RichConfigExampleScenario_BIRD3IPv6/bird3.conf index 9fbb9516..3a8a1b0d 100644 --- a/tests/live_tests/scenarios/rich_example/configs/RichConfigExampleScenario_BIRD3IPv6/bird3.conf +++ b/tests/live_tests/scenarios/rich_example/configs/RichConfigExampleScenario_BIRD3IPv6/bird3.conf @@ -1994,7 +1994,7 @@ filter receive_from_AS10745_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2222,7 +2222,7 @@ filter receive_from_AS10745_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -2443,7 +2443,7 @@ filter receive_from_AS197000_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2667,7 +2667,7 @@ filter receive_from_AS197000_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -2890,7 +2890,7 @@ filter receive_from_AS3333_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/roles/configs/RolesScenario_BIRDIPv4/bird2.conf b/tests/live_tests/scenarios/roles/configs/RolesScenario_BIRDIPv4/bird2.conf index 18d82724..e086bd35 100644 --- a/tests/live_tests/scenarios/roles/configs/RolesScenario_BIRDIPv4/bird2.conf +++ b/tests/live_tests/scenarios/roles/configs/RolesScenario_BIRDIPv4/bird2.conf @@ -438,7 +438,7 @@ filter receive_from_AS1_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } } @@ -599,7 +599,7 @@ filter receive_from_AS1_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; accept; } } @@ -757,7 +757,7 @@ filter receive_from_AS2_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 2); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } } @@ -918,7 +918,7 @@ filter receive_from_AS2_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then { tag_and_reject(13, 2); print "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; accept; } } diff --git a/tests/live_tests/scenarios/roles/configs/RolesScenario_BIRDIPv4/bird3.conf b/tests/live_tests/scenarios/roles/configs/RolesScenario_BIRDIPv4/bird3.conf index 161adb6d..3b49cab1 100644 --- a/tests/live_tests/scenarios/roles/configs/RolesScenario_BIRDIPv4/bird3.conf +++ b/tests/live_tests/scenarios/roles/configs/RolesScenario_BIRDIPv4/bird3.conf @@ -438,7 +438,7 @@ filter receive_from_AS1_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } } @@ -599,7 +599,7 @@ filter receive_from_AS1_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; accept; } } @@ -757,7 +757,7 @@ filter receive_from_AS2_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 2); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } } @@ -918,7 +918,7 @@ filter receive_from_AS2_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then { tag_and_reject(13, 2); print "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; accept; } } diff --git a/tests/live_tests/scenarios/roles/configs/RolesScenario_BIRDIPv6/bird2.conf b/tests/live_tests/scenarios/roles/configs/RolesScenario_BIRDIPv6/bird2.conf index 18d82724..e086bd35 100644 --- a/tests/live_tests/scenarios/roles/configs/RolesScenario_BIRDIPv6/bird2.conf +++ b/tests/live_tests/scenarios/roles/configs/RolesScenario_BIRDIPv6/bird2.conf @@ -438,7 +438,7 @@ filter receive_from_AS1_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } } @@ -599,7 +599,7 @@ filter receive_from_AS1_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; accept; } } @@ -757,7 +757,7 @@ filter receive_from_AS2_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 2); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } } @@ -918,7 +918,7 @@ filter receive_from_AS2_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then { tag_and_reject(13, 2); print "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; accept; } } diff --git a/tests/live_tests/scenarios/roles/configs/RolesScenario_BIRDIPv6/bird3.conf b/tests/live_tests/scenarios/roles/configs/RolesScenario_BIRDIPv6/bird3.conf index 161adb6d..3b49cab1 100644 --- a/tests/live_tests/scenarios/roles/configs/RolesScenario_BIRDIPv6/bird3.conf +++ b/tests/live_tests/scenarios/roles/configs/RolesScenario_BIRDIPv6/bird3.conf @@ -438,7 +438,7 @@ filter receive_from_AS1_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } } @@ -599,7 +599,7 @@ filter receive_from_AS1_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; accept; } } @@ -757,7 +757,7 @@ filter receive_from_AS2_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 2); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } } @@ -918,7 +918,7 @@ filter receive_from_AS2_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then { tag_and_reject(13, 2); print "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; accept; } } diff --git a/tests/live_tests/scenarios/rpki/configs/RPKIINVALIDRoutesScenario_BIRD2IPv4/bird2.conf b/tests/live_tests/scenarios/rpki/configs/RPKIINVALIDRoutesScenario_BIRD2IPv4/bird2.conf index 9560487d..e34f90a5 100644 --- a/tests/live_tests/scenarios/rpki/configs/RPKIINVALIDRoutesScenario_BIRD2IPv4/bird2.conf +++ b/tests/live_tests/scenarios/rpki/configs/RPKIINVALIDRoutesScenario_BIRD2IPv4/bird2.conf @@ -458,7 +458,7 @@ filter receive_from_AS1_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -615,7 +615,7 @@ filter receive_from_AS1_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -765,7 +765,7 @@ filter receive_from_AS2_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -919,7 +919,7 @@ filter receive_from_AS2_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1072,7 +1072,7 @@ filter receive_from_AS3_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1229,7 +1229,7 @@ filter receive_from_AS3_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1382,7 +1382,7 @@ filter receive_from_AS4_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1539,7 +1539,7 @@ filter receive_from_AS4_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/rpki/configs/RPKIINVALIDRoutesScenario_BIRD2IPv6/bird2.conf b/tests/live_tests/scenarios/rpki/configs/RPKIINVALIDRoutesScenario_BIRD2IPv6/bird2.conf index 9560487d..e34f90a5 100644 --- a/tests/live_tests/scenarios/rpki/configs/RPKIINVALIDRoutesScenario_BIRD2IPv6/bird2.conf +++ b/tests/live_tests/scenarios/rpki/configs/RPKIINVALIDRoutesScenario_BIRD2IPv6/bird2.conf @@ -458,7 +458,7 @@ filter receive_from_AS1_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -615,7 +615,7 @@ filter receive_from_AS1_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -765,7 +765,7 @@ filter receive_from_AS2_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -919,7 +919,7 @@ filter receive_from_AS2_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1072,7 +1072,7 @@ filter receive_from_AS3_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1229,7 +1229,7 @@ filter receive_from_AS3_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1382,7 +1382,7 @@ filter receive_from_AS4_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1539,7 +1539,7 @@ filter receive_from_AS4_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/rpki/configs/RPKIINVALIDRoutesScenario_BIRD3IPv4/bird3.conf b/tests/live_tests/scenarios/rpki/configs/RPKIINVALIDRoutesScenario_BIRD3IPv4/bird3.conf index c4fd12a5..ec02d449 100644 --- a/tests/live_tests/scenarios/rpki/configs/RPKIINVALIDRoutesScenario_BIRD3IPv4/bird3.conf +++ b/tests/live_tests/scenarios/rpki/configs/RPKIINVALIDRoutesScenario_BIRD3IPv4/bird3.conf @@ -458,7 +458,7 @@ filter receive_from_AS1_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -615,7 +615,7 @@ filter receive_from_AS1_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -765,7 +765,7 @@ filter receive_from_AS2_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -919,7 +919,7 @@ filter receive_from_AS2_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1072,7 +1072,7 @@ filter receive_from_AS3_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1229,7 +1229,7 @@ filter receive_from_AS3_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1382,7 +1382,7 @@ filter receive_from_AS4_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1539,7 +1539,7 @@ filter receive_from_AS4_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/rpki/configs/RPKIINVALIDRoutesScenario_BIRD3IPv6/bird3.conf b/tests/live_tests/scenarios/rpki/configs/RPKIINVALIDRoutesScenario_BIRD3IPv6/bird3.conf index c4fd12a5..ec02d449 100644 --- a/tests/live_tests/scenarios/rpki/configs/RPKIINVALIDRoutesScenario_BIRD3IPv6/bird3.conf +++ b/tests/live_tests/scenarios/rpki/configs/RPKIINVALIDRoutesScenario_BIRD3IPv6/bird3.conf @@ -458,7 +458,7 @@ filter receive_from_AS1_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -615,7 +615,7 @@ filter receive_from_AS1_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -765,7 +765,7 @@ filter receive_from_AS2_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -919,7 +919,7 @@ filter receive_from_AS2_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1072,7 +1072,7 @@ filter receive_from_AS3_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1229,7 +1229,7 @@ filter receive_from_AS3_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1382,7 +1382,7 @@ filter receive_from_AS4_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1539,7 +1539,7 @@ filter receive_from_AS4_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/rpki_bov_comms/configs/RPKICustomBOVCommunitiesScenario_BIRDIPv4/bird2.conf b/tests/live_tests/scenarios/rpki_bov_comms/configs/RPKICustomBOVCommunitiesScenario_BIRDIPv4/bird2.conf index e296142c..f49536bd 100644 --- a/tests/live_tests/scenarios/rpki_bov_comms/configs/RPKICustomBOVCommunitiesScenario_BIRDIPv4/bird2.conf +++ b/tests/live_tests/scenarios/rpki_bov_comms/configs/RPKICustomBOVCommunitiesScenario_BIRDIPv4/bird2.conf @@ -486,7 +486,7 @@ filter receive_from_AS1_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -638,7 +638,7 @@ filter receive_from_AS1_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -786,7 +786,7 @@ filter receive_from_AS2_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -938,7 +938,7 @@ filter receive_from_AS2_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1086,7 +1086,7 @@ filter receive_from_AS3_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1238,7 +1238,7 @@ filter receive_from_AS3_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1386,7 +1386,7 @@ filter receive_from_AS4_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1538,7 +1538,7 @@ filter receive_from_AS4_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/rpki_bov_comms/configs/RPKICustomBOVCommunitiesScenario_BIRDIPv4/bird3.conf b/tests/live_tests/scenarios/rpki_bov_comms/configs/RPKICustomBOVCommunitiesScenario_BIRDIPv4/bird3.conf index 4a09b686..0ac921b3 100644 --- a/tests/live_tests/scenarios/rpki_bov_comms/configs/RPKICustomBOVCommunitiesScenario_BIRDIPv4/bird3.conf +++ b/tests/live_tests/scenarios/rpki_bov_comms/configs/RPKICustomBOVCommunitiesScenario_BIRDIPv4/bird3.conf @@ -486,7 +486,7 @@ filter receive_from_AS1_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -638,7 +638,7 @@ filter receive_from_AS1_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -786,7 +786,7 @@ filter receive_from_AS2_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -938,7 +938,7 @@ filter receive_from_AS2_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1086,7 +1086,7 @@ filter receive_from_AS3_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1238,7 +1238,7 @@ filter receive_from_AS3_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1386,7 +1386,7 @@ filter receive_from_AS4_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1538,7 +1538,7 @@ filter receive_from_AS4_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/rpki_bov_comms/configs/RPKICustomBOVCommunitiesScenario_BIRDIPv6/bird2.conf b/tests/live_tests/scenarios/rpki_bov_comms/configs/RPKICustomBOVCommunitiesScenario_BIRDIPv6/bird2.conf index e296142c..f49536bd 100644 --- a/tests/live_tests/scenarios/rpki_bov_comms/configs/RPKICustomBOVCommunitiesScenario_BIRDIPv6/bird2.conf +++ b/tests/live_tests/scenarios/rpki_bov_comms/configs/RPKICustomBOVCommunitiesScenario_BIRDIPv6/bird2.conf @@ -486,7 +486,7 @@ filter receive_from_AS1_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -638,7 +638,7 @@ filter receive_from_AS1_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -786,7 +786,7 @@ filter receive_from_AS2_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -938,7 +938,7 @@ filter receive_from_AS2_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1086,7 +1086,7 @@ filter receive_from_AS3_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1238,7 +1238,7 @@ filter receive_from_AS3_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1386,7 +1386,7 @@ filter receive_from_AS4_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1538,7 +1538,7 @@ filter receive_from_AS4_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/rpki_bov_comms/configs/RPKICustomBOVCommunitiesScenario_BIRDIPv6/bird3.conf b/tests/live_tests/scenarios/rpki_bov_comms/configs/RPKICustomBOVCommunitiesScenario_BIRDIPv6/bird3.conf index 4a09b686..0ac921b3 100644 --- a/tests/live_tests/scenarios/rpki_bov_comms/configs/RPKICustomBOVCommunitiesScenario_BIRDIPv6/bird3.conf +++ b/tests/live_tests/scenarios/rpki_bov_comms/configs/RPKICustomBOVCommunitiesScenario_BIRDIPv6/bird3.conf @@ -486,7 +486,7 @@ filter receive_from_AS1_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -638,7 +638,7 @@ filter receive_from_AS1_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -786,7 +786,7 @@ filter receive_from_AS2_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -938,7 +938,7 @@ filter receive_from_AS2_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1086,7 +1086,7 @@ filter receive_from_AS3_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1238,7 +1238,7 @@ filter receive_from_AS3_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1386,7 +1386,7 @@ filter receive_from_AS4_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1538,7 +1538,7 @@ filter receive_from_AS4_2 { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/rpki_rtr_example/configs/RPKIRTRScenario_BIRD2IPv4/bird2.conf b/tests/live_tests/scenarios/rpki_rtr_example/configs/RPKIRTRScenario_BIRD2IPv4/bird2.conf index 2b889c1b..7f5dc1e2 100644 --- a/tests/live_tests/scenarios/rpki_rtr_example/configs/RPKIRTRScenario_BIRD2IPv4/bird2.conf +++ b/tests/live_tests/scenarios/rpki_rtr_example/configs/RPKIRTRScenario_BIRD2IPv4/bird2.conf @@ -374,7 +374,7 @@ filter receive_from_AS10745_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -547,7 +547,7 @@ filter receive_from_AS1_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -720,7 +720,7 @@ filter receive_from_AS3333_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/rpki_rtr_example/configs/RPKIRTRScenario_BIRD3IPv4/bird3.conf b/tests/live_tests/scenarios/rpki_rtr_example/configs/RPKIRTRScenario_BIRD3IPv4/bird3.conf index 96fa74df..5a43256c 100644 --- a/tests/live_tests/scenarios/rpki_rtr_example/configs/RPKIRTRScenario_BIRD3IPv4/bird3.conf +++ b/tests/live_tests/scenarios/rpki_rtr_example/configs/RPKIRTRScenario_BIRD3IPv4/bird3.conf @@ -374,7 +374,7 @@ filter receive_from_AS10745_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -547,7 +547,7 @@ filter receive_from_AS1_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -720,7 +720,7 @@ filter receive_from_AS3333_1 { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_EmptyAS_SETs_BIRD2IPv4/bird2.conf b/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_EmptyAS_SETs_BIRD2IPv4/bird2.conf index d51b557e..de55a2f2 100644 --- a/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_EmptyAS_SETs_BIRD2IPv4/bird2.conf +++ b/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_EmptyAS_SETs_BIRD2IPv4/bird2.conf @@ -605,7 +605,7 @@ filter receive_from_AS1_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -799,7 +799,7 @@ filter receive_from_AS1_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -996,7 +996,7 @@ filter receive_from_AS2_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1197,7 +1197,7 @@ filter receive_from_AS2_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1421,7 +1421,7 @@ filter receive_from_AS4_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1649,7 +1649,7 @@ filter receive_from_AS4_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1850,7 +1850,7 @@ filter receive_from_AS5_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2055,7 +2055,7 @@ filter receive_from_AS5_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -2262,7 +2262,7 @@ filter receive_from_AS6_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2473,7 +2473,7 @@ filter receive_from_AS6_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_EmptyAS_SETs_BIRD2IPv6/bird2.conf b/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_EmptyAS_SETs_BIRD2IPv6/bird2.conf index d51b557e..de55a2f2 100644 --- a/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_EmptyAS_SETs_BIRD2IPv6/bird2.conf +++ b/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_EmptyAS_SETs_BIRD2IPv6/bird2.conf @@ -605,7 +605,7 @@ filter receive_from_AS1_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -799,7 +799,7 @@ filter receive_from_AS1_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -996,7 +996,7 @@ filter receive_from_AS2_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1197,7 +1197,7 @@ filter receive_from_AS2_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1421,7 +1421,7 @@ filter receive_from_AS4_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1649,7 +1649,7 @@ filter receive_from_AS4_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1850,7 +1850,7 @@ filter receive_from_AS5_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2055,7 +2055,7 @@ filter receive_from_AS5_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -2262,7 +2262,7 @@ filter receive_from_AS6_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2473,7 +2473,7 @@ filter receive_from_AS6_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_EmptyAS_SETs_BIRD3IPv4/bird3.conf b/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_EmptyAS_SETs_BIRD3IPv4/bird3.conf index 4d99cdda..9899547f 100644 --- a/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_EmptyAS_SETs_BIRD3IPv4/bird3.conf +++ b/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_EmptyAS_SETs_BIRD3IPv4/bird3.conf @@ -605,7 +605,7 @@ filter receive_from_AS1_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -799,7 +799,7 @@ filter receive_from_AS1_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -996,7 +996,7 @@ filter receive_from_AS2_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1197,7 +1197,7 @@ filter receive_from_AS2_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1421,7 +1421,7 @@ filter receive_from_AS4_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1649,7 +1649,7 @@ filter receive_from_AS4_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1850,7 +1850,7 @@ filter receive_from_AS5_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2055,7 +2055,7 @@ filter receive_from_AS5_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -2262,7 +2262,7 @@ filter receive_from_AS6_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2473,7 +2473,7 @@ filter receive_from_AS6_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_EmptyAS_SETs_BIRD3IPv6/bird3.conf b/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_EmptyAS_SETs_BIRD3IPv6/bird3.conf index 4d99cdda..9899547f 100644 --- a/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_EmptyAS_SETs_BIRD3IPv6/bird3.conf +++ b/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_EmptyAS_SETs_BIRD3IPv6/bird3.conf @@ -605,7 +605,7 @@ filter receive_from_AS1_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -799,7 +799,7 @@ filter receive_from_AS1_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -996,7 +996,7 @@ filter receive_from_AS2_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1197,7 +1197,7 @@ filter receive_from_AS2_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1421,7 +1421,7 @@ filter receive_from_AS4_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1649,7 +1649,7 @@ filter receive_from_AS4_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1850,7 +1850,7 @@ filter receive_from_AS5_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2055,7 +2055,7 @@ filter receive_from_AS5_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -2262,7 +2262,7 @@ filter receive_from_AS6_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2473,7 +2473,7 @@ filter receive_from_AS6_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_WithAS_SETs_BIRD2IPv6/bird2.conf b/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_WithAS_SETs_BIRD2IPv6/bird2.conf index 5f8bbbdc..0c492a91 100644 --- a/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_WithAS_SETs_BIRD2IPv6/bird2.conf +++ b/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_WithAS_SETs_BIRD2IPv6/bird2.conf @@ -193,10 +193,10 @@ define AS_SET_AS_AS2_prefixes_6 = [ # ARIN Whois database records define ARIN_Whois_db_AS2_4 = [ - 2.7.0.0/16{16,32}, 2.6.0.0/16{16,32}, 2.0.5.0/24{24,32} + 2.0.5.0/24{24,32}, 2.6.0.0/16{16,32}, 2.7.0.0/16{16,32} ]; define ARIN_Whois_db_AS2_6 = [ - 2a02:6::/32{32,128}, 2a02:0:5::/48{48,128}, 2a02:7::/32{32,128} + 2a02:0:5::/48{48,128}, 2a02:7::/32{32,128}, 2a02:6::/32{32,128} ]; define ARIN_Whois_db_AS3_4 = [ 3.2.0.0/16{16,32}, 3.3.0.0/16{16,32} @@ -687,7 +687,7 @@ filter receive_from_AS1_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -891,7 +891,7 @@ filter receive_from_AS1_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1096,7 +1096,7 @@ filter receive_from_AS2_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1307,7 +1307,7 @@ filter receive_from_AS2_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1539,7 +1539,7 @@ filter receive_from_AS4_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1777,7 +1777,7 @@ filter receive_from_AS4_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1986,7 +1986,7 @@ filter receive_from_AS5_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2201,7 +2201,7 @@ filter receive_from_AS5_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -2416,7 +2416,7 @@ filter receive_from_AS6_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2637,7 +2637,7 @@ filter receive_from_AS6_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_WithAS_SETs_BIRDIPv4/bird16.conf b/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_WithAS_SETs_BIRDIPv4/bird16.conf index bfabc1f7..80c64b0d 100644 --- a/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_WithAS_SETs_BIRDIPv4/bird16.conf +++ b/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_WithAS_SETs_BIRDIPv4/bird16.conf @@ -126,7 +126,7 @@ define AS_SET_AS_AS2_prefixes_4 = [ # ARIN Whois database records define ARIN_Whois_db_AS2_4 = [ - 2.0.5.0/24{24,32}, 2.7.0.0/16{16,32}, 2.6.0.0/16{16,32} + 2.6.0.0/16{16,32}, 2.0.5.0/24{24,32}, 2.7.0.0/16{16,32} ]; define ARIN_Whois_db_AS3_4 = [ 3.2.0.0/16{16,32}, 3.3.0.0/16{16,32} diff --git a/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_WithAS_SETs_BIRDIPv6/bird16.conf b/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_WithAS_SETs_BIRDIPv6/bird16.conf index c4c57778..8c35955c 100644 --- a/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_WithAS_SETs_BIRDIPv6/bird16.conf +++ b/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_WithAS_SETs_BIRDIPv6/bird16.conf @@ -126,10 +126,10 @@ define AS_SET_AS_AS2_prefixes_6 = [ # ARIN Whois database records define ARIN_Whois_db_AS2_6 = [ - 2a02:6::/32{32,128}, 2a02:7::/32{32,128}, 2a02:0:5::/48{48,128} + 2a02:0:5::/48{48,128}, 2a02:7::/32{32,128}, 2a02:6::/32{32,128} ]; define ARIN_Whois_db_AS3_6 = [ - 2a03:3::/32{32,128}, 2a03:2::/32{32,128} + 2a03:2::/32{32,128}, 2a03:3::/32{32,128} ]; define ARIN_Whois_db_AS6_6 = [ 2a06:0:1::/48{48,128} diff --git a/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_WithAS_SETs_BIRDsIPv4/bird2.conf b/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_WithAS_SETs_BIRDsIPv4/bird2.conf index a211f315..c2879451 100644 --- a/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_WithAS_SETs_BIRDsIPv4/bird2.conf +++ b/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_WithAS_SETs_BIRDsIPv4/bird2.conf @@ -193,10 +193,10 @@ define AS_SET_AS_AS2_prefixes_4 = [ # ARIN Whois database records define ARIN_Whois_db_AS2_4 = [ - 2.7.0.0/16{16,32}, 2.6.0.0/16{16,32}, 2.0.5.0/24{24,32} + 2.0.5.0/24{24,32}, 2.6.0.0/16{16,32}, 2.7.0.0/16{16,32} ]; define ARIN_Whois_db_AS2_6 = [ - 2a02:6::/32{32,128}, 2a02:0:5::/48{48,128}, 2a02:7::/32{32,128} + 2a02:0:5::/48{48,128}, 2a02:7::/32{32,128}, 2a02:6::/32{32,128} ]; define ARIN_Whois_db_AS3_4 = [ 3.2.0.0/16{16,32}, 3.3.0.0/16{16,32} @@ -689,7 +689,7 @@ filter receive_from_AS1_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -891,7 +891,7 @@ filter receive_from_AS1_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1098,7 +1098,7 @@ filter receive_from_AS2_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1307,7 +1307,7 @@ filter receive_from_AS2_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1541,7 +1541,7 @@ filter receive_from_AS4_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1777,7 +1777,7 @@ filter receive_from_AS4_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1988,7 +1988,7 @@ filter receive_from_AS5_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2201,7 +2201,7 @@ filter receive_from_AS5_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -2418,7 +2418,7 @@ filter receive_from_AS6_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2637,7 +2637,7 @@ filter receive_from_AS6_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_WithAS_SETs_BIRDsIPv4/bird3.conf b/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_WithAS_SETs_BIRDsIPv4/bird3.conf index ea1ec370..3cdd2b4d 100644 --- a/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_WithAS_SETs_BIRDsIPv4/bird3.conf +++ b/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_WithAS_SETs_BIRDsIPv4/bird3.conf @@ -193,13 +193,13 @@ define AS_SET_AS_AS2_prefixes_4 = [ # ARIN Whois database records define ARIN_Whois_db_AS2_4 = [ - 2.6.0.0/16{16,32}, 2.0.5.0/24{24,32}, 2.7.0.0/16{16,32} + 2.0.5.0/24{24,32}, 2.6.0.0/16{16,32}, 2.7.0.0/16{16,32} ]; define ARIN_Whois_db_AS2_6 = [ - 2a02:6::/32{32,128}, 2a02:7::/32{32,128}, 2a02:0:5::/48{48,128} + 2a02:0:5::/48{48,128}, 2a02:7::/32{32,128}, 2a02:6::/32{32,128} ]; define ARIN_Whois_db_AS3_4 = [ - 3.3.0.0/16{16,32}, 3.2.0.0/16{16,32} + 3.2.0.0/16{16,32}, 3.3.0.0/16{16,32} ]; define ARIN_Whois_db_AS3_6 = [ 2a03:3::/32{32,128}, 2a03:2::/32{32,128} @@ -689,7 +689,7 @@ filter receive_from_AS1_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -891,7 +891,7 @@ filter receive_from_AS1_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1098,7 +1098,7 @@ filter receive_from_AS2_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1307,7 +1307,7 @@ filter receive_from_AS2_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1541,7 +1541,7 @@ filter receive_from_AS4_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1777,7 +1777,7 @@ filter receive_from_AS4_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1988,7 +1988,7 @@ filter receive_from_AS5_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2201,7 +2201,7 @@ filter receive_from_AS5_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -2418,7 +2418,7 @@ filter receive_from_AS6_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2637,7 +2637,7 @@ filter receive_from_AS6_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_WithAS_SETs_BIRDsIPv6/bird3.conf b/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_WithAS_SETs_BIRDsIPv6/bird3.conf index 28c49477..6db47fb4 100644 --- a/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_WithAS_SETs_BIRDsIPv6/bird3.conf +++ b/tests/live_tests/scenarios/tag_as_set/configs/TagASSetScenario_WithAS_SETs_BIRDsIPv6/bird3.conf @@ -193,13 +193,13 @@ define AS_SET_AS_AS2_prefixes_6 = [ # ARIN Whois database records define ARIN_Whois_db_AS2_4 = [ - 2.6.0.0/16{16,32}, 2.0.5.0/24{24,32}, 2.7.0.0/16{16,32} + 2.0.5.0/24{24,32}, 2.6.0.0/16{16,32}, 2.7.0.0/16{16,32} ]; define ARIN_Whois_db_AS2_6 = [ - 2a02:6::/32{32,128}, 2a02:7::/32{32,128}, 2a02:0:5::/48{48,128} + 2a02:0:5::/48{48,128}, 2a02:7::/32{32,128}, 2a02:6::/32{32,128} ]; define ARIN_Whois_db_AS3_4 = [ - 3.3.0.0/16{16,32}, 3.2.0.0/16{16,32} + 3.2.0.0/16{16,32}, 3.3.0.0/16{16,32} ]; define ARIN_Whois_db_AS3_6 = [ 2a03:3::/32{32,128}, 2a03:2::/32{32,128} @@ -687,7 +687,7 @@ filter receive_from_AS1_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -891,7 +891,7 @@ filter receive_from_AS1_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1096,7 +1096,7 @@ filter receive_from_AS2_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1307,7 +1307,7 @@ filter receive_from_AS2_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1539,7 +1539,7 @@ filter receive_from_AS4_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -1777,7 +1777,7 @@ filter receive_from_AS4_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -1986,7 +1986,7 @@ filter receive_from_AS5_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2201,7 +2201,7 @@ filter receive_from_AS5_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; @@ -2416,7 +2416,7 @@ filter receive_from_AS6_1 { } else { # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then reject "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; @@ -2637,7 +2637,7 @@ filter receive_from_AS6_2 { } else { # Prefix: length - if !prefix_len_is_valid(12, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(12, 48) then reject "prefix len [", net.len, "] not in 12-48 - REJECTING ", net; diff --git a/tests/live_tests/scenarios/tag_reject_policy/configs/TagRejectPolicyScenario_BIRD2IPv4/bird2.conf b/tests/live_tests/scenarios/tag_reject_policy/configs/TagRejectPolicyScenario_BIRD2IPv4/bird2.conf index 24b60b95..479b30f9 100644 --- a/tests/live_tests/scenarios/tag_reject_policy/configs/TagRejectPolicyScenario_BIRD2IPv4/bird2.conf +++ b/tests/live_tests/scenarios/tag_reject_policy/configs/TagRejectPolicyScenario_BIRD2IPv4/bird2.conf @@ -2059,7 +2059,7 @@ filter receive_from_AS151866_1 { { tag_and_reject(14, 151866); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 151866); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -2252,7 +2252,7 @@ filter receive_from_AS151866_2 { { tag_and_reject(14, 151866); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 151866); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -2461,7 +2461,7 @@ filter receive_from_AS1_1 { { tag_and_reject(14, 1); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -2671,7 +2671,7 @@ filter receive_from_AS1_2 { { tag_and_reject(14, 1); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -2867,7 +2867,7 @@ filter receive_from_AS1_3 { { tag_and_reject(14, 1); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -3064,7 +3064,7 @@ filter receive_from_AS1_4 { { tag_and_reject(14, 1); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -3260,7 +3260,7 @@ filter receive_from_AS222_1 { { tag_and_reject(14, 222); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 222); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -3459,7 +3459,7 @@ filter receive_from_AS222_2 { { tag_and_reject(14, 222); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 222); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -3655,7 +3655,7 @@ filter receive_from_AS2_1 { { tag_and_reject(14, 2); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 2); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } prevent_graceful_shutdown(); @@ -3852,7 +3852,7 @@ filter receive_from_AS2_2 { { tag_and_reject(14, 2); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 2); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } prevent_graceful_shutdown(); @@ -4031,7 +4031,7 @@ filter receive_from_AS3_1 { { tag_and_reject(14, 3); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 3); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -4216,7 +4216,7 @@ filter receive_from_AS3_2 { { tag_and_reject(14, 3); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 3); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -4377,7 +4377,7 @@ filter receive_from_AS4_1 { { tag_and_reject(14, 4); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 4); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -4538,7 +4538,7 @@ filter receive_from_AS4_2 { { tag_and_reject(14, 4); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 4); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); diff --git a/tests/live_tests/scenarios/tag_reject_policy/configs/TagRejectPolicyScenario_BIRD2IPv6/bird2.conf b/tests/live_tests/scenarios/tag_reject_policy/configs/TagRejectPolicyScenario_BIRD2IPv6/bird2.conf index 2f48b5a6..f9ff4c1f 100644 --- a/tests/live_tests/scenarios/tag_reject_policy/configs/TagRejectPolicyScenario_BIRD2IPv6/bird2.conf +++ b/tests/live_tests/scenarios/tag_reject_policy/configs/TagRejectPolicyScenario_BIRD2IPv6/bird2.conf @@ -2059,7 +2059,7 @@ filter receive_from_AS151866_1 { { tag_and_reject(14, 151866); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 151866); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -2252,7 +2252,7 @@ filter receive_from_AS151866_2 { { tag_and_reject(14, 151866); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 151866); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -2459,7 +2459,7 @@ filter receive_from_AS1_1 { { tag_and_reject(14, 1); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -2671,7 +2671,7 @@ filter receive_from_AS1_2 { { tag_and_reject(14, 1); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -2865,7 +2865,7 @@ filter receive_from_AS1_3 { { tag_and_reject(14, 1); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -3064,7 +3064,7 @@ filter receive_from_AS1_4 { { tag_and_reject(14, 1); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -3260,7 +3260,7 @@ filter receive_from_AS222_1 { { tag_and_reject(14, 222); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 222); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -3459,7 +3459,7 @@ filter receive_from_AS222_2 { { tag_and_reject(14, 222); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 222); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -3653,7 +3653,7 @@ filter receive_from_AS2_1 { { tag_and_reject(14, 2); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 2); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } prevent_graceful_shutdown(); @@ -3852,7 +3852,7 @@ filter receive_from_AS2_2 { { tag_and_reject(14, 2); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 2); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } prevent_graceful_shutdown(); @@ -4031,7 +4031,7 @@ filter receive_from_AS3_1 { { tag_and_reject(14, 3); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 3); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -4216,7 +4216,7 @@ filter receive_from_AS3_2 { { tag_and_reject(14, 3); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 3); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -4377,7 +4377,7 @@ filter receive_from_AS4_1 { { tag_and_reject(14, 4); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 4); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -4538,7 +4538,7 @@ filter receive_from_AS4_2 { { tag_and_reject(14, 4); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 4); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); diff --git a/tests/live_tests/scenarios/tag_reject_policy/configs/TagRejectPolicyScenario_BIRD3IPv4/bird3.conf b/tests/live_tests/scenarios/tag_reject_policy/configs/TagRejectPolicyScenario_BIRD3IPv4/bird3.conf index 238e9423..d75f3ecd 100644 --- a/tests/live_tests/scenarios/tag_reject_policy/configs/TagRejectPolicyScenario_BIRD3IPv4/bird3.conf +++ b/tests/live_tests/scenarios/tag_reject_policy/configs/TagRejectPolicyScenario_BIRD3IPv4/bird3.conf @@ -2059,7 +2059,7 @@ filter receive_from_AS151866_1 { { tag_and_reject(14, 151866); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 151866); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -2252,7 +2252,7 @@ filter receive_from_AS151866_2 { { tag_and_reject(14, 151866); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 151866); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -2461,7 +2461,7 @@ filter receive_from_AS1_1 { { tag_and_reject(14, 1); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -2671,7 +2671,7 @@ filter receive_from_AS1_2 { { tag_and_reject(14, 1); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -2867,7 +2867,7 @@ filter receive_from_AS1_3 { { tag_and_reject(14, 1); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -3064,7 +3064,7 @@ filter receive_from_AS1_4 { { tag_and_reject(14, 1); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -3260,7 +3260,7 @@ filter receive_from_AS222_1 { { tag_and_reject(14, 222); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 222); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -3459,7 +3459,7 @@ filter receive_from_AS222_2 { { tag_and_reject(14, 222); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 222); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -3655,7 +3655,7 @@ filter receive_from_AS2_1 { { tag_and_reject(14, 2); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 2); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } prevent_graceful_shutdown(); @@ -3852,7 +3852,7 @@ filter receive_from_AS2_2 { { tag_and_reject(14, 2); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 2); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } prevent_graceful_shutdown(); @@ -4031,7 +4031,7 @@ filter receive_from_AS3_1 { { tag_and_reject(14, 3); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 3); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -4216,7 +4216,7 @@ filter receive_from_AS3_2 { { tag_and_reject(14, 3); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 3); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -4377,7 +4377,7 @@ filter receive_from_AS4_1 { { tag_and_reject(14, 4); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 4); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -4538,7 +4538,7 @@ filter receive_from_AS4_2 { { tag_and_reject(14, 4); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 4); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); diff --git a/tests/live_tests/scenarios/tag_reject_policy/configs/TagRejectPolicyScenario_BIRD3IPv6/bird3.conf b/tests/live_tests/scenarios/tag_reject_policy/configs/TagRejectPolicyScenario_BIRD3IPv6/bird3.conf index 67a85373..b7a5e4cc 100644 --- a/tests/live_tests/scenarios/tag_reject_policy/configs/TagRejectPolicyScenario_BIRD3IPv6/bird3.conf +++ b/tests/live_tests/scenarios/tag_reject_policy/configs/TagRejectPolicyScenario_BIRD3IPv6/bird3.conf @@ -2059,7 +2059,7 @@ filter receive_from_AS151866_1 { { tag_and_reject(14, 151866); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 151866); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -2252,7 +2252,7 @@ filter receive_from_AS151866_2 { { tag_and_reject(14, 151866); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 151866); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -2459,7 +2459,7 @@ filter receive_from_AS1_1 { { tag_and_reject(14, 1); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -2671,7 +2671,7 @@ filter receive_from_AS1_2 { { tag_and_reject(14, 1); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -2865,7 +2865,7 @@ filter receive_from_AS1_3 { { tag_and_reject(14, 1); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -3064,7 +3064,7 @@ filter receive_from_AS1_4 { { tag_and_reject(14, 1); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 1); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -3260,7 +3260,7 @@ filter receive_from_AS222_1 { { tag_and_reject(14, 222); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 222); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -3459,7 +3459,7 @@ filter receive_from_AS222_2 { { tag_and_reject(14, 222); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 222); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -3653,7 +3653,7 @@ filter receive_from_AS2_1 { { tag_and_reject(14, 2); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 2); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } prevent_graceful_shutdown(); @@ -3852,7 +3852,7 @@ filter receive_from_AS2_2 { { tag_and_reject(14, 2); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 2); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } prevent_graceful_shutdown(); @@ -4031,7 +4031,7 @@ filter receive_from_AS3_1 { { tag_and_reject(14, 3); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 3); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -4216,7 +4216,7 @@ filter receive_from_AS3_2 { { tag_and_reject(14, 3); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 3); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -4377,7 +4377,7 @@ filter receive_from_AS4_1 { { tag_and_reject(14, 4); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(8, 24) then + if net.type = NET_IP4 && !prefix_len_is_valid(8, 24) then { tag_and_reject(13, 4); print "prefix len [", net.len, "] not in 8-24 - REJECTING ", net; accept; } honor_graceful_shutdown(); @@ -4538,7 +4538,7 @@ filter receive_from_AS4_2 { { tag_and_reject(14, 4); print "RPKI, route is INVALID - REJECTING ", net; accept; } # Prefix: length - if !prefix_len_is_valid(17, 48) then + if net.type = NET_IP6 && !prefix_len_is_valid(17, 48) then { tag_and_reject(13, 4); print "prefix len [", net.len, "] not in 17-48 - REJECTING ", net; accept; } honor_graceful_shutdown();