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

actually fix fuzzy matching

Browse source
This commit is contained in:
Nils Schneider 2012-07-08 02:09:00 +02:00
parent 8aa71d62e5
commit ecc7aed694
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
nodedb.py
View file

@ -22,8 +22,6 @@ class NodeDB:
def get_nodes(self): def get_nodes(self):
return self._nodes return self._nodes
# this methods has evil side-effects!
# Better don't call it :-)
def maybe_node_by_fuzzy_mac(self, mac): def maybe_node_by_fuzzy_mac(self, mac):
mac_a = mac.lower() mac_a = mac.lower()
@ -32,7 +30,7 @@ class NodeDB:
if is_similar(mac_a, mac_b): if is_similar(mac_a, mac_b):
return node return node
raise raise KeyError
def maybe_node_by_mac(self, macs): def maybe_node_by_mac(self, macs):
for node in self._nodes: for node in self._nodes:
@ -75,13 +73,7 @@ class NodeDB:
# consider this MAC as one of the routers # consider this MAC as one of the routers
# MACs # MACs
if 'gateway' in x and x['label'] == "TT": if 'gateway' in x and x['label'] == "TT":
try: if is_similar(x['router'], x['gateway']):
mac_a = list(int(i, 16) for i in x['router'].split(":"))
mac_b = list(int(i, 16) for i in x['gateway'].split(":"))
except ValueError:
continue
if is_similar(mac_a, mac_b):
node.add_mac(x['gateway']) node.add_mac(x['gateway'])
# skip processing as regular link # skip processing as regular link
@ -281,7 +273,7 @@ class NodeDB:
try: try:
node = self.maybe_node_by_fuzzy_mac(data[0]) node = self.maybe_node_by_fuzzy_mac(data[0])
except: except KeyError:
node = Node() node = Node()
node.add_mac(data[0]) node.add_mac(data[0])
self._nodes.append(node) self._nodes.append(node)
@ -295,20 +287,29 @@ class NodeDB:
# 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):
if a == b:
return True
try:
mac_a = list(int(i, 16) for i in a.split(":"))
mac_b = list(int(i, 16) for i in b.split(":"))
except ValueError:
return False
# first byte must only differ in bit 2 # first byte must only differ in bit 2
if a[0] | 2 == b[0] | 2: if mac_a[0] | 2 == mac_b[0] | 2:
# count different bytes # count different bytes
a = [x for x in zip(a[1:], b[1:]) if x[0] != x[1]] c = [x for x in zip(mac_a[1:], mac_b[1:]) if x[0] != x[1]]
else: else:
return False return False
# no more than two additional bytes must differ # no more than two additional bytes must differ
if len(a) <= 2: if len(c) <= 2:
delta = 0 delta = 0
if len(a) > 0: if len(c) > 0:
delta = sum(abs(i[0] -i[1]) for i in a) delta = sum(abs(i[0] -i[1]) for i in c)
# This TT link looks like a mac of the router! # These addresses look pretty similar!
return delta < 8 return delta < 8