From 8928f9f9303bc6b18c26476703058ca429864301 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 25 May 2011 17:29:12 +0200 Subject: .... --- hosts/Lassulus | 1 + hosts/krebs | 1 + 2 files changed, 2 insertions(+) diff --git a/hosts/Lassulus b/hosts/Lassulus index 7e920411..557a535a 100644 --- a/hosts/Lassulus +++ b/hosts/Lassulus @@ -1,3 +1,4 @@ +Address = 10.42.3.253 Address = 10.9.9.71 Subnet = 10.7.7.11 -----BEGIN RSA PUBLIC KEY----- diff --git a/hosts/krebs b/hosts/krebs index 5c832b42..bb4e6a72 100644 --- a/hosts/krebs +++ b/hosts/krebs @@ -1,3 +1,4 @@ +Address = 10.42.23.5 Subnet = 10.7.7.156 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAl6vUmUL8w8r2gUTpUF8QWx0U3nzDPao2I7l0WU1NnGcR8DVug7YN -- cgit v1.2.3 From 031c9946e8d3f44464291ab1345644a3500bf25b Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Thu, 26 May 2011 10:28:35 +0200 Subject: changed weight-calculation for graphgen --- hosts/.scripts/adv_graphgen/parse.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hosts/.scripts/adv_graphgen/parse.py b/hosts/.scripts/adv_graphgen/parse.py index 27fe3a99..b0534d93 100755 --- a/hosts/.scripts/adv_graphgen/parse.py +++ b/hosts/.scripts/adv_graphgen/parse.py @@ -35,7 +35,10 @@ def merge_edges(nodes): def write_node(k,v): - """ writes a single node and its edges """ + """ writes a single node and its edges + 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" @@ -47,11 +50,12 @@ def write_node(k,v): node += "]" print (node) for con in v.get('to',[]): - edge = " "+k+ " -> " +con['name'] + "[weight="+str(10/float(con['weight'])) + edge = " "+k+ " -> " +con['name'] + "[weight="+str(float(con['weight'])) if con.get('bidirectional',False): edge += ",dir=both" edge += "]" print edge + def parse_input(): nodes={} for line in sys.stdin: -- cgit v1.2.3 From 508bcf9c67cdc6bb42a0bef4655c2c1a27d497be Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Thu, 26 May 2011 13:06:12 +0200 Subject: fixed missing +x in startup script --- hosts/.scripts/autostart/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/.scripts/autostart/Makefile b/hosts/.scripts/autostart/Makefile index 58bfc0c5..7ca589e1 100644 --- a/hosts/.scripts/autostart/Makefile +++ b/hosts/.scripts/autostart/Makefile @@ -1,7 +1,8 @@ -INIT_FOLDER=/etc/rc.d +INIT_FOLDER=/etc/init.d .phony: all all: #TODO change the tinc file before writing cp tinc $(INIT_FOLDER)/tinc + chmod +x $(INIT_FOLDER)/tinc echo "retiolum" > /etc/tinc/nets.boot update-rc.d tinc defaults -- cgit v1.2.3 From b3b1187e2d1cb615405851174f044882346a6815 Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Thu, 26 May 2011 13:59:47 +0200 Subject: 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 --- hosts/.scripts/adv_graphgen/parse.py | 4 +++- hosts/.scripts/autostart/tinc | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) mode change 100644 => 100755 hosts/.scripts/autostart/tinc diff --git a/hosts/.scripts/adv_graphgen/parse.py b/hosts/.scripts/adv_graphgen/parse.py index b0534d93..04b42c33 100755 --- a/hosts/.scripts/adv_graphgen/parse.py +++ b/hosts/.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/hosts/.scripts/autostart/tinc b/hosts/.scripts/autostart/tinc old mode 100644 new mode 100755 index 06d10403..12e77d6a --- a/hosts/.scripts/autostart/tinc +++ b/hosts/.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 -- cgit v1.2.3 From da1225c14e10fd94ed956a08c7bd5ddf99ee9a75 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 26 May 2011 15:51:15 +0200 Subject: ipv6 for supernode + miefda901 --- hosts/Lassulus | 2 +- hosts/alphalabs | 1 + hosts/krebs | 1 - hosts/miefda901 | 1 + hosts/supernode | 2 +- 5 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hosts/Lassulus b/hosts/Lassulus index 48a702bd..5df666e3 100644 --- a/hosts/Lassulus +++ b/hosts/Lassulus @@ -1,4 +1,4 @@ -Address = 10.42.3.253 +Address = 10.9.9.74 Subnet = 10.7.7.11 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAsj1PCibKOfF68gmFQ+wwyfhUWpqKqpznrJX1dZ+daae7l7nBHvsE diff --git a/hosts/alphalabs b/hosts/alphalabs index 6aea1dec..80c0ef6e 100644 --- a/hosts/alphalabs +++ b/hosts/alphalabs @@ -1,3 +1,4 @@ +Address = 10.9.9.10 Subnet = 10.7.7.10 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAvUAbMmmOFn+4kOvJAvmi0R/XCQa1YBlkjUvC6Pmt0Q8gV1DodXjB diff --git a/hosts/krebs b/hosts/krebs index bb4e6a72..5c832b42 100644 --- a/hosts/krebs +++ b/hosts/krebs @@ -1,4 +1,3 @@ -Address = 10.42.23.5 Subnet = 10.7.7.156 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAl6vUmUL8w8r2gUTpUF8QWx0U3nzDPao2I7l0WU1NnGcR8DVug7YN diff --git a/hosts/miefda901 b/hosts/miefda901 index a1b59a29..b9a9156a 100644 --- a/hosts/miefda901 +++ b/hosts/miefda901 @@ -1,4 +1,5 @@ Subnet = 10.7.7.22 +Subnet = 42:23:5:22:0:0:0:0/64 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEApbEYmHf0vEDYa/2aVvWVxEGgC+JJlXcArdxkQooSIpnZfSAfsH0S MFz8v7UkM7EJSwDsFWf+gxyoAORdFpdQm+XQoDqWVZ1e0isYtNluP2C/51s3lu2F diff --git a/hosts/supernode b/hosts/supernode index 6444fe99..f730ca86 100644 --- a/hosts/supernode +++ b/hosts/supernode @@ -1,6 +1,6 @@ Address = miefda.org Subnet = 10.7.7.1 - +Subnet = 42:23:5:1:0:0:0:0/64 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAr3DlBmQxP9UTBCkohK8FCYSk2td4Ov5lQYvC3Adx04lEWHfp+0nP sShYqqN9Aj3iCqj/DHx5jGuSqjyTmmFWIOMM9IwKMo2Oiz/PcBM56N6gzIHuR5wj -- cgit v1.2.3