always use standard separator for comments and mac vendords, but repl…

…ace it with user-defined separator for display
mrmusa24 · Jan 25, 2021 · 6f479e1 · 6f479e1
1 parent 7b30d6e
commit 6f479e1
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,6 @@
 Unreleased:
 - Upgrade SWT for all platforms
-- Fix resolving of MAC vendors if MAC separator is changed
+- Fix resolving of MAC vendors and Comments if MAC separator is changed to non-standard
 
 Changes in 3.7.4:
 - Allow changing of MAC address separator (many tools use "-" instead of ":") #261

diff --git a/src/net/azib/ipscan/fetchers/CommentFetcher.java b/src/net/azib/ipscan/fetchers/CommentFetcher.java
@@ -29,8 +29,10 @@ public String getId() {
 
 	public Object scan(ScanningSubject subject) {
 		String mac = (String) subject.getParameter(MACFetcher.ID);
-		if (mac == null && (subject.getAddress().isSiteLocalAddress() || subject.getAddress().isLinkLocalAddress()))
-			mac = macFetcher.scan(subject);
+		if (mac == null && (subject.getAddress().isSiteLocalAddress() || subject.getAddress().isLinkLocalAddress())) {
+			macFetcher.scan(subject);
+			mac = (String) subject.getParameter(MACFetcher.ID);
+		}
 		return commentsConfig.getComment(subject.getAddress(), mac);
 	}
 }
diff --git a/src/net/azib/ipscan/fetchers/MACFetcher.java b/src/net/azib/ipscan/fetchers/MACFetcher.java
@@ -21,7 +21,7 @@ public abstract class MACFetcher extends AbstractFetcher {
 		String mac = (String) subject.getParameter(ID);
 		if (mac == null) mac = resolveMAC(subject.getAddress());
 		subject.setParameter(ID, mac);
-		return mac;
+		return replaceSeparator(mac);
 	}
 
 	protected abstract String resolveMAC(InetAddress address);
@@ -30,12 +30,16 @@ String bytesToMAC(byte[] bytes) {
 		StringBuilder mac = new StringBuilder();
 		for (byte b : bytes) mac.append(String.format("%02X", b)).append(":");
 		if (mac.length() > 0) mac.deleteCharAt(mac.length()-1);
-		return mac.toString().replace(":", separator);
+		return mac.toString();
 	}
 
 	String extractMAC(String line) {
 		Matcher m = macAddressPattern.matcher(line);
-		return m.find() ? addLeadingZeroes(m.group().toUpperCase()).replace(":", separator) : null;
+		return m.find() ? addLeadingZeroes(m.group().toUpperCase()) : null;
+	}
+
+	String replaceSeparator(String mac) {
+		return mac.replace(":", separator);
 	}
 
 	private static String addLeadingZeroes(String mac) {

diff --git a/src/net/azib/ipscan/fetchers/MACVendorFetcher.java b/src/net/azib/ipscan/fetchers/MACVendorFetcher.java
@@ -39,11 +39,14 @@ public void init() {
 	@Override
 	public Object scan(ScanningSubject subject) {
 		String mac = (String)subject.getParameter(MACFetcher.ID);
-		if (mac == null) mac = macFetcher.scan(subject);
+		if (mac == null) {
+			macFetcher.scan(subject);
+			mac = (String) subject.getParameter(MACFetcher.ID);
+		}
 		return mac != null ? findMACVendor(mac) : null;
 	}
 
 	String findMACVendor(String mac) {
-		return vendors.get(mac.replace(macFetcher.separator, "").substring(0, 6));
+		return vendors.get(mac.replace(":", "").substring(0, 6));
 	}
 }
diff --git a/test/net/azib/ipscan/fetchers/MACVendorFetcherTest.java b/test/net/azib/ipscan/fetchers/MACVendorFetcherTest.java
@@ -16,8 +16,5 @@ public void findMACVendor() {
 		fetcher.init();
 		assertEquals("XEROX", fetcher.findMACVendor("00:00:01:00:00:00"));
 		assertEquals("Nokia", fetcher.findMACVendor("FC:E5:57:11:22:33"));
-
-		macFetcher.separator = "-";
-		assertEquals("Nokia", fetcher.findMACVendor("FC-E5-57-11-22-33"));
 	}
 }