Renamed blocked to filtered ports to do it like nmap and changed default

scan values

1 files changed, 8 insertions, 8 deletions

diff --git a/src/main/java/com/it_jaros/network_scanner/App.java b/src/main/java/com/it_jaros/network_scanner/App.java
index 1ae45ba..a06b88a 100644
--- a/src/main/java/com/it_jaros/network_scanner/App.java
+++ b/src/main/java/com/it_jaros/network_scanner/App.java
@@ -11,7 +11,7 @@ public class App {
             ScanOptions options = cliParser.parseArgs(args);
             Scanner scanner = new Scanner(options.openSocketLimit(), options.timeoutInMillis(),
                     options.delayInMillis(), options.maxWorkersPerHost(), options.maxTargetsLimit());
-            printResults(scanner.scan(options), options.showBlockedPorts());
+            printResults(scanner.scan(options), options.showFilteredPorts());
         } catch (IllegalArgumentException e) {
             System.out.printf("Error while parsing arguments: %s", e.getMessage());
             cliParser.usageAndExit();
@@ -20,21 +20,21 @@ public class App {
         }
     }
 
-    public static void printResults(List<ScanResult> results, boolean showBlockedPorts) {
-        results.forEach((ScanResult r) -> printResult(r, showBlockedPorts));
+    public static void printResults(List<ScanResult> results, boolean showFilteredPorts) {
+        results.forEach((ScanResult r) -> printResult(r, showFilteredPorts));
     }
 
-    private static void printResult(ScanResult result, boolean showBlockedPorts) {
-        if (result.openPorts().isEmpty() && (!showBlockedPorts || result.blockedPorts().isEmpty())) {
+    private static void printResult(ScanResult result, boolean showFilteredPorts) {
+        if (result.openPorts().isEmpty() && (!showFilteredPorts || result.filteredPorts().isEmpty())) {
             return;
         }
 
         System.out.println(result.target());
         if (!result.openPorts().isEmpty()) {
-            System.out.println("\topen:\t" + map(result.openPorts()));
+            System.out.printf("\t (%d) open:\t%s%n", result.openPorts().cardinality(), map(result.openPorts()));
         }
-        if (showBlockedPorts && !result.blockedPorts().isEmpty()) {
-            System.out.println("\tblocked:\t" + map(result.blockedPorts()));
+        if (showFilteredPorts && !result.filteredPorts().isEmpty()) {
+            System.out.printf("\t (%d) filtered:\t%s%n", result.filteredPorts().cardinality(), map(result.filteredPorts()));
         }
         System.out.println();
     }