mirror of
https://github.com/NoCheatPlus/NoCheatPlus.git
synced 2024-11-06 18:50:54 +01:00
Indentation.
This commit is contained in:
asofold
parent
24120f306a
commit
eb8cba597f
@ -13,39 +13,42 @@ import fr.neatmonster.nocheatplus.utilities.TickTask;
|
||||
*
|
||||
*/
|
||||
public class NetStatic {
|
||||
|
||||
/**
|
||||
* Packet-cheating check, for catching clients that send more packets than
|
||||
* allowed. Intention is to have a more accurate check than just preventing
|
||||
* "extreme spamming".
|
||||
*
|
||||
* @param packetFreq
|
||||
* Records the packets. This check will update packetFreq
|
||||
* according to the given time and packets.
|
||||
* @param time
|
||||
* Milliseconds time to update the ActionFrequency instance with.
|
||||
* @param packets
|
||||
* Amount to add to packetFreq with time.
|
||||
* @param maxPackets
|
||||
* The amount of packets per second (!), that is considered
|
||||
* legitimate.
|
||||
* @param idealPackets
|
||||
* The "ideal" amount of packets per second. Used for "burning"
|
||||
* time frames by setting them to this amount.
|
||||
* @param burstFreq Counting burst events, should be covering a minute or so.
|
||||
* @param burstPackets Packets in the first time window to add to burst count.
|
||||
* @param burstEPM Events per minute to trigger a burst violation.
|
||||
* @param tags List to add tags to, for which parts of this check triggered a violation.
|
||||
* @return The violation amount, i.e. "count above limit", 0.0 if no violation.
|
||||
*/
|
||||
public static double morePacketsCheck(final ActionFrequency packetFreq, final long time, final float packets, final float maxPackets, final float idealPackets, final ActionFrequency burstFreq, final float burstPackets, final double burstDirect, final double burstEPM, final List<String> tags) {
|
||||
// Pull down stuff.
|
||||
final long winDur = packetFreq.bucketDuration();
|
||||
final int winNum = packetFreq.numberOfBuckets();
|
||||
// Add packet to frequency count.
|
||||
|
||||
/**
|
||||
* Packet-cheating check, for catching clients that send more packets than
|
||||
* allowed. Intention is to have a more accurate check than just preventing
|
||||
* "extreme spamming".
|
||||
*
|
||||
* @param packetFreq
|
||||
* Records the packets. This check will update packetFreq
|
||||
* according to the given time and packets.
|
||||
* @param time
|
||||
* Milliseconds time to update the ActionFrequency instance with.
|
||||
* @param packets
|
||||
* Amount to add to packetFreq with time.
|
||||
* @param maxPackets
|
||||
* The amount of packets per second (!), that is considered
|
||||
* legitimate.
|
||||
* @param idealPackets
|
||||
* The "ideal" amount of packets per second. Used for "burning"
|
||||
* time frames by setting them to this amount.
|
||||
* @param burstFreq Counting burst events, should be covering a minute or so.
|
||||
* @param burstPackets Packets in the first time window to add to burst count.
|
||||
* @param burstEPM Events per minute to trigger a burst violation.
|
||||
* @param tags List to add tags to, for which parts of this check triggered a violation.
|
||||
* @return The violation amount, i.e. "count above limit", 0.0 if no violation.
|
||||
*/
|
||||
public static double morePacketsCheck(final ActionFrequency packetFreq, final long time, final float packets, final float maxPackets, final float idealPackets, final ActionFrequency burstFreq, final float burstPackets, final double burstDirect, final double burstEPM, final List<String> tags) {
|
||||
// Pull down stuff.
|
||||
final long winDur = packetFreq.bucketDuration();
|
||||
final int winNum = packetFreq.numberOfBuckets();
|
||||
|
||||
// TODO: "Relax" bursts from i = 1 on, i.e. distribute to following intervals (if zero ~ ?or lower).
|
||||
// [relax based on checking, not updating first (!).]
|
||||
|
||||
// Add packet to frequency count.
|
||||
packetFreq.add(time, packets);
|
||||
// TODO: Add a per-bucket violation AF (once first bucket > thresh => pbvAF.add(now, 1f) + if total score > xyz => extra violation).
|
||||
|
||||
|
||||
// Fill up all "used" time windows (minimum we can do without other events).
|
||||
final float burnScore = (float) idealPackets * (float) winDur / 1000f;
|
||||
// Find index.
|
||||
@ -53,69 +56,69 @@ public class NetStatic {
|
||||
int empty = 0;
|
||||
boolean used = false;
|
||||
for (burnStart = 1; burnStart < winNum; burnStart ++) {
|
||||
if (packetFreq.bucketScore(burnStart) > 0f) {
|
||||
// TODO: burnStart ++; Fill up all ? ~ e.g. what with filled up half?
|
||||
if (used) {
|
||||
for (int j = burnStart; j < winNum; j ++) {
|
||||
if (packetFreq.bucketScore(j) == 0f) {
|
||||
empty += 1;
|
||||
}
|
||||
}
|
||||
break;
|
||||
} else {
|
||||
used = true;
|
||||
}
|
||||
}
|
||||
if (packetFreq.bucketScore(burnStart) > 0f) {
|
||||
// TODO: burnStart ++; Fill up all ? ~ e.g. what with filled up half?
|
||||
if (used) {
|
||||
for (int j = burnStart; j < winNum; j ++) {
|
||||
if (packetFreq.bucketScore(j) == 0f) {
|
||||
empty += 1;
|
||||
}
|
||||
}
|
||||
break;
|
||||
} else {
|
||||
used = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// TODO: Burn time windows based on other activity counting [e.g. same resolution ActinFrequency with keep-alive].
|
||||
|
||||
|
||||
// Adjust empty based on server side lag, this makes the check more strict.
|
||||
if (empty > 0) {
|
||||
// TODO: Consider to add a config flag for skipping the lag adaption (e.g. strict).
|
||||
final float lag = TickTask.getLag(winDur * winNum, true);
|
||||
// TODO: Consider increasing the allowed maximum, for extreme server-side lag.
|
||||
final float lag = TickTask.getLag(winDur * winNum, true);
|
||||
// TODO: Consider increasing the allowed maximum, for extreme server-side lag.
|
||||
empty = Math.min(empty, (int) Math.round((lag - 1f) * winNum));
|
||||
}
|
||||
|
||||
|
||||
final double fullCount;
|
||||
if (burnStart < winNum) {
|
||||
// Assume all following time windows are burnt.
|
||||
// TODO: empty score + trailing score !? max with trailing buckets * ideal (!)
|
||||
final float trailing = Math.max(packetFreq.trailingScore(burnStart, 1f), burnScore * (winNum - burnStart - empty));
|
||||
final float leading = packetFreq.leadingScore(burnStart, 1f);
|
||||
fullCount = leading + trailing;
|
||||
// Assume all following time windows are burnt.
|
||||
// TODO: empty score + trailing score !? max with trailing buckets * ideal (!)
|
||||
final float trailing = Math.max(packetFreq.trailingScore(burnStart, 1f), burnScore * (winNum - burnStart - empty));
|
||||
final float leading = packetFreq.leadingScore(burnStart, 1f);
|
||||
fullCount = leading + trailing;
|
||||
} else {
|
||||
// All time windows are used.
|
||||
fullCount = packetFreq.score(1f);
|
||||
// All time windows are used.
|
||||
fullCount = packetFreq.score(1f);
|
||||
}
|
||||
|
||||
|
||||
double violation = 0.0; // Classic processing.
|
||||
final double vEPSAcc = (double) fullCount - (double) (maxPackets * winNum * winDur / 1000f);
|
||||
if (vEPSAcc > 0.0) {
|
||||
violation = Math.max(violation, vEPSAcc);
|
||||
tags.add("epsacc");
|
||||
violation = Math.max(violation, vEPSAcc);
|
||||
tags.add("epsacc");
|
||||
}
|
||||
float burst = packetFreq.bucketScore(0);
|
||||
if (burst > burstPackets) {
|
||||
// Account for server-side lag "minimally".
|
||||
burst /= TickTask.getLag(winDur, true);
|
||||
if (burst > burstPackets) {
|
||||
final double vBurstDirect = burst - burstDirect;
|
||||
if (vBurstDirect > 0.0) {
|
||||
violation = Math.max(violation, vBurstDirect);
|
||||
tags.add("burstdirect");
|
||||
}
|
||||
// TODO: Lag adaption for the burstFreq too [differing window durations]?
|
||||
burstFreq.add(time, 1f); // TODO: Remove float packets or do this properly.
|
||||
final double vBurstEPM = (double) burstFreq.score(0f) - burstEPM * (double) (burstFreq.bucketDuration() * burstFreq.numberOfBuckets()) / 60000.0;
|
||||
if (vBurstEPM > 0.0) {
|
||||
violation = Math.max(violation, vBurstEPM);
|
||||
tags.add("burstepm");
|
||||
}
|
||||
}
|
||||
// Account for server-side lag "minimally".
|
||||
burst /= TickTask.getLag(winDur, true);
|
||||
if (burst > burstPackets) {
|
||||
final double vBurstDirect = burst - burstDirect;
|
||||
if (vBurstDirect > 0.0) {
|
||||
violation = Math.max(violation, vBurstDirect);
|
||||
tags.add("burstdirect");
|
||||
}
|
||||
// TODO: Lag adaption for the burstFreq too [differing window durations]?
|
||||
burstFreq.add(time, 1f); // TODO: Remove float packets or do this properly.
|
||||
final double vBurstEPM = (double) burstFreq.score(0f) - burstEPM * (double) (burstFreq.bucketDuration() * burstFreq.numberOfBuckets()) / 60000.0;
|
||||
if (vBurstEPM > 0.0) {
|
||||
violation = Math.max(violation, vBurstEPM);
|
||||
tags.add("burstepm");
|
||||
}
|
||||
}
|
||||
}
|
||||
return Math.max(0.0, violation);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user