diff --git a/src/org/freertr/prt/prtGen.java b/src/org/freertr/prt/prtGen.java index ae1803f32b..5ecec748bc 100644 --- a/src/org/freertr/prt/prtGen.java +++ b/src/org/freertr/prt/prtGen.java @@ -581,14 +581,7 @@ 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) { - old = new counter(); - } - 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 370b2386fb..ba50746120 100644 --- a/src/org/freertr/serv/servP4langConn.java +++ b/src/org/freertr/serv/servP4langConn.java @@ -481,19 +481,11 @@ 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) { - ntry.hwCntr = old; - continue; - } ntry.time = bits.getTime(); continue; } diff --git a/src/org/freertr/serv/servP4langUtil.java b/src/org/freertr/serv/servP4langUtil.java index c2aa0c75b7..833f4e31ec 100644 --- a/src/org/freertr/serv/servP4langUtil.java +++ b/src/org/freertr/serv/servP4langUtil.java @@ -187,17 +187,9 @@ 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) { - old = new counter(); - } - if (old.compareTo(ntry.hwCntr) >= 0) { - ntry.hwCntr = old; - return; - } ntry.lastUsed = bits.getTime(); ntry.reverse.lastUsed = ntry.lastUsed; } @@ -235,19 +227,11 @@ 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) { - old = new counter(); - } - if (old.compareTo(ntry.hwCntr) >= 0) { - ntry.hwCntr = old; - return; - } ntry.lastTime = bits.getTime(); } @@ -329,17 +313,9 @@ 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) { - old = new counter(); - } - if (old.compareTo(ntry.hwCntr) >= 0) { - ntry.hwCntr = old; - return; - } ntry.lastMatch = bits.getTime(); } @@ -360,17 +336,9 @@ 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) { - old = new counter(); - } - if (old.compareTo(ntry.hwCntr) >= 0) { - ntry.hwCntr = old; - return; - } ntry.lastMatch = bits.getTime(); } diff --git a/src/rtr.csv b/src/rtr.csv index 6224ea5007..8013796318 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 19:19:21, took 00:14:30, with 50 workers, on 3602 cases, 0 failed, 0 traces, 2 retries +-;-;-;2024-12-27 20:04:15, took 00:15:05, with 50 workers, on 3602 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 index 22ae1b4b78..d86b17a728 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 19:19:21, took 00:14:30, with 50 workers, on 3602 cases, 0 failed, 0 traces, 2 retries
+tested: 2024-12-27 20:04:15, took 00:15:05, with 50 workers, on 3602 cases, 0 failed, 0 traces, 3 retries
jvm: ./rtr.bin

diff --git a/src/rtr8.csv b/src/rtr8.csv index c5d3ed1f67..0d75b7d312 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 19:30:09, took 00:10:27, with 50 workers, on 674 cases, 0 failed, 0 traces, 0 retries +-;-;-;2024-12-27 20:16:51, took 00:12:14, 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 9e4bd20692..2a91bc7d1c 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 19:30:09, took 00:10:27, with 50 workers, on 674 cases, 0 failed, 0 traces, 0 retries
+tested: 2024-12-27 20:16:51, took 00:12:14, with 50 workers, on 674 cases, 0 failed, 0 traces, 0 retries
jvm: ./rtr.bin

fileresulttest
fileresulttest