summaryrefslogtreecommitdiffstats
path: root/retiolum/hosts/.scripts
diff options
context:
space:
mode:
authorFelix Richter <Felix.Richter@syntax-fehler.de>2011-05-11 13:17:21 +0200
committerFelix Richter <Felix.Richter@syntax-fehler.de>2011-05-11 13:17:21 +0200
commit513b1ad5c490f9f3821fc6aa2a9bddf3c3f31802 (patch)
tree92f5b371d3e991bbe987dc48faf7d0d014c2b30b /retiolum/hosts/.scripts
parent50c19eb1d5aa815af6d67bb58ff90fcc1e548036 (diff)
refactored parser script,fixed bug
parse.py: refactored parsing into function sanitize.sh: fixed bug which creates race condition, removed gvcolor from toolchain
Diffstat (limited to 'retiolum/hosts/.scripts')
-rwxr-xr-xretiolum/hosts/.scripts/parse.py58
-rwxr-xr-xretiolum/hosts/.scripts/sanitize.sh4
2 files changed, 31 insertions, 31 deletions
diff --git a/retiolum/hosts/.scripts/parse.py b/retiolum/hosts/.scripts/parse.py
index a7ca7884..951fce94 100755
--- a/retiolum/hosts/.scripts/parse.py
+++ b/retiolum/hosts/.scripts/parse.py
@@ -14,40 +14,40 @@ def write_node(k,v):
node += "external:"+v['external-ip']+":"+v['external-port']+"\\l"
node += "internal:"+v['internal-ip']+"\\l\""
if v['external-ip'] == "MYSELF":
- sys.stderr.write("lolwut")
node += ",fillcolor=steelblue1"
node += "]"
print (node)
for con in v.get('to',[]):
print " "+k+ "->" +con['name'] + "[weight="+str(10/float(con['weight']))+"]"
-nodes={}
-edges={}
-for line in sys.stdin:
- line = line.replace('\n','')
- if line == 'Nodes:':
- nodes={}
- for line in sys.stdin:
- if line == 'End of nodes.\n':
- break
- l = line.replace('\n','').split() #TODO unhack me
- nodes[l[0]]= { 'external-ip': l[2], 'external-port' : l[4] }
- if line == 'Subnet list:':
- for line in sys.stdin:
- if line == 'End of subnet list.\n':
- break
- l = line.replace('\n','').split()
- nodes[l[2]]['internal-ip'] = l[0].split('#')[0]
- if line == 'Edges:':
- edges = {}
- for line in sys.stdin:
- if line == 'End of edges.\n':
- break
- l = line.replace('\n','').split()
-
- if not nodes[l[0]].has_key('to') :
- nodes[l[0]]['to'] = []
- nodes[l[0]]['to'].append(
- {'name':l[2],'addr':l[4],'port':l[6],'weight' : l[10] })
+def parse_input():
+ nodes={}
+ for line in sys.stdin:
+ line = line.replace('\n','')
+ if line == 'Nodes:':
+ nodes={}
+ for line in sys.stdin:
+ if line == 'End of nodes.\n':
+ break
+ l = line.replace('\n','').split() #TODO unhack me
+ nodes[l[0]]= { 'external-ip': l[2], 'external-port' : l[4] }
+ if line == 'Subnet list:':
+ for line in sys.stdin:
+ if line == 'End of subnet list.\n':
+ break
+ l = line.replace('\n','').split()
+ nodes[l[2]]['internal-ip'] = l[0].split('#')[0]
+ if line == 'Edges:':
+ edges = {}
+ for line in sys.stdin:
+ if line == 'End of edges.\n':
+ break
+ l = line.replace('\n','').split()
+ if not nodes[l[0]].has_key('to') :
+ nodes[l[0]]['to'] = []
+ nodes[l[0]]['to'].append(
+ {'name':l[2],'addr':l[4],'port':l[6],'weight' : l[10] })
+ return nodes
+nodes = parse_input()
write_digraph(nodes)
diff --git a/retiolum/hosts/.scripts/sanitize.sh b/retiolum/hosts/.scripts/sanitize.sh
index 92a7b6ee..75a04af1 100755
--- a/retiolum/hosts/.scripts/sanitize.sh
+++ b/retiolum/hosts/.scripts/sanitize.sh
@@ -1,2 +1,2 @@
-sudo sed -n '/tinc.retiolum/{s/.*tinc.retiolum\[[0-9]*\]: //gp}' /var/log/everything.log | ./parse.py | tee here.dot | dot | gvcolor | dot -Tpng -O
-mirage noname.dot.png
+sudo sed -n '/tinc.retiolum/{s/.*tinc.retiolum\[[1-9]*\]: //gp}' /var/log/everything.log | ./parse.py | tee here.dot | dot -Tpng -o retiolum.png
+mirage retiolum.png