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

Merge pull request #43 from mweinelt/master

Browse source 
update batman interface handling in backend.py, add commenting
This commit is contained in:
Nils Schneider 2015-03-25 15:38:03 +01:00
parent 30670feb31 9df369e88a
commit e9c693c4c0
1 changed files with 29 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
backend.py
View file

@ -23,23 +23,24 @@ def main(params):
now = datetime.utcnow().replace(microsecond=0) now = datetime.utcnow().replace(microsecond=0)
# read nodedb state from node.json
with open(nodes_fn, 'r') as nodedb_handle: with open(nodes_fn, 'r') as nodedb_handle:
nodedb = json.load(nodedb_handle) nodedb = json.load(nodedb_handle)
# flush nodedb if it uses the old format # flush nodedb if it uses the old format
if 'links' in nodedb: if 'links' in nodedb:
nodedb = {'nodes': dict()} nodedb = {'nodes': dict()}
# update timestamp and assume all nodes are offline
nodedb['timestamp'] = now.isoformat() nodedb['timestamp'] = now.isoformat()
for node_id, node in nodedb['nodes'].items(): for node_id, node in nodedb['nodes'].items():
node['flags']['online'] = False node['flags']['online'] = False
# integrate alfred nodeinfo
alfred = Alfred(unix_sockpath=params['alfred_sock']) alfred = Alfred(unix_sockpath=params['alfred_sock'])
nodes.import_nodeinfo(nodedb['nodes'], alfred.nodeinfo(), nodes.import_nodeinfo(nodedb['nodes'], alfred.nodeinfo(),
now, assume_online=True) now, assume_online=True)
# integrate static aliases data
for aliases in params['aliases']: for aliases in params['aliases']:
with open(aliases, 'r') as f: with open(aliases, 'r') as f:
nodes.import_nodeinfo(nodedb['nodes'], json.load(f), nodes.import_nodeinfo(nodedb['nodes'], json.load(f),
@ -48,34 +49,49 @@ def main(params):
nodes.reset_statistics(nodedb['nodes']) nodes.reset_statistics(nodedb['nodes'])
nodes.import_statistics(nodedb['nodes'], alfred.statistics()) nodes.import_statistics(nodedb['nodes'], alfred.statistics())
bm = list(map(lambda d: # initialize batman bindings for each mesh interface
(d.vis_data(True), d.gateway_list()), # and acquire gwl and visdata
map(Batman, params['mesh'], params['alfred_sock']))) mesh_interfaces = frozenset(params['mesh'])
for vis_data, gateway_list in bm: mesh_info = {}
nodes.import_mesh_ifs_vis_data(nodedb['nodes'], vis_data) for interface in mesh_interfaces:
nodes.import_vis_clientcount(nodedb['nodes'], vis_data) bm = Batman(mesh_interface=interface,
nodes.mark_vis_data_online(nodedb['nodes'], vis_data, now) alfred_sockpath=params['alfred_sock'])
nodes.mark_gateways(nodedb['nodes'], gateway_list) vd = bm.vis_data(True)
gwl = bm.gateway_list()
mesh_info[interface] = (vd, gwl)
# update nodedb from batman-adv data
for vd, gwl in mesh_info.values():
nodes.import_mesh_ifs_vis_data(nodedb['nodes'], vd)
nodes.import_vis_clientcount(nodedb['nodes'], vd)
nodes.mark_vis_data_online(nodedb['nodes'], vd, now)
nodes.mark_gateways(nodedb['nodes'], gwl)
# clear the nodedb from nodes that have not been online in $prune days
if params['prune']: if params['prune']:
nodes.prune_nodes(nodedb['nodes'], now, int(params['prune'])) nodes.prune_nodes(nodedb['nodes'], now, int(params['prune']))
# build nxnetworks graph from nodedb and visdata
batadv_graph = nx.DiGraph() batadv_graph = nx.DiGraph()
for vis_data, gateway_list in bm: for vd, gwl in mesh_info.values():
graph.import_vis_data(batadv_graph, nodedb['nodes'], vis_data) graph.import_vis_data(batadv_graph, nodedb['nodes'], vd)
# force mac addresses to be vpn-link only (like gateways for example)
if params['vpn']: if params['vpn']:
graph.mark_vpn(batadv_graph, frozenset(params['vpn'])) graph.mark_vpn(batadv_graph, frozenset(params['vpn']))
batadv_graph = graph.merge_nodes(batadv_graph) batadv_graph = graph.merge_nodes(batadv_graph)
batadv_graph = graph.to_undirected(batadv_graph) batadv_graph = graph.to_undirected(batadv_graph)
# write processed data to dest dir
with open(nodes_fn, 'w') as f: with open(nodes_fn, 'w') as f:
json.dump(nodedb, f) json.dump(nodedb, f)
with open(graph_fn, 'w') as f: with open(graph_fn, 'w') as f:
json.dump({'batadv': json_graph.node_link_data(batadv_graph)}, f) json.dump({'batadv': json_graph.node_link_data(batadv_graph)}, f)
# optional rrd graphs (trigger with --rrd)
if params['rrd']: if params['rrd']:
script_directory = os.path.dirname(os.path.realpath(__file__)) script_directory = os.path.dirname(os.path.realpath(__file__))
rrd = RRD(os.path.join(script_directory, 'nodedb'), rrd = RRD(os.path.join(script_directory, 'nodedb'),