Merge branch 'master' of github.com:miefda/retiolum

4 files changed, 111 insertions, 12 deletions

diff --git a/.pubkeys/5eruun b/.pubkeys/5eruun
deleted file mode 100644
index ce24501f..00000000
--- a/.pubkeys/5eruun
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/YOSX4xEKitiVzIP0xFU
-KQvC01uKN+KCT2Y7H8MFzowB+GWdVvplRi8TukMF1EYlIZoSIrgPO/SoOFZNvxPa
-83I6PeN6W830qKpUt3xYMqyuL2ZJw1hvhsgPWbGXF2yA39mQas9Skf2SNnEJppFp
-N8mGw449PLhTFmGoR3x3354kgO40zts4qqvpMcyTOx+zQhnGBO4KQqftJU1klgCc
-YUHrN+ql5vq3u6YgMpUIczPnhN6Cnm+jhys6sTXN/DFcpq6YGXTHSGZO1JTuAyfZ
-HfXXgUtIbW5W03LLtkYcMIiaIafe+qivtAs3cZIEKZVp+1fdfypQok6nDPwC1jy8
-TwIDAQAB
------END PUBLIC KEY-----
diff --git a/.scripts/adv_graphgen/parse.py b/.scripts/adv_graphgen/parse.py
index 27fe3a99..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,
@@ -35,23 +36,28 @@ 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"
   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 += "]"
   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:
diff --git a/.scripts/autostart/Makefile b/.scripts/autostart/Makefile
new file mode 100644
index 00000000..7ca589e1
--- /dev/null
+++ b/.scripts/autostart/Makefile
@@ -0,0 +1,8 @@
+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
diff --git a/.scripts/autostart/tinc b/.scripts/autostart/tinc
new file mode 100755
index 00000000..12e77d6a
--- /dev/null
+++ b/.scripts/autostart/tinc
@@ -0,0 +1,94 @@
+#! /bin/sh
+#
+### BEGIN INIT INFO
+# Provides:          tinc
+# Required-Start:    $remote_fs $network
+# Required-Stop:     $remote_fs $network
+# Should-Start:      $syslog $named
+# Should-Stop:       $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start tinc daemons
+# Description:       Create a file $NETSFILE (/etc/tinc/nets.boot),
+#                    and put all the names of the networks in there.
+#                    These names must be valid directory names under
+#                    $TCONF (/etc/tinc). Lines starting with a # will be
+#                    ignored in this file.
+### END INIT INFO
+#
+# Based on Lubomir Bulej's Redhat init script.
+
+DAEMON="/usr/sbin/tincd"
+NAME="tinc"
+DESC="tinc daemons"
+TCONF="/etc/tinc"
+NETSFILE="$TCONF/nets.boot"
+NETS=""
+
+modprobe tun
+
+test -f $DAEMON || exit 0
+
+[ -r /etc/default/tinc ] && . /etc/default/tinc
+
+# foreach_net "what-to-say" action [arguments...]
+foreach_net() {
+  if [ ! -f $NETSFILE ] ; then
+    echo "Please create $NETSFILE."
+    exit 0
+  fi
+  echo -n "$1"
+  shift
+  egrep '^[ ]*[a-zA-Z0-9_-]+' $NETSFILE | while read net args; do
+    echo -n " $net"
+    "$@" $net $args
+  done
+  echo "."
+}
+
+start() {
+  $DAEMON $EXTRA -n "$@"
+}
+stop() {
+  $DAEMON -n $1 -k
+}
+reload() {
+  $DAEMON -n $1 -kHUP
+}
+restart() {
+  stop "$@"
+  sleep 0.5
+  i=0;
+  while [ -f /var/run/tinc.$1.pid ] ; do
+  if [ $i = '10' ] ; then
+    break
+  else
+    echo -n "."
+    sleep 0.5
+    i=$(($i+1))
+  fi    
+  done
+  start "$@"
+}
+
+case "$1" in
+  start)
+    foreach_net "Starting $DESC:" start
+  ;;
+  stop)
+    foreach_net "Stopping $DESC:" stop
+  ;;
+  reload|force-reload)
+    foreach_net "Reloading $DESC configuration:" reload
+  ;;
+  restart)
+    foreach_net "Restarting $DESC:" restart
+  ;;
+  *)
+    echo "Usage: /etc/init.d/$NAME {start|stop|reload|restart|force-reload}"
+    exit 1
+  ;;
+esac
+
+exit 0
+