From 0d3d3375d35b7f9427a95bf53ff31fd551aee3ab Mon Sep 17 00:00:00 2001 From: eric Date: Mon, 9 Feb 2004 18:36:48 +0000 Subject: [PATCH] Fixed a long line and added another bogus mac address. git-svn-id: https://samskivert.googlecode.com/svn/trunk@1394 6335cc39-0255-0410-8fd6-9bcaacd3b74c --- .../src/java/com/samskivert/net/MACUtil.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/projects/samskivert/src/java/com/samskivert/net/MACUtil.java b/projects/samskivert/src/java/com/samskivert/net/MACUtil.java index ee2931d6..3ae85a46 100644 --- a/projects/samskivert/src/java/com/samskivert/net/MACUtil.java +++ b/projects/samskivert/src/java/com/samskivert/net/MACUtil.java @@ -1,5 +1,5 @@ // -// $Id: MACUtil.java,v 1.6 2003/09/05 18:07:17 eric Exp $ +// $Id: MACUtil.java,v 1.7 2004/02/09 18:36:48 eric Exp $ package com.samskivert.net; @@ -53,13 +53,18 @@ public class MACUtil // we did find another one. Different versions of windows // seem to magic up different magic MAC addresses that don't // mean anything. Great. Adding 005345 to the list to - // ignore. + // ignore. And another, 00E006095566 is apparently the mac of + // some set of all in one ASUS motherboards. Guess they + // didn't get the memo about the MACs all being unique. if (mac.startsWith("44-45-53") || mac.startsWith("44:45:53")) { continue; } else if (mac.startsWith("00-53-45-00") || mac.startsWith("00:53:45:00")) { continue; + } else if (mac.startsWith("00-E0-06-09-55-66") || + mac.startsWith("00:E0:06:09:55:66")) { + continue; } list.add(mac); @@ -119,8 +124,8 @@ public class MACUtil } } - /** Look for 2 hex values in a row followed by a ':' or '-' repeated 5 times, - followed by 2 hex values. */ + /** Look for 2 hex values in a row followed by a ':' or '-' repeated 5 + times, followed by 2 hex values. */ protected static Pattern MACRegex = Pattern.compile("((?:\\p{XDigit}{2}+[:\\-]){5}+\\p{XDigit}{2}+)", Pattern.CASE_INSENSITIVE);