freifunk/ffmap-backend
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Revert "better mac matching"

Browse source 
This reverts commit ac5c4b5693.
This commit is contained in:
Nils Schneider 2012-08-20 22:59:32 +02:00
parent ac5c4b5693
commit ac10d7aabc
1 changed files with 13 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
nodedb.py
View file

@ -284,19 +284,9 @@ class NodeDB:
if data[2]: if data[2]:
node.name = data[2] node.name = data[2]
# 1043nd, vpn, wlan, br-wan
# compares two MACs and decides whether they are # compares two MACs and decides whether they are
# similar and could be from the same node # similar and could be from the same node
def is_similar(a, b): def is_similar(a, b):
# a is the base address
# b is some mac of the host
# b = 00:00:00:00:00:+1 x
# |2:00:00:+1:00:+1 x
# |2:00:00:00:00:+1 x
# |2:00:00:00:00:+2
# |2:00:00:+1:00:00
if a == b: if a == b:
return True return True
@ -306,29 +296,20 @@ def is_similar(a, b):
except ValueError: except ValueError:
return False return False
x = mac_a # first byte must only differ in bit 2
x[5] += 1 if mac_a[0] | 2 == mac_b[0] | 2:
if mac_b == x: # count different bytes
return True c = [x for x in zip(mac_a[1:], mac_b[1:]) if x[0] != x[1]]
else:
return False
x[0] |= 2 # no more than two additional bytes must differ
if mac_b == x: if len(c) <= 2:
return True delta = 0
x[3] += 1 if len(c) > 0:
if mac_b == x: delta = sum(abs(i[0] -i[1]) for i in c)
return True
x = mac_a # These addresses look pretty similar!
x[0] |= 2 return delta < 8
x[5] += 2
if mac_b == x:
return True
x = mac_a
x[0] |= 2
x[3] += 1
if mac_b == x:
return True
return False