From c1ec0e3741f29fc8a3616293a1a08e24a13df44f Mon Sep 17 00:00:00 2001 From: Anton Keks Date: Sun, 16 Jan 2022 15:21:08 +0200 Subject: [PATCH] clarify method names and signatures --- src/net/azib/ipscan/core/ScanningSubject.java | 4 ++-- src/net/azib/ipscan/feeders/RangeFeeder.java | 4 ++-- src/net/azib/ipscan/util/InetAddressUtils.java | 7 ++++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/net/azib/ipscan/core/ScanningSubject.java b/src/net/azib/ipscan/core/ScanningSubject.java index 13da288a..eea5746e 100644 --- a/src/net/azib/ipscan/core/ScanningSubject.java +++ b/src/net/azib/ipscan/core/ScanningSubject.java @@ -50,11 +50,11 @@ public class ScanningSubject { int adaptedPortTimeout = -1; public ScanningSubject(InetAddress address) { - this(address, InetAddressUtils.getInterface(address)); + this(address, InetAddressUtils.getInterfaceByLocalAddr(address)); } public ScanningSubject(InetAddress address, NetworkInterface netIf) { - this(address, netIf, matchingAddress(netIf, address)); + this(address, netIf, matchingAddress(netIf, address.getClass())); } public ScanningSubject(InetAddress address, NetworkInterface netIf, InterfaceAddress ifAddr) { diff --git a/src/net/azib/ipscan/feeders/RangeFeeder.java b/src/net/azib/ipscan/feeders/RangeFeeder.java index 6d859252..aa9847cc 100644 --- a/src/net/azib/ipscan/feeders/RangeFeeder.java +++ b/src/net/azib/ipscan/feeders/RangeFeeder.java @@ -53,8 +53,8 @@ public class RangeFeeder extends AbstractFeeder { try { this.startIP = this.currentIP = InetAddress.getByName(startIP); this.endIP = this.originalEndIP = InetAddress.getByName(endIP); - this.netIf = getInterface(ifAddr != null ? ifAddr.getAddress() : this.startIP); - this.ifAddr = ifAddr != null ? ifAddr : matchingAddress(netIf, this.startIP); + this.netIf = ifAddr != null ? getInterfaceByLocalAddr(ifAddr.getAddress()) : null; + this.ifAddr = ifAddr != null ? ifAddr : matchingAddress(netIf, this.startIP.getClass()); this.isReverse = false; } catch (UnknownHostException e) { diff --git a/src/net/azib/ipscan/util/InetAddressUtils.java b/src/net/azib/ipscan/util/InetAddressUtils.java index 4e90ec6b..b69b2a8f 100644 --- a/src/net/azib/ipscan/util/InetAddressUtils.java +++ b/src/net/azib/ipscan/util/InetAddressUtils.java @@ -192,8 +192,9 @@ public class InetAddressUtils { return anyAddress; } - public static NetworkInterface getInterface(InetAddress address) { + public static NetworkInterface getInterfaceByLocalAddr(InetAddress address) { try { + if (address == null) return null; return NetworkInterface.getByInetAddress(address); } catch (SocketException e) { @@ -201,9 +202,9 @@ public class InetAddressUtils { } } - public static InterfaceAddress matchingAddress(NetworkInterface netIf, InetAddress address) { + public static InterfaceAddress matchingAddress(NetworkInterface netIf, Class addressClass) { if (netIf == null) return null; - return netIf.getInterfaceAddresses().stream().filter(i -> i.getAddress().getClass() == address.getClass()).findFirst().orElse(null); + return netIf.getInterfaceAddresses().stream().filter(i -> i.getAddress().getClass() == addressClass).findFirst().orElse(null); } public static List getNetworkInterfaces() throws SocketException {