summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEUcancER <root@euer.krebsco.de>2011-09-01 11:00:15 +0200
committerEUcancER <root@euer.krebsco.de>2011-09-01 11:00:15 +0200
commiteffb297f1d935bb1f7d9ef59c372b6a1c4bd70c6 (patch)
tree41e9c482cdbef0364f47c3e8b5e2fbf35a422be8
parenta001a6f2e5bf9a594e42038f5f7b49381ed8ca04 (diff)
adv_graphgen: fix sanitize and parse
sanitze.sh now creates dot file in temp directory parse now correctly creates group attribute
-rwxr-xr-xretiolum/scripts/adv_graphgen/parse.py3
-rwxr-xr-xretiolum/scripts/adv_graphgen/sanitize.sh13
2 files changed, 9 insertions, 7 deletions
diff --git a/retiolum/scripts/adv_graphgen/parse.py b/retiolum/scripts/adv_graphgen/parse.py
index 4b9314cc..0bcf42a0 100755
--- a/retiolum/scripts/adv_graphgen/parse.py
+++ b/retiolum/scripts/adv_graphgen/parse.py
@@ -47,6 +47,7 @@ def write_node(k,v):
edges are weightet with the informations inside the nodes provided by
tinc
"""
+
node = " "+k+"[label=\""
node += k+"\\l"
node += "external:"+v['external-ip']+":"+v['external-port']+"\\l"
@@ -57,7 +58,7 @@ def write_node(k,v):
node +="\""
if v['external-ip'] == "MYSELF":
node += ",fillcolor=steelblue1"
- node +=",group="+v['external-ip'].replace(".","")+""
+ node +=",group=\""+v['external-ip'].replace(".","")+"\""
node += "]"
print node
diff --git a/retiolum/scripts/adv_graphgen/sanitize.sh b/retiolum/scripts/adv_graphgen/sanitize.sh
index df6216fa..1dc43bf4 100755
--- a/retiolum/scripts/adv_graphgen/sanitize.sh
+++ b/retiolum/scripts/adv_graphgen/sanitize.sh
@@ -1,5 +1,6 @@
#!/bin/sh
HERE=$(dirname `readlink -f $0`)
+TMP=/tmp
GRAPH_SETTER1=dot
GRAPH_SETTER2=circo
GRAPH_SETTER3='neato -Goverlap=prism '
@@ -9,11 +10,11 @@ OPENER=/bin/true
sudo pkill -USR2 tincd
sudo sed -n '/tinc.retiolum/{s/.*tinc.retiolum\[[0-9]*\]: //gp}' $LOG_FILE |\
- $HERE/parse.py > $HERE/retiolum.dot
+ $HERE/parse.py > $TMP/retiolum.dot
-$GRAPH_SETTER1 -Tpng -o $1/retiolum_1.png $HERE/retiolum.dot
-$GRAPH_SETTER2 -Tpng -o $1/retiolum_2.png $HERE/retiolum.dot
-$GRAPH_SETTER3 -Tpng -o $1/retiolum_3.png $HERE/retiolum.dot
-$GRAPH_SETTER4 -Tpng -o $1/retiolum_4.png $HERE/retiolum.dot
+$GRAPH_SETTER1 -Tpng -o $1/retiolum_1.png $TMP/retiolum.dot
+$GRAPH_SETTER2 -Tpng -o $1/retiolum_2.png $TMP/retiolum.dot
+$GRAPH_SETTER3 -Tpng -o $1/retiolum_3.png $TMP/retiolum.dot
+$GRAPH_SETTER4 -Tpng -o $1/retiolum_4.png $TMP/retiolum.dot
$OPENER $HERE/retiolum_1.png &>/dev/null
-rm $HERE/retiolum.dot
+rm $TMP/retiolum.dot