From c93c94e90c000c5ad2d3dfb1169293b27c329a60 Mon Sep 17 00:00:00 2001 From: mc36 Date: Sat, 28 Dec 2024 01:32:43 +0100 Subject: [PATCH] automatic commit at releng box --- src/org/freertr/prt/prtGen.java | 7 ++++++ src/org/freertr/serv/servP4langConn.java | 7 ++++++ src/org/freertr/serv/servP4langUtil.java | 28 ++++++++++++++++++++++++ src/rtr.csv | 2 +- src/rtr.html | 2 +- src/rtr8.csv | 2 +- src/rtr8.html | 2 +- 7 files changed, 46 insertions(+), 4 deletions(-) diff --git a/src/org/freertr/prt/prtGen.java b/src/org/freertr/prt/prtGen.java index 5ecec748bc..196363e55f 100644 --- a/src/org/freertr/prt/prtGen.java +++ b/src/org/freertr/prt/prtGen.java @@ -581,7 +581,14 @@ public void counterUpdate(ipFwdIface ifc, addrIP adr, int rem, int loc, counter if (ntry == null) { return; } + counter old = ntry.hwCntr; ntry.hwCntr = cntr; + if (old == null) { + return; + } + if (old.compareTo(ntry.hwCntr) == 0) { + return; + } ntry.lastActivity = bits.getTime(); } diff --git a/src/org/freertr/serv/servP4langConn.java b/src/org/freertr/serv/servP4langConn.java index ba50746120..86f4000416 100644 --- a/src/org/freertr/serv/servP4langConn.java +++ b/src/org/freertr/serv/servP4langConn.java @@ -481,11 +481,18 @@ private boolean doReports() { } continue; } + counter old = ntry.hwCntr; ntry.hwCntr = new counter(); ntry.hwCntr.packRx = bits.str2long(cmd.word()); ntry.hwCntr.byteRx = bits.str2long(cmd.word()); ntry.hwCntr.packTx = bits.str2long(cmd.word()); ntry.hwCntr.byteTx = bits.str2long(cmd.word()); + if (old == null) { + continue; + } + if (old.compareTo(ntry.hwCntr) == 0) { + continue; + } ntry.time = bits.getTime(); continue; } diff --git a/src/org/freertr/serv/servP4langUtil.java b/src/org/freertr/serv/servP4langUtil.java index 833f4e31ec..97e69250ec 100644 --- a/src/org/freertr/serv/servP4langUtil.java +++ b/src/org/freertr/serv/servP4langUtil.java @@ -187,9 +187,16 @@ protected final static void updateNatTrans(cmds cmd, ipFwd fwd) { } return; } + counter old = ntry.hwCntr; ntry.hwCntr = new counter(); ntry.hwCntr.packRx = bits.str2long(cmd.word()); ntry.hwCntr.byteRx = bits.str2long(cmd.word()); + if (old == null) { + return; + } + if (old.compareTo(ntry.hwCntr) == 0) { + return; + } ntry.lastUsed = bits.getTime(); ntry.reverse.lastUsed = ntry.lastUsed; } @@ -227,11 +234,18 @@ protected final static void updateInsp(cmds cmd, tabSession insp) { } } ntry = res; + counter old = ntry.hwCntr; ntry.hwCntr = new counter(); ntry.hwCntr.packRx = bits.str2long(cmd.word()); ntry.hwCntr.byteRx = bits.str2long(cmd.word()); ntry.hwCntr.packTx = bits.str2long(cmd.word()); ntry.hwCntr.byteTx = bits.str2long(cmd.word()); + if (old == null) { + return; + } + if (old.compareTo(ntry.hwCntr) == 0) { + return; + } ntry.lastTime = bits.getTime(); } @@ -313,9 +327,16 @@ protected final static void updatePbr(cmds cmd, tabListing pbr) if (ntry.rolledFrom != null) { ntry = ntry.rolledFrom; } + counter old = ntry.hwCntr; ntry.hwCntr = new counter(); ntry.hwCntr.packRx = bits.str2long(cmd.word()); ntry.hwCntr.byteRx = bits.str2long(cmd.word()); + if (old == null) { + return; + } + if (old.compareTo(ntry.hwCntr) == 0) { + return; + } ntry.lastMatch = bits.getTime(); } @@ -336,9 +357,16 @@ protected final static void updateAcl(cmds cmd, tabListing, if (ntry.rolledFrom != null) { ntry = ntry.rolledFrom; } + counter old = ntry.hwCntr; ntry.hwCntr = new counter(); ntry.hwCntr.packRx = bits.str2long(cmd.word()); ntry.hwCntr.byteRx = bits.str2long(cmd.word()); + if (old == null) { + return; + } + if (old.compareTo(ntry.hwCntr) == 0) { + return; + } ntry.lastMatch = bits.getTime(); } diff --git a/src/rtr.csv b/src/rtr.csv index 90f1414cf4..0c81dd86c5 100644 --- a/src/rtr.csv +++ b/src/rtr.csv @@ -1,6 +1,6 @@ url;file;result;test -;-;-;freeRouter v24.12.27-cur, done by sprscc13@mrn0b0dy. --;-;-;2024-12-27 22:42:55, took 00:15:04, with 50 workers, on 3602 cases, 0 failed, 0 traces, 4 retries +-;-;-;2024-12-27 23:13:44, took 00:14:43, with 50 workers, on 3602 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 516e436bd8..cbc2a563d4 100644 --- a/src/rtr.html +++ b/src/rtr.html @@ -10,7 +10,7 @@ tester release: freeRouter v24.12.27-cur, done by sprscc13@mrn0b0dy.
-tested: 2024-12-27 22:42:55, took 00:15:04, with 50 workers, on 3602 cases, 0 failed, 0 traces, 4 retries
+tested: 2024-12-27 23:13:44, took 00:14:43, with 50 workers, on 3602 cases, 0 failed, 0 traces, 0 retries
jvm: ./rtr.bin

diff --git a/src/rtr8.csv b/src/rtr8.csv index ebd6d91282..b8d108efc0 100644 --- a/src/rtr8.csv +++ b/src/rtr8.csv @@ -1,6 +1,6 @@ url;file;result;test -;-;-;freeRouter v24.12.27-cur, done by sprscc13@mrn0b0dy. --;-;-;2024-12-27 22:56:09, took 00:12:52, with 50 workers, on 674 cases, 0 failed, 0 traces, 1 retries +-;-;-;2024-12-27 23:26:31, took 00:12:25, with 50 workers, on 674 cases, 0 failed, 0 traces, 3 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 c52b5619fd..f798c6a393 100644 --- a/src/rtr8.html +++ b/src/rtr8.html @@ -10,7 +10,7 @@ tester release: freeRouter v24.12.27-cur, done by sprscc13@mrn0b0dy.
-tested: 2024-12-27 22:56:09, took 00:12:52, with 50 workers, on 674 cases, 0 failed, 0 traces, 1 retries
+tested: 2024-12-27 23:26:31, took 00:12:25, with 50 workers, on 674 cases, 0 failed, 0 traces, 3 retries
jvm: ./rtr.bin

fileresulttest
fileresulttest