From f615b3210bbe14840e06f35dab03964356a5909b Mon Sep 17 00:00:00 2001 From: mc36 Date: Thu, 26 Dec 2024 17:02:30 +0100 Subject: [PATCH] automatic commit at releng box --- src/org/freertr/serv/servP4langConn.java | 6 +++--- src/rtr.csv | 2 +- src/rtr.html | 2 +- src/rtr8.csv | 2 +- src/rtr8.html | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/org/freertr/serv/servP4langConn.java b/src/org/freertr/serv/servP4langConn.java index 80f3b3c958..825d3690e4 100644 --- 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 index d480841e54..7a70ba798c 100644 --- 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 index 46c9fdab7b..a3b4220336 100644 --- a/src/rtr.html +++ b/src/rtr.html @@ -10,7 +10,7 @@ tester release: freeRouter v24.12.26-cur, done by sprscc13@mrn0b0dy.
-tested: 2024-12-26 15:06:42, took 00:16:21, with 50 workers, on 3602 cases, 0 failed, 0 traces, 2 retries
+tested: 2024-12-26 15:34:42, took 00:15:32, with 50 workers, on 3602 cases, 0 failed, 0 traces, 2 retries
jvm: ./rtr.bin

diff --git a/src/rtr8.csv b/src/rtr8.csv index 7bb3d69ba0..9f634411c7 100644 --- 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 index 2fd0993596..61419643e0 100644 --- a/src/rtr8.html +++ b/src/rtr8.html @@ -10,7 +10,7 @@ tester release: freeRouter v24.12.26-cur, done by sprscc13@mrn0b0dy.
-tested: 2024-12-26 15:17:27, took 00:10:23, with 50 workers, on 674 cases, 0 failed, 0 traces, 0 retries
+tested: 2024-12-26 15:45:34, took 00:10:30, with 50 workers, on 674 cases, 0 failed, 0 traces, 0 retries
jvm: ./rtr.bin

fileresulttest
fileresulttest