From 59ccc0fd871c4bbd12066f2f6aacf835a839885d Mon Sep 17 00:00:00 2001
From: makefu <root@pigstarter.de>
Date: Fri, 8 Feb 2013 10:10:43 +0000
Subject: add nodes-to-json: parses retiolum/hosts folder into json

---
 retiolum/bin/find-supernodes             | 21 ++++++++++++++++++
 retiolum/bin/my-ip                       |  2 --
 retiolum/bin/nodes-to-json.py            | 37 ++++++++++++++++++++++++++++++++
 retiolum/scripts/adv_graphgen/find_super | 21 ------------------
 4 files changed, 58 insertions(+), 23 deletions(-)
 create mode 100755 retiolum/bin/find-supernodes
 delete mode 100755 retiolum/bin/my-ip
 create mode 100644 retiolum/bin/nodes-to-json.py
 delete mode 100755 retiolum/scripts/adv_graphgen/find_super

diff --git a/retiolum/bin/find-supernodes b/retiolum/bin/find-supernodes
new file mode 100755
index 00000000..2c316d0e
--- /dev/null
+++ b/retiolum/bin/find-supernodes
@@ -0,0 +1,21 @@
+#! /bin/dash
+set -eu
+cd /etc/tinc/retiolum/hosts
+for name in `
+  grep '^[[:space:]]*Address[[:space:]]*=' * |
+    cut -d: -f1 | sort | uniq
+`; do
+  if eval "`sed -n '
+      s/[[:space:]]\+//g
+      s/^\(Address\|Port\)=\(.*\)/\1="\${\1+\$\1\n}\2"/p
+    ' $name`"; then
+    port=${Port-655}
+    for host in $Address; do
+      if nc -zw 2 $host $port 2>/dev/null; then
+        echo "$name [('$host', $port)]"
+      fi &
+    done
+    wait
+  fi &
+done
+wait
diff --git a/retiolum/bin/my-ip b/retiolum/bin/my-ip
deleted file mode 100755
index fcfbba05..00000000
--- a/retiolum/bin/my-ip
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-curl http://euer.krebsco.de/live/ip.php
diff --git a/retiolum/bin/nodes-to-json.py b/retiolum/bin/nodes-to-json.py
new file mode 100644
index 00000000..ca9d3c8c
--- /dev/null
+++ b/retiolum/bin/nodes-to-json.py
@@ -0,0 +1,37 @@
+#!/usr/bin/python
+
+def parse_hosts_path(path="/etc/tinc/retiolum/hosts"):
+  import os
+  import re
+
+  needle_addr = re.compile("Subnet\s*=\s*(.*)/[0-9]+")
+  needle_port = re.compile("Port\s*=\s*(.*)")
+  for f in os.listdir(path):
+    with open(path+"/"+f) as of:
+      addrs = []
+      port = "655"
+
+      for line in of.readlines():
+
+        addr_found = needle_addr.match(line)
+        if addr_found:
+          addrs.append(addr_found.group(1))
+
+        port_found = needle_port.match(line)
+        if port_found:
+          port = port_found.group(1)
+      
+      if addrs : yield (f ,[(addr ,int(port)) for addr in addrs])
+
+
+
+if __name__ == "__main__":
+  """
+  usage
+  """
+  import json
+  import sys
+  db={}
+  for host,addrs in parse_hosts_path(sys.argv[1] if len(sys.argv) > 2 else "/etc/tinc/retiolum/hosts"):
+    db[host] = addrs
+  print(json.dumps(db))
diff --git a/retiolum/scripts/adv_graphgen/find_super b/retiolum/scripts/adv_graphgen/find_super
deleted file mode 100755
index 2c316d0e..00000000
--- a/retiolum/scripts/adv_graphgen/find_super
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/dash
-set -eu
-cd /etc/tinc/retiolum/hosts
-for name in `
-  grep '^[[:space:]]*Address[[:space:]]*=' * |
-    cut -d: -f1 | sort | uniq
-`; do
-  if eval "`sed -n '
-      s/[[:space:]]\+//g
-      s/^\(Address\|Port\)=\(.*\)/\1="\${\1+\$\1\n}\2"/p
-    ' $name`"; then
-    port=${Port-655}
-    for host in $Address; do
-      if nc -zw 2 $host $port 2>/dev/null; then
-        echo "$name [('$host', $port)]"
-      fi &
-    done
-    wait
-  fi &
-done
-wait
-- 
cgit v1.2.3