jscanner

commit 8094a2ec94cdce0ac7ddf2f9e24db08815b5412d
parent b5575f0042f461784774ff409161f2f9e8f4fe5a
Author: Matthias Jaros <jaros@mailbox.org>
Date:   Mon, 30 Mar 2026 13:49:17 +0200

Improved naming

Diffstat:
M
src/main/java/com/it_jaros/network_scanner/CliParser.java
 | 
14
+++++++-------
M
src/main/java/com/it_jaros/network_scanner/ScanOptions.java
 | 
2
+-
M
src/main/java/com/it_jaros/network_scanner/Scanner.java
 | 
10
+++++-----

3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/it_jaros/network_scanner/CliParser.java b/src/main/java/com/it_jaros/network_scanner/CliParser.java
@@ -10,7 +10,7 @@ public class CliParser {
             throw new IllegalArgumentException("No argument given");
         }
 
-        Set<String> targetHosts = new HashSet<>();
+        Set<String> hostsArgv = new HashSet<>();
         int socketLimit = CliDefaults.SOCKET_LIMIT;
         int delayInMillis = CliDefaults.DELAY_IN_MILLIS;
         int timeoutInMillis = CliDefaults.TIMEOUT_IN_MILLIS;
@@ -19,12 +19,12 @@ public class CliParser {
         String ports = CliDefaults.PORTS;
         boolean showFilteredPorts = CliDefaults.SHOW_FILTERED_PORTS;
         boolean disableHostCheck = CliDefaults.DISABLE_HOST_CHECK;
-        String file = null;
+        String hostsFile = null;
 
         for (int i = 0; i < args.length; i++) {
             final String currentArg = args[i];
             if (!currentArg.startsWith("-")) {
-                targetHosts.add(currentArg);
+                hostsArgv.add(currentArg);
                 continue;
             }
 
@@ -57,7 +57,7 @@ public class CliParser {
                     disableHostCheck = true;
                     break;
                 case "--file", "-f":
-                    file = requireValue(args, ++i, currentArg);
+                    hostsFile = requireValue(args, ++i, currentArg);
                     break;
                 default:
                     throw new IllegalArgumentException("No such param " + currentArg);
@@ -65,10 +65,10 @@ public class CliParser {
         }
 
         System.out.printf(
-                "Parsed arguments: targetHosts('%s'), ports(%s), socketLimit(%s), delayInMillis(%s), timeoutInMillis(%s), maxWorkersPerHost(%s), maxTargetsLimit(%s), showFilteredPorts(%s), disableTargetCheck(%s), file(%s) %n",
-                targetHosts, ports, socketLimit, delayInMillis, timeoutInMillis, maxWorkersPerHost, maxHostsLimit, showFilteredPorts, disableHostCheck, file);
+                "Parsed arguments: hostsArgv('%s'), ports(%s), socketLimit(%s), delayInMillis(%s), timeoutInMillis(%s), maxWorkersPerHost(%s), maxTargetsLimit(%s), showFilteredPorts(%s), disableTargetCheck(%s), file(%s) %n",
+                hostsArgv, ports, socketLimit, delayInMillis, timeoutInMillis, maxWorkersPerHost, maxHostsLimit, showFilteredPorts, disableHostCheck, hostsFile);
 
-        return new ScanOptions(targetHosts.stream().toList(), socketLimit, delayInMillis, timeoutInMillis, maxWorkersPerHost, maxHostsLimit, ports, showFilteredPorts, disableHostCheck, file);
+        return new ScanOptions(hostsArgv.stream().toList(), socketLimit, delayInMillis, timeoutInMillis, maxWorkersPerHost, maxHostsLimit, ports, showFilteredPorts, disableHostCheck, hostsFile);
     }
 
     private String requireValue(String[] args, int index, String option) {
diff --git a/src/main/java/com/it_jaros/network_scanner/ScanOptions.java b/src/main/java/com/it_jaros/network_scanner/ScanOptions.java
@@ -2,4 +2,4 @@ package com.it_jaros.network_scanner;
 
 import java.util.List;
 
-public record ScanOptions(List<String> targetHosts, int openSocketLimit, int delayInMillis, int timeoutInMillis, int maxWorkersPerHost, int maxHostsLimit, String ports, boolean showFilteredPorts, boolean disableHostCheck, String file) {}
+public record ScanOptions(List<String> hostsArgv, int openSocketLimit, int delayInMillis, int timeoutInMillis, int maxWorkersPerHost, int maxHostsLimit, String ports, boolean showFilteredPorts, boolean disableHostCheck, String hostsFile) {}
diff --git a/src/main/java/com/it_jaros/network_scanner/Scanner.java b/src/main/java/com/it_jaros/network_scanner/Scanner.java
@@ -37,10 +37,10 @@ public class Scanner {
     }
 
     public List<ScanResult> scan(ScanOptions options) {
-        if (options.file() != null) {
-            return scanHosts(options.file(), options.ports());
+        if (options.hostsFile() != null) {
+            return scanHosts(options.hostsFile(), options.ports());
         }
-        return scanHosts(options.targetHosts(), options.ports());
+        return scanHosts(options.hostsArgv(), options.ports());
     }
 
     public List<ScanResult> scanHosts(String sourceFile, String ports) {
@@ -55,8 +55,8 @@ public class Scanner {
         return List.of();
     }
 
-    public List<ScanResult> scanHosts(List<String> targetHosts, String ports) {
-        try (Stream<String> stream = targetHosts.stream()){
+    public List<ScanResult> scanHosts(List<String> hostsArgv, String ports) {
+        try (Stream<String> stream = hostsArgv.stream()){
             return scanHosts(stream, ports);
         } catch (IOException e) {
             System.out.printf("Error while trying to read hosts: %s -> %s %n", e.getClass().getSimpleName(), e.getMessage());