From 9f0413ab3096e36415ba453615d677b5f1623e91 Mon Sep 17 00:00:00 2001 From: mc36 Date: Fri, 3 Jan 2025 09:20:17 +0100 Subject: [PATCH] automatic commit at releng box --- src/org/freertr/tab/tabRoute.java | 2 +- src/org/freertr/tab/tabRouteAttr.java | 2 +- src/org/freertr/tab/tabRouteEntry.java | 2 +- src/org/freertr/user/userExec.java | 2 ++ src/org/freertr/user/userShow.java | 8 ++++++++ src/rtr.csv | 2 +- src/rtr.html | 2 +- src/rtr8.csv | 2 +- src/rtr8.html | 2 +- 9 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/org/freertr/tab/tabRoute.java b/src/org/freertr/tab/tabRoute.java index 61266607be..a10095c5b0 100644 --- a/src/org/freertr/tab/tabRoute.java +++ b/src/org/freertr/tab/tabRoute.java @@ -1159,7 +1159,7 @@ public final static userFormat convertTableHead(int typ) { case 6: return new userFormat("|", "prefix|pack|byte|pack|byte|time", "1|2transmit|2receive|1"); case 7: - return new userFormat("|", "prefix|index|base|oldbase"); + return new userFormat("|", "prefix|index|base|oldbase|srv6"); case 8: return new userFormat("|", "prefix|index|subdom|base|oldbase|size"); case 2002: diff --git a/src/org/freertr/tab/tabRouteAttr.java b/src/org/freertr/tab/tabRouteAttr.java index 4d1ea28310..dd6e441683 100644 --- a/src/org/freertr/tab/tabRouteAttr.java +++ b/src/org/freertr/tab/tabRouteAttr.java @@ -1989,7 +1989,7 @@ public void fullDump(userFormat lst, String beg) { * @return converted */ public String toShSrRoute() { - return segrouIdx + "|" + segrouBeg + "|" + segrouOld; + return segrouIdx + "|" + segrouBeg + "|" + segrouOld + "|" + segrouPrf; } /** diff --git a/src/org/freertr/tab/tabRouteEntry.java b/src/org/freertr/tab/tabRouteEntry.java index c8b6ef28ad..53038898dc 100644 --- a/src/org/freertr/tab/tabRouteEntry.java +++ b/src/org/freertr/tab/tabRouteEntry.java @@ -318,7 +318,7 @@ public static void toShSrRoute(userFormat l, tabRouteEntry prf) { String a = addrPrefix.ip2str(prf.prefix); for (int i = 0; i < prf.alts.size(); i++) { tabRouteAttr attr = prf.alts.get(i); - if (attr.segrouIdx < 1) { + if ((attr.segrouIdx < 1) && (attr.segrouPrf == null)) { continue; } l.add(a + "|" + attr.toShSrRoute()); diff --git a/src/org/freertr/user/userExec.java b/src/org/freertr/user/userExec.java index ef59417fc5..6695afacea 100644 --- a/src/org/freertr/user/userExec.java +++ b/src/org/freertr/user/userExec.java @@ -880,6 +880,8 @@ private static void getHelpShowIpX(userHelping hl) { hl.add(null, "9 10 update update prefixes before compare"); hl.add(null, "10 9,. name of route map"); hl.add(null, "6 . labels remote and local labels"); + hl.add(null, "6 . segrout segment routing information"); + hl.add(null, "6 . bier bier information"); hl.add(null, "6 . ecmp ecmp info"); getRouMapMtch(hl, 6); hl.add(null, "3 4 logger route logger"); diff --git a/src/org/freertr/user/userShow.java b/src/org/freertr/user/userShow.java index d195aba762..e36e5fc781 100644 --- a/src/org/freertr/user/userShow.java +++ b/src/org/freertr/user/userShow.java @@ -4795,6 +4795,14 @@ private void doShowIpXbgp(tabRouteAttr.routeType afi) { doShowRoutes(r.bgp.fwdCore, tab, dsp + 1000); return; } + if (a.equals("segrout")) { + doShowRoutes(r.bgp.fwdCore, tab, 7); + return; + } + if (a.equals("bier")) { + doShowRoutes(r.bgp.fwdCore, tab, 8); + return; + } if (a.equals("ecmp")) { doShowRoutes(r.bgp.fwdCore, tab, dsp + 2000); return; diff --git a/src/rtr.csv b/src/rtr.csv index df3bad4cdd..af291ef70c 100644 --- a/src/rtr.csv +++ b/src/rtr.csv @@ -1,6 +1,6 @@ url;file;result;test -;-;-;freeRouter v25.1.3-cur, done by sprscc13@mrn0b0dy. --;-;-;2025-01-03 07:01:56, took 00:14:56, with 50 workers, on 3604 cases, 0 failed, 0 traces, 1 retries +-;-;-;2025-01-03 07:41:04, took 00:15:13, with 50 workers, on 3604 cases, 0 failed, 0 traces, 0 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 diff --git a/src/rtr.html b/src/rtr.html index bd36c000e9..de6b919454 100644 --- a/src/rtr.html +++ b/src/rtr.html @@ -10,7 +10,7 @@ tester release: freeRouter v25.1.3-cur, done by sprscc13@mrn0b0dy.
-tested: 2025-01-03 07:01:56, took 00:14:56, with 50 workers, on 3604 cases, 0 failed, 0 traces, 1 retries
+tested: 2025-01-03 07:41:04, took 00:15:13, with 50 workers, on 3604 cases, 0 failed, 0 traces, 0 retries
jvm: ./rtr.bin

diff --git a/src/rtr8.csv b/src/rtr8.csv index d53b57f1e3..fc9d30db29 100644 --- a/src/rtr8.csv +++ b/src/rtr8.csv @@ -1,6 +1,6 @@ url;file;result;test -;-;-;freeRouter v25.1.3-cur, done by sprscc13@mrn0b0dy. --;-;-;2025-01-03 07:14:34, took 00:12:16, with 50 workers, on 674 cases, 0 failed, 0 traces, 0 retries +-;-;-;2025-01-03 07:53:26, took 00:12:00, 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 cad18ff3a7..63f4f348f0 100644 --- a/src/rtr8.html +++ b/src/rtr8.html @@ -10,7 +10,7 @@ tester release: freeRouter v25.1.3-cur, done by sprscc13@mrn0b0dy.
-tested: 2025-01-03 07:14:34, took 00:12:16, with 50 workers, on 674 cases, 0 failed, 0 traces, 0 retries
+tested: 2025-01-03 07:53:26, took 00:12:00, with 50 workers, on 674 cases, 0 failed, 0 traces, 0 retries
jvm: ./rtr.bin

fileresulttest
fileresulttest