summaryrefslogtreecommitdiff
path: root/src/main/java/com/it_jaros/jscanner/Scan.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/it_jaros/jscanner/Scan.java')
-rw-r--r--src/main/java/com/it_jaros/jscanner/Scan.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/com/it_jaros/jscanner/Scan.java b/src/main/java/com/it_jaros/jscanner/Scan.java
index 9b3bf5e..6800c5a 100644
--- a/src/main/java/com/it_jaros/jscanner/Scan.java
+++ b/src/main/java/com/it_jaros/jscanner/Scan.java
@@ -16,8 +16,7 @@ public class Scan {
private final String ports;
private final Runnable onDone;
private final Counter hostCounter;
- private final Counter hostTotalCounter;
- private final Counter portTotalCounter;
+ private final Counter portCounter;
private final Counter socketCounter;
private final Counter threadCounter;
private long start = 0;
@@ -32,8 +31,7 @@ public class Scan {
this.ports = ports;
this.onDone = onDone;
this.hostCounter = new Counter();
- this.hostTotalCounter = new Counter();
- this.portTotalCounter = new Counter();
+ this.portCounter = new Counter();
this.socketCounter = new Counter();
this.threadCounter = new Counter();
}
@@ -111,17 +109,17 @@ public class Scan {
}
public void portStart() {
- this.portTotalCounter.inc();
+ this.portCounter.inc();
this.threadCounter.inc();
}
public void portFinish() {
+ this.portCounter.dec();
this.threadCounter.dec();
}
public void hostStart() {
this.hostCounter.inc();
- this.hostTotalCounter.inc();
this.threadCounter.inc();
}
@@ -149,10 +147,11 @@ public class Scan {
public Statistics getStatistics() {
return new Statistics(
this.getDurationMillis(),
- this.hostTotalCounter.current(),
+ this.hostCounter.total(),
this.hostCounter.current(),
this.hostCounter.max(),
- this.portTotalCounter.current(),
+ this.portCounter.total(),
+ this.portCounter.current(),
this.threadCounter.current(),
this.threadCounter.max(),
this.socketCounter.current(),
@@ -166,6 +165,7 @@ public class Scan {
int hostCurrent,
int hostMaxConcurrent,
int portTotal,
+ int portCurrent,
int threadCurrent,
int threadMaxConcurrent,
int socketCurrent,