automatic commit at releng box

mc36 · Feb 1, 2025 · 4f27c62 · 4f27c62
1 parent df941f4
commit 4f27c62
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 13 deletions.
diff --git a/cfg/p4lang-rout431.tst b/cfg/p4lang-rout431.tst
@@ -48,6 +48,7 @@ int sdn1
  exit
 int sdn2
  bridge-gr 1
+ bridge-static 0000.0000.4444
  exit
 int bvi1
  vrf for v1

diff --git a/cfg/p4lang-rout432.tst b/cfg/p4lang-rout432.tst
@@ -52,6 +52,7 @@ int sdn2
  exit
 int sdn2.222
  bridge-gr 1
+ bridge-static 0000.0000.4444
  exit
 int bvi1
  vrf for v1

diff --git a/src/org/freertr/serv/servP4langConn.java b/src/org/freertr/serv/servP4langConn.java
@@ -4295,7 +4295,7 @@ private boolean doMroutes(String afi, int vrf, tabLabelEntry lab, ipFwdMcast nee
             }
             now++;
             if (ifc.viaN != null) {
-                lower.sendLine("mneiroute" + afi + "_" + act + " " + vrf + " " + gid + " " + need.group + " " + need.source + " " + ingr.id + " " + ifc.viaN.getVia().id + " " + ifc.viaN.id + " " + ifc.id);
+                lower.sendLine("mneiroute" + afi + "_" + act + " " + vrf + " " + gid + " " + need.group + " " + need.source + " " + ingr.id + " " + ifc.viaN.getVia().getMcast(gid, null).id + " " + ifc.viaN.id + " " + ifc.id);
                 continue;
             }
             if (ntry.mcastAsBcast) {
@@ -4317,7 +4317,7 @@ private boolean doMroutes(String afi, int vrf, tabLabelEntry lab, ipFwdMcast nee
                 lower.sendLine("mroute" + afi + "_" + act + " " + vrf + " " + gid + " " + need.group + " " + need.source + " " + ingr.id + " " + ifc.getMcast(gid, null).id + " " + ifc.id + " " + ifc.getMac().toEmuStr() + " " + adrM.toEmuStr());
                 continue;
             }
-            lower.sendLine("mneiroute" + afi + "_" + act + " " + vrf + " " + gid + " " + need.group + " " + need.source + " " + ingr.id + " " + nei.getVia().id + " " + nei.id + " " + ifc.id);
+            lower.sendLine("mneiroute" + afi + "_" + act + " " + vrf + " " + gid + " " + need.group + " " + need.source + " " + ingr.id + " " + nei.getVia().getMcast(gid, null).id + " " + nei.id + " " + ifc.id);
         }
         if (bef) {
             act = "mod";

diff --git a/src/org/freertr/util/verCore.java b/src/org/freertr/util/verCore.java
@@ -38,12 +38,12 @@ private verCore() {
     /**
      * compile month
      */
-    public final static int month = 1;
+    public final static int month = 2;
 
     /**
      * compile day
      */
-    public final static int day = 31;
+    public final static int day = 1;
 
     /**
      * statement of release

diff --git a/src/rtr.csv b/src/rtr.csv
@@ -1,6 +1,6 @@
 url;file;result;test
 -;-;-;freeRouter v25.1.31-cur, done by sprscc13@mrn0b0dy.
--;-;-;2025-01-31 22:56:43, took 00:14:47, with 50 workers, on 3634 cases, 0 failed, 0 traces, 2 retries
+-;-;-;2025-01-31 23:37:43, took 00:16:00, with 50 workers, on 3634 cases, 0 failed, 0 traces, 3 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.31-cur, done by sprscc13@mrn0b0dy.<br/>
-tested: 2025-01-31 22:56:43, took 00:14:47, with 50 workers, on 3634 cases, 0 failed, 0 traces, 2 retries<br/>
+tested: 2025-01-31 23:37:43, took 00:16:00, with 50 workers, on 3634 cases, 0 failed, 0 traces, 3 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/rtr.txt b/src/rtr.txt
@@ -1 +1 @@
-25.1.31
+25.2.1
diff --git a/src/rtr2.csv b/src/rtr2.csv
@@ -1,6 +1,6 @@
 url;file;result;test
--;-;-;freeRouter v25.1.30-cur, done by sprscc13@mrn0b0dy.
--;-;-;2025-01-30 22:32:57, took 00:10:48, with 1 workers, on 9 cases, 0 failed, 0 traces, 0 retries
+-;-;-;freeRouter v25.1.31-cur, done by sprscc13@mrn0b0dy.
+-;-;-;2025-01-31 23:32:14, took 00:11:47, with 1 workers, on 9 cases, 0 failed, 0 traces, 0 retries
 -;-;-;java -Xmx256m -jar rtr.jar
 http://sources.freertr.org/cfg/opnflw-rout01.tst;opnflw-rout01.tst;success;openflow: software routing
 http://sources.freertr.org/cfg/opnflw-rout02.tst;opnflw-rout02.tst;success;openflow: bridging and routing

diff --git a/src/rtr2.html b/src/rtr2.html
@@ -9,8 +9,8 @@
 .bad { color: red }
 </style>
 <title>tester</title></head><body>
-release: freeRouter v25.1.30-cur, done by sprscc13@mrn0b0dy.<br/>
-tested: 2025-01-30 22:32:57, took 00:10:48, with 1 workers, on 9 cases, 0 failed, 0 traces, 0 retries<br/>
+release: freeRouter v25.1.31-cur, done by sprscc13@mrn0b0dy.<br/>
+tested: 2025-01-31 23:32:14, took 00:11:47, with 1 workers, on 9 cases, 0 failed, 0 traces, 0 retries<br/>
 jvm: java -Xmx256m -jar rtr.jar<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.31-cur, done by sprscc13@mrn0b0dy.
--;-;-;2025-01-31 23:10:50, took 00:13:37, with 50 workers, on 700 cases, 0 failed, 0 traces, 0 retries
+-;-;-;2025-01-31 23:49:44, took 00:11:32, with 50 workers, on 700 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.31-cur, done by sprscc13@mrn0b0dy.<br/>
-tested: 2025-01-31 23:10:50, took 00:13:37, with 50 workers, on 700 cases, 0 failed, 0 traces, 0 retries<br/>
+tested: 2025-01-31 23:49:44, took 00:11:32, with 50 workers, on 700 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>