automatic commit at releng box

mc36 · Dec 26, 2024 · f615b32 · f615b32
1 parent b52ea97
commit f615b32
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/src/org/freertr/serv/servP4langConn.java b/src/org/freertr/serv/servP4langConn.java
@@ -1481,10 +1481,10 @@ private String doNsh3(tabNshEntry ntry, String act) {
                 }
                 return "nshnei_" + act + " " + ntry.sp + " " + ntry.si + " " + hop.id + " " + ntry.sp + " " + ntry.si;
             }
-            if (ifc.viaN == null) {
-                return "nshifc_" + act + " " + ntry.sp + " " + ntry.si + " " + ifc.id + " " + ifc.getMac().toEmuStr() + " " + ntry.target.toEmuStr() + " " + ntry.trgSp + " " + ntry.trgSi;
+            if (ifc.viaN != null) {
+                return "nshnei_" + act + " " + ntry.sp + " " + ntry.si + " " + ifc.viaN.id + " " + ntry.trgSp + " " + ntry.trgSi;
             }
-            return "nshnei_" + act + " " + ntry.sp + " " + ntry.si + " " + ifc.viaN.id + " " + ntry.trgSp + " " + ntry.trgSi;
+            return "nshifc_" + act + " " + ntry.sp + " " + ntry.si + " " + ifc.id + " " + ifc.getMac().toEmuStr() + " " + ntry.target.toEmuStr() + " " + ntry.trgSp + " " + ntry.trgSi;
         }
         if (ntry.route4 != null) {
             servP4langVrf vrf = lower.findVrf(ntry.route4);

diff --git a/src/rtr.csv b/src/rtr.csv
@@ -1,6 +1,6 @@
 url;file;result;test
 -;-;-;freeRouter v24.12.26-cur, done by sprscc13@mrn0b0dy.
--;-;-;2024-12-26 15:06:42, took 00:16:21, with 50 workers, on 3602 cases, 0 failed, 0 traces, 2 retries
+-;-;-;2024-12-26 15:34:42, took 00:15:32, with 50 workers, on 3602 cases, 0 failed, 0 traces, 2 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 v24.12.26-cur, done by sprscc13@mrn0b0dy.<br/>
-tested: 2024-12-26 15:06:42, took 00:16:21, with 50 workers, on 3602 cases, 0 failed, 0 traces, 2 retries<br/>
+tested: 2024-12-26 15:34:42, took 00:15:32, with 50 workers, on 3602 cases, 0 failed, 0 traces, 2 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 v24.12.26-cur, done by sprscc13@mrn0b0dy.
--;-;-;2024-12-26 15:17:27, took 00:10:23, with 50 workers, on 674 cases, 0 failed, 0 traces, 0 retries
+-;-;-;2024-12-26 15:45:34, took 00:10:30, 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 v24.12.26-cur, done by sprscc13@mrn0b0dy.<br/>
-tested: 2024-12-26 15:17:27, took 00:10:23, with 50 workers, on 674 cases, 0 failed, 0 traces, 0 retries<br/>
+tested: 2024-12-26 15:45:34, took 00:10:30, 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>