diff options
| author | Felix Richter <github@syntax-fehler.de> | 2011-05-26 13:59:47 +0200 |
|---|---|---|
| committer | Felix Richter <github@syntax-fehler.de> | 2011-05-26 13:59:47 +0200 |
| commit | 070edd0a3bc378483081c6e840dafa90ac1bfe19 (patch) | |
| tree | 65176890ede1602074abed5fd60584f61514bd23 | |
| parent | b4ac01ac0462eec051e225c84355c2e38f0ecb68 (diff) | |
fixed borken parse script
wrong behaviour when we do not know the internal ip of a node for some reason.
fixed autostart script to modprobe tun before continuning
| -rwxr-xr-x | .scripts/adv_graphgen/parse.py | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | .scripts/autostart/tinc | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/.scripts/adv_graphgen/parse.py b/.scripts/adv_graphgen/parse.py index b0534d93..04b42c33 100755 --- a/.scripts/adv_graphgen/parse.py +++ b/.scripts/adv_graphgen/parse.py @@ -1,4 +1,5 @@ #!/usr/bin/python2 +# -*- coding: utf8 -*- import sys """ TODO: Refactoring needed to pull the edges out of the node structures again, @@ -44,7 +45,8 @@ 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['internal-ip']+"\\l\"" + + node += "internal:"+v.get('internal-ip','¯\\\\(°_o)/¯')+"\\l\"" if v['external-ip'] == "MYSELF": node += ",fillcolor=steelblue1" node += "]" diff --git a/.scripts/autostart/tinc b/.scripts/autostart/tinc index 06d10403..12e77d6a 100644..100755 --- a/.scripts/autostart/tinc +++ b/.scripts/autostart/tinc @@ -25,6 +25,8 @@ TCONF="/etc/tinc" NETSFILE="$TCONF/nets.boot" NETS="" +modprobe tun + test -f $DAEMON || exit 0 [ -r /etc/default/tinc ] && . /etc/default/tinc |