automatic commit at releng box

mc36 · Jan 3, 2025 · 9f0413a · 9f0413a
1 parent f75fb70
commit 9f0413a
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 7 deletions.
diff --git 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
@@ -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
@@ -318,7 +318,7 @@ public static void toShSrRoute(userFormat l, tabRouteEntry<addrIP> prf) {
         String a = addrPrefix.ip2str(prf.prefix);
         for (int i = 0; i < prf.alts.size(); i++) {
             tabRouteAttr<addrIP> 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
@@ -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:rm>  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
@@ -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
@@ -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
@@ -10,7 +10,7 @@
 </style>
 <title>tester</title></head><body>
 release: freeRouter v25.1.3-cur, done by sprscc13@mrn0b0dy.<br/>
-tested: 2025-01-03 07:01:56, took 00:14:56, with 50 workers, on 3604 cases, 0 failed, 0 traces, 1 retries<br/>
+tested: 2025-01-03 07:41:04, took 00:15:13, with 50 workers, on 3604 cases, 0 failed, 0 traces, 0 retries<br/>
 jvm: ./rtr.bin<br/>
 <br/>
 <table><thead><tr><td><b>file</b></td><td><b>result</b></td><td><b>test</b></td></tr></thead><tbody>

diff --git 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
@@ -10,7 +10,7 @@
 </style>
 <title>tester</title></head><body>
 release: freeRouter v25.1.3-cur, done by sprscc13@mrn0b0dy.<br/>
-tested: 2025-01-03 07:14:34, took 00:12:16, with 50 workers, on 674 cases, 0 failed, 0 traces, 0 retries<br/>
+tested: 2025-01-03 07:53:26, took 00:12:00, with 50 workers, on 674 cases, 0 failed, 0 traces, 0 retries<br/>
 jvm: ./rtr.bin<br/>
 <br/>
 <table><thead><tr><td><b>file</b></td><td><b>result</b></td><td><b>test</b></td></tr></thead><tbody>