From 05bf2c8be209e619f8c9e727fd1353198b042642 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 9 Sep 2015 14:41:38 +0200 Subject: begin packaging of tinc_stats --- .../scripts/adv_graphgen/tinc_graphs/Log2JSON.py | 103 +++++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100755 retiolum/scripts/adv_graphgen/tinc_graphs/Log2JSON.py (limited to 'retiolum/scripts/adv_graphgen/tinc_graphs/Log2JSON.py') diff --git a/retiolum/scripts/adv_graphgen/tinc_graphs/Log2JSON.py b/retiolum/scripts/adv_graphgen/tinc_graphs/Log2JSON.py new file mode 100755 index 00000000..7df042fd --- /dev/null +++ b/retiolum/scripts/adv_graphgen/tinc_graphs/Log2JSON.py @@ -0,0 +1,103 @@ +#!/usr/bin/python +import subprocess +import os +import re +import sys +import json + + +TINC_NETWORK =os.environ.get("TINC_NETWORK","retiolum") + +# is_legacy is the parameter which defines if the tinc config files are handled old fashioned (parse from syslog), +# or if the new and hip tincctl should be used + + +# Tags and Delimiters +TINC_TAG="tinc.%s" % TINC_NETWORK +BEGIN_NODES = "Nodes:" +END_NODES = "End of nodes." +BEGIN_SUBNET = "Subnet list:" +END_SUBNET = "End of subnet list" +BEGIN_EDGES = "Edges:" +END_EDGES = "End of edges." +def usage(): + from sys import argv,exit + print("""usage: %s +This tool dumps all tinc node informations as json + +ENVIRONMENT VARIABLES: + TINC_NETWORK The tinc network to dump + (default: retiolum) +""" % argv[0]) + exit(1) + +def debug(func): + from functools import wraps + @wraps(func) + def with_debug(*args,**kwargs): + print( func.__name__ + " (args: %s | kwargs %s)"% (args,kwargs)) + return func(*args,**kwargs) + return with_debug + + +def parse_tinc_stats(): + import subprocess + from time import sleep + from distutils.spawn import find_executable as which + #newest tinc + if which("tinc"): + return parse_new_input("tinc") + #new tinc + elif which("tincctl"): + return parse_new_input("tincctl") + #old tinc + elif which("tincd"): + print("old tincd not supported") + sys.exit(1) + else: + raise Exception("no tinc executable found!") + + +def parse_new_input(tinc_bin): + nodes = {} + pnodes = subprocess.Popen( + [tinc_bin,"-n",TINC_NETWORK,"dump","reachable","nodes"], + stdout=subprocess.PIPE).communicate()[0].decode() + for line in pnodes.split('\n'): + if not line: continue + l = line.split() + nodes[l[0]]= { 'external-ip': l[2], 'external-port' : l[4] } + psubnets = subprocess.check_output( + [tinc_bin,"-n",TINC_NETWORK,"dump","subnets"]).decode() + for line in psubnets.split('\n'): + if not line: continue + l = line.split() + try: + if not nodes[l[2]].get('internal-ip',False): + nodes[l[2]]['internal-ip'] = [] + nodes[l[2]]['internal-ip'].append(l[0].split('#')[0]) + except KeyError: + pass # node does not exist (presumably) + pedges = subprocess.check_output( + [tinc_bin,"-n",TINC_NETWORK,"dump","edges"]).decode() + for line in pedges.split('\n'): + if not line: continue + l = line.split() + try: + if not 'to' in nodes[l[0]] : + nodes[l[0]]['to'] = [] + nodes[l[0]]['to'].append( + {'name':l[2],'addr':l[4],'port':l[6],'weight' : l[10] }) + except KeyError: + pass #node does not exist + return nodes + +def main(): + from sys import argv + if len(argv) > 1: + usage() + else: + print (json.dumps(parse_tinc_stats())) + +if __name__ == '__main__': + main() -- cgit v1.2.3 From 7ba002c6424034390d1ea8c92e8eaacbfd482383 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 9 Sep 2015 16:07:38 +0200 Subject: fix new param order of tinc output --- .../scripts/adv_graphgen/tinc_graphs/Log2JSON.py | 28 +++++++++++++++++----- 1 file changed, 22 insertions(+), 6 deletions(-) (limited to 'retiolum/scripts/adv_graphgen/tinc_graphs/Log2JSON.py') diff --git a/retiolum/scripts/adv_graphgen/tinc_graphs/Log2JSON.py b/retiolum/scripts/adv_graphgen/tinc_graphs/Log2JSON.py index 7df042fd..b0bc209b 100755 --- a/retiolum/scripts/adv_graphgen/tinc_graphs/Log2JSON.py +++ b/retiolum/scripts/adv_graphgen/tinc_graphs/Log2JSON.py @@ -26,7 +26,7 @@ def usage(): This tool dumps all tinc node informations as json ENVIRONMENT VARIABLES: - TINC_NETWORK The tinc network to dump + TINC_NETWORK The tinc network to dump (default: retiolum) """ % argv[0]) exit(1) @@ -59,14 +59,27 @@ def parse_tinc_stats(): def parse_new_input(tinc_bin): - nodes = {} + nodes = {} pnodes = subprocess.Popen( [tinc_bin,"-n",TINC_NETWORK,"dump","reachable","nodes"], stdout=subprocess.PIPE).communicate()[0].decode() for line in pnodes.split('\n'): if not line: continue l = line.split() - nodes[l[0]]= { 'external-ip': l[2], 'external-port' : l[4] } + n = l[0] + + token = l[1] + if token == 'id': + # new format + # id at port + ident = l[1] + l = l[2:] #shift over 'id ' + # else: # token = 'at' + # old format: + # at port + _,_,ip,_,port = l[:5] + nodes[n]= { 'external-ip': ip, 'external-port' : l[4] } + psubnets = subprocess.check_output( [tinc_bin,"-n",TINC_NETWORK,"dump","subnets"]).decode() for line in psubnets.split('\n'): @@ -78,16 +91,19 @@ def parse_new_input(tinc_bin): nodes[l[2]]['internal-ip'].append(l[0].split('#')[0]) except KeyError: pass # node does not exist (presumably) + pedges = subprocess.check_output( [tinc_bin,"-n",TINC_NETWORK,"dump","edges"]).decode() for line in pedges.split('\n'): if not line: continue l = line.split() + # TODO: tokenize this and parse the line + n = l[0] try: if not 'to' in nodes[l[0]] : - nodes[l[0]]['to'] = [] - nodes[l[0]]['to'].append( - {'name':l[2],'addr':l[4],'port':l[6],'weight' : l[10] }) + nodes[n]['to'] = [] + nodes[n]['to'].append( + {'name':l[2],'addr':l[4],'port':l[6],'weight' : l[-1] }) except KeyError: pass #node does not exist return nodes -- cgit v1.2.3