From 66a2f2075becdf83bc69e22890971553ada614a5 Mon Sep 17 00:00:00 2001 From: mc36 Date: Thu, 2 Jan 2025 14:15:13 +0100 Subject: [PATCH] automatic commit at releng box qc pass: interop1: bgp vpnv4 over srv6 qc pass: interop1: bgp vpnv6 over srv6 --- changelog.txt | 3 +++ src/org/freertr/rtr/rtrBgpSpeak.java | 2 +- src/rtr.csv | 4 +++- src/rtr.ftr | 2 ++ src/rtr.html | 4 +++- src/rtr8.csv | 2 +- src/rtr8.html | 2 +- 7 files changed, 14 insertions(+), 5 deletions(-) diff --git a/changelog.txt b/changelog.txt index 3ae6ab7a41..6c9b10e80b 100644 --- a/changelog.txt +++ b/changelog.txt @@ -16396,3 +16396,6 @@ qc pass: p4lang: vpls/ldp over backplane qc pass: p4lang: evpn/cmac over backplane qc pass: p4lang: routed vpls/ldp over backplane qc pass: p4lang: routed evpn/cmac over backplane +---------------------------------- 2025-01-02 12:11:48 25.1.2 +qc pass: interop1: bgp vpnv4 over srv6 +qc pass: interop1: bgp vpnv6 over srv6 diff --git a/src/org/freertr/rtr/rtrBgpSpeak.java b/src/org/freertr/rtr/rtrBgpSpeak.java index a0ac8ec26f..372a28f092 100644 --- a/src/org/freertr/rtr/rtrBgpSpeak.java +++ b/src/org/freertr/rtr/rtrBgpSpeak.java @@ -2838,7 +2838,7 @@ private void addAttribedTab(List> currAdd, int safi, tabRo int i = attr.best.labelRem.get(0) >>> 4; i &= (1 << attr.best.segrouSiz) - 1; bits.msbPutD(adr6.getBytes(), addrIPv6.size - 4, i); - adr6.setShl(adr6, attr.best.segrouOfs + attr.best.segrouSiz); + adr6.setShl(adr6, 128 - attr.best.segrouOfs - attr.best.segrouSiz); adr6.setOr(attr.best.segrouPrf, adr6); attr.best.segrouPrf.fromIPv6addr(adr6); } diff --git a/src/rtr.csv b/src/rtr.csv index b6992fccf7..7a093b8efe 100644 --- a/src/rtr.csv +++ b/src/rtr.csv @@ -1,6 +1,6 @@ url;file;result;test -;-;-;freeRouter v25.1.2-cur, done by sprscc13@mrn0b0dy. --;-;-;2025-01-02 11:29:29, took 00:14:28, with 50 workers, on 3602 cases, 0 failed, 0 traces, 0 retries +-;-;-;2025-01-02 12:26:47, took 00:14:59, with 50 workers, on 3604 cases, 0 failed, 0 traces, 5 retries -;-;-;./rtr.bin http://sources.freertr.org/cfg/basic01.tst;basic01.tst;success;dummy test http://sources.freertr.org/cfg/basic02.tst;basic02.tst;success;interface with slot @@ -934,6 +934,8 @@ http://sources.freertr.org/cfg/intop1-bgp20.tst;intop1-bgp20.tst;success;interop http://sources.freertr.org/cfg/intop1-bgp21.tst;intop1-bgp21.tst;success;interop1: bgp large community http://sources.freertr.org/cfg/intop1-bgp22.tst;intop1-bgp22.tst;success;interop1: vpls/ldp cw over bgp http://sources.freertr.org/cfg/intop1-bgp23.tst;intop1-bgp23.tst;success;interop1: bgp ao authentication +http://sources.freertr.org/cfg/intop1-bgp24.tst;intop1-bgp24.tst;success;interop1: bgp vpnv4 over srv6 +http://sources.freertr.org/cfg/intop1-bgp25.tst;intop1-bgp25.tst;success;interop1: bgp vpnv6 over srv6 http://sources.freertr.org/cfg/intop1-dhcp01.tst;intop1-dhcp01.tst;success;interop1: dhcp server http://sources.freertr.org/cfg/intop1-dhcp02.tst;intop1-dhcp02.tst;success;interop1: dhcp client http://sources.freertr.org/cfg/intop1-dns.tst;intop1-dns.tst;success;interop1: dns diff --git a/src/rtr.ftr b/src/rtr.ftr index 0bbf550735..6a596462b7 100644 --- a/src/rtr.ftr +++ b/src/rtr.ftr @@ -930,6 +930,8 @@ qc pass: interop1: bgp with php labels qc pass: interop1: bgp large community qc pass: interop1: vpls/ldp cw over bgp qc pass: interop1: bgp ao authentication +qc pass: interop1: bgp vpnv4 over srv6 +qc pass: interop1: bgp vpnv6 over srv6 qc pass: interop1: dhcp server qc pass: interop1: dhcp client qc pass: interop1: dns diff --git a/src/rtr.html b/src/rtr.html index 70e149a544..f84b8e4303 100644 --- a/src/rtr.html +++ b/src/rtr.html @@ -10,7 +10,7 @@ tester release: freeRouter v25.1.2-cur, done by sprscc13@mrn0b0dy.
-tested: 2025-01-02 11:29:29, took 00:14:28, with 50 workers, on 3602 cases, 0 failed, 0 traces, 0 retries
+tested: 2025-01-02 12:26:47, took 00:14:59, with 50 workers, on 3604 cases, 0 failed, 0 traces, 5 retries
jvm: ./rtr.bin

@@ -946,6 +946,8 @@ + + diff --git a/src/rtr8.csv b/src/rtr8.csv index 86985a6bca..0d79709604 100644 --- a/src/rtr8.csv +++ b/src/rtr8.csv @@ -1,6 +1,6 @@ url;file;result;test -;-;-;freeRouter v25.1.2-cur, done by sprscc13@mrn0b0dy. --;-;-;2025-01-02 11:40:50, took 00:11:00, with 50 workers, on 674 cases, 0 failed, 0 traces, 0 retries +-;-;-;2025-01-02 12:40:06, took 00:12:57, with 50 workers, on 674 cases, 0 failed, 0 traces, 0 retries -;-;-;./rtr.bin http://sources.freertr.org/cfg/p4lang-acl001.tst;p4lang-acl001.tst;success;p4lang: copp http://sources.freertr.org/cfg/p4lang-acl002.tst;p4lang-acl002.tst;success;p4lang: ingress access list diff --git a/src/rtr8.html b/src/rtr8.html index f407f69311..c8ff8fdf1b 100644 --- a/src/rtr8.html +++ b/src/rtr8.html @@ -10,7 +10,7 @@ tester release: freeRouter v25.1.2-cur, done by sprscc13@mrn0b0dy.
-tested: 2025-01-02 11:40:50, took 00:11:00, with 50 workers, on 674 cases, 0 failed, 0 traces, 0 retries
+tested: 2025-01-02 12:40:06, took 00:12:57, with 50 workers, on 674 cases, 0 failed, 0 traces, 0 retries
jvm: ./rtr.bin

fileresulttest
intop1-bgp21.tstsuccessinterop1: bgp large community
intop1-bgp22.tstsuccessinterop1: vpls/ldp cw over bgp
intop1-bgp23.tstsuccessinterop1: bgp ao authentication
intop1-bgp24.tstsuccessinterop1: bgp vpnv4 over srv6
intop1-bgp25.tstsuccessinterop1: bgp vpnv6 over srv6
intop1-dhcp01.tstsuccessinterop1: dhcp server
intop1-dhcp02.tstsuccessinterop1: dhcp client
intop1-dns.tstsuccessinterop1: dns
fileresulttest