summaryrefslogtreecommitdiffstats
path: root/modules/retiolum/scripts/adv_graphgen
diff options
context:
space:
mode:
authortv <tv@also>2011-05-29 14:28:06 +0200
committertv <tv@also>2011-05-29 14:28:06 +0200
commit6ab10542e484d12e1635a016860e27e8167e5185 (patch)
treeba5acc68d05538ee1396f09e9724b05eaf389725 /modules/retiolum/scripts/adv_graphgen
parent9ea4cbe1e006f703d1367f5aa3229849775b7128 (diff)
parentb7e9b977884f8d4d6149b06e3567f288b920daa6 (diff)
Merge branch 'master' of github.com:krebscode/painload
Diffstat (limited to 'modules/retiolum/scripts/adv_graphgen')
-rwxr-xr-xmodules/retiolum/scripts/adv_graphgen/parse.py20
-rwxr-xr-xmodules/retiolum/scripts/adv_graphgen/sanitize.sh2
2 files changed, 16 insertions, 6 deletions
diff --git a/modules/retiolum/scripts/adv_graphgen/parse.py b/modules/retiolum/scripts/adv_graphgen/parse.py
index 04b42c33..639c5316 100755
--- a/modules/retiolum/scripts/adv_graphgen/parse.py
+++ b/modules/retiolum/scripts/adv_graphgen/parse.py
@@ -12,6 +12,7 @@ def write_digraph(nodes):
print ('digraph retiolum {')
print (' node[shape=box,style=filled,fillcolor=grey]')
generate_stats(nodes)
+ nodes = delete_unused_nodes(nodes)
merge_edges(nodes)
for k,v in nodes.iteritems():
write_node(k,v)
@@ -21,7 +22,12 @@ def generate_stats(nodes):
"""
for k,v in nodes.iteritems():
v['num_conns'] = len(v.get('to',[]))
-
+def delete_unused_nodes(nodes):
+ new_nodes = {}
+ for k,v in nodes.iteritems():
+ if v.get('to',[]):
+ new_nodes[k] = v
+ return new_nodes
def merge_edges(nodes):
""" merge back and forth edges into one
DESTRUCTS the current structure by deleting "connections" in the nodes
@@ -45,12 +51,14 @@ def write_node(k,v):
node += "external:"+v['external-ip']+":"+v['external-port']+"\\l"
if v.has_key('num_conns'):
node += "Num Connects:"+str(v['num_conns'])+"\\l"
-
- node += "internal:"+v.get('internal-ip','¯\\\\(°_o)/¯')+"\\l\""
+ for addr in v.get('internal-ip',['¯\\\\(°_o)/¯']):
+ node += "internal:"+addr+"\\l"
+ node +="\""
if v['external-ip'] == "MYSELF":
node += ",fillcolor=steelblue1"
node += "]"
- print (node)
+ print node
+
for con in v.get('to',[]):
edge = " "+k+ " -> " +con['name'] + "[weight="+str(float(con['weight']))
if con.get('bidirectional',False):
@@ -74,7 +82,9 @@ def parse_input():
if line == 'End of subnet list.\n':
break
l = line.replace('\n','').split()
- nodes[l[2]]['internal-ip'] = l[0].split('#')[0]
+ if not nodes[l[2]].get('internal-ip',False):
+ nodes[l[2]]['internal-ip'] = []
+ nodes[l[2]]['internal-ip'].append(l[0].split('#')[0])
if line == 'Edges:':
edges = {}
for line in sys.stdin:
diff --git a/modules/retiolum/scripts/adv_graphgen/sanitize.sh b/modules/retiolum/scripts/adv_graphgen/sanitize.sh
index 88591b67..0e12d207 100755
--- a/modules/retiolum/scripts/adv_graphgen/sanitize.sh
+++ b/modules/retiolum/scripts/adv_graphgen/sanitize.sh
@@ -10,4 +10,4 @@ sudo sed -n '/tinc.retiolum/{s/.*tinc.retiolum\[[0-9]*\]: //gp}' $LOG_FILE |\
$GRAPH_SETTER1 -Tpng -o $1retiolum_1.png retiolum.dot
$GRAPH_SETTER2 -Tpng -o $1retiolum_2.png retiolum.dot
$OPENER retiolum_1.png &>/dev/null
-rm retiolum.dot
+#rm retiolum.dot