Link discovery gets confused by Cisco HSRP Mac Addresses

We are using Cisco HSRP (Hot Standby Router Protcol) in several parts of our network. The MAC addresses used by HSRP are not unique. So the same addresses occure on several devices with different MAC address to IP address mappings. This serverely confuses Link Discovery. Suggested solution is to exclude the HSRP MAC address range from Link Discovery. The following patch does that:

— DiscoveryLink.java.orig Tue Jan 5 18:50:29 2010
+++ DiscoveryLink.java Tue Feb 23 22:38:55 2010
@@ -241,6 +241,14 @@
macsExcluded.add(macAddress);
continue;
}
+ if (macAddress.indexOf("00000c07ac") == 0)

{ + log() + .info("run: at interface " + + macAddress + + " is cisco hsrp address! Not adding to discoverable atinterface."); + macsExcluded.add(macAddress); + continue; + }

List<AtInterface> ats = macToAtinterface.get(macAddress);
if (ats == null) ats = new ArrayList<AtInterface>();
if (log().isInfoEnabled())