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

bugs

Browse source
This commit is contained in:
Nils Schneider 2014-05-31 14:53:28 +02:00
parent 26fc2a9aef
commit f18d0b38a9
5 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,2 +1,3 @@
*.pyc *.pyc
aliases.json aliases.json
nodedb/

2
alfred.py
View file

@ -38,5 +38,5 @@ class alfred:
if __name__ == "__main__": if __name__ == "__main__":
ad = alfred() ad = alfred()
al = ad.alias() al = ad.aliases()
print(al) print(al)

2
bat2nodes.py
View file

@ -49,7 +49,7 @@ if options['mesh']:
bm = batman(mesh_interface) bm = batman(mesh_interface)
db.parse_vis_data(bm.vis_data(options['alfred'])) db.parse_vis_data(bm.vis_data(options['alfred']))
for gw in bm.gateway_list(): for gw in bm.gateway_list():
db.mark_gateways(gw.mac) db.mark_gateways(gw['mac'])
else: else:
bm = batman() bm = batman()
db.parse_vis_data(bm.vis_data(options['alfred'])) db.parse_vis_data(bm.vis_data(options['alfred']))

2
batman.py
View file

@ -59,6 +59,8 @@ class batman:
gw.append({'mac': own_mac, 'bandwidth': gw_mode['bandwidth']}) gw.append({'mac': own_mac, 'bandwidth': gw_mode['bandwidth']})
for line in lines: for line in lines:
gw_line = line.split() gw_line = line.split()
if (gw_line[0] == 'No'):
continue
# When in client gateway mode maybe gw_line[0] is not the right. # When in client gateway mode maybe gw_line[0] is not the right.
gw.append({'mac':gw_line[0], 'bandwidth': gw_line[-1]}) gw.append({'mac':gw_line[0], 'bandwidth': gw_line[-1]})
return gw return gw

3
nodedb.py
View file

@ -182,7 +182,7 @@ class NodeDB:
if 'name' in alias: if 'name' in alias:
node.name = alias['name'] node.name = alias['name']
if 'vpn' in alias and alias['vpn']: if 'vpn' in alias and alias['vpn'] and mac and node.interfaces and mac in node.interfaces:
node.interfaces[mac].vpn = True node.interfaces[mac].vpn = True
if 'gps' in alias: if 'gps' in alias:
@ -202,6 +202,7 @@ class NodeDB:
try: try:
node = self.maybe_node_by_mac((gateway, )) node = self.maybe_node_by_mac((gateway, ))
except: except:
print("WARNING: did not find gateway '",gateway,"' in node list")
continue continue
node.flags['gateway'] = True node.flags['gateway'] = True