From f2992565ab8be0544ae328c3d11243131a3b7441 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 2 Feb 2013 00:19:20 +0100 Subject: //retiolum list-known-public-addresses: initial commit --- retiolum/bin/list-known-public-addresses | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100755 retiolum/bin/list-known-public-addresses (limited to 'retiolum') diff --git a/retiolum/bin/list-known-public-addresses b/retiolum/bin/list-known-public-addresses new file mode 100755 index 00000000..d157cea4 --- /dev/null +++ b/retiolum/bin/list-known-public-addresses @@ -0,0 +1,28 @@ +#! /bin/sh +# +# printf '%s %s\n' hostname IP-address for each known public retiolum address +# +set -eu + +cd /etc/tinc/retiolum/hosts + +grep --with-filename '^Address' * | +sed ' + # filter "%s %s %s\n" hostname var val + s/: */ / + s/ *= */ / + # filter "%s %s\n" hostname address + s/ Address \([a-zA-Z0-9.:_]*\) \?.*/ \1/ + T + # prepare hostname lookup + /:/!{/ [0-9.]*$/!{s/ / `dig +short /;s/$/` \&/}} + s/^/echo / + $s/$/\nwait/ + # perform hostname lookup +' | sh | sed ' + # drop private IPv4 addresses + / 10\./d + / 172\.\(1[6-9]\|2[0-9]\|3[01]\)\./d + / 192\.168\./d + # TODO drop private IPv6 addresses +' -- cgit v1.2.3 From c6f8c72d483fdcdf2ba4554ca7f578089df9f1c2 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 2 Feb 2013 01:22:08 +0100 Subject: //retiolum list-known-public-addresses: factorize --- retiolum/bin/list-known-public-addresses | 46 +++++++++++++++++--------------- 1 file changed, 25 insertions(+), 21 deletions(-) (limited to 'retiolum') diff --git a/retiolum/bin/list-known-public-addresses b/retiolum/bin/list-known-public-addresses index d157cea4..d8073791 100755 --- a/retiolum/bin/list-known-public-addresses +++ b/retiolum/bin/list-known-public-addresses @@ -4,25 +4,29 @@ # set -eu -cd /etc/tinc/retiolum/hosts +_list_hostname_address() { + cd /etc/tinc/retiolum/hosts + grep --with-filename '^Address' * | + sed -n ' + s/: */ / + s/ *= */ / + s/ Address \([a-zA-Z0-9.:_]*\) \?.*/ \1/p' +} +_lookup_address() { + sed ' + /:/!{/ [0-9.]*$/!{s/ / `dig +short /;s/$/` \&/}} + s/^/echo / + $s/$/\nwait/ + ' | sh +} +_filter_public() { + sed ' + # drop private IPv4 addresses + / 10\./d + / 172\.\(1[6-9]\|2[0-9]\|3[01]\)\./d + / 192\.168\./d + # TODO drop private IPv6 addresses + ' +} -grep --with-filename '^Address' * | -sed ' - # filter "%s %s %s\n" hostname var val - s/: */ / - s/ *= */ / - # filter "%s %s\n" hostname address - s/ Address \([a-zA-Z0-9.:_]*\) \?.*/ \1/ - T - # prepare hostname lookup - /:/!{/ [0-9.]*$/!{s/ / `dig +short /;s/$/` \&/}} - s/^/echo / - $s/$/\nwait/ - # perform hostname lookup -' | sh | sed ' - # drop private IPv4 addresses - / 10\./d - / 172\.\(1[6-9]\|2[0-9]\|3[01]\)\./d - / 192\.168\./d - # TODO drop private IPv6 addresses -' +_list_hostname_address | _lookup_address | _filter_public -- cgit v1.2.3 From e929315a0b734aab77a68bcfa41f24faf28b8896 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 2 Feb 2013 01:31:29 +0100 Subject: //retiolum list-known-public-addresses: add online filter --- retiolum/bin/list-known-public-addresses | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'retiolum') diff --git a/retiolum/bin/list-known-public-addresses b/retiolum/bin/list-known-public-addresses index d8073791..00d8d4b9 100755 --- a/retiolum/bin/list-known-public-addresses +++ b/retiolum/bin/list-known-public-addresses @@ -28,5 +28,11 @@ _filter_public() { # TODO drop private IPv6 addresses ' } +_filter_online() { + awk ' + {print"nc -zw 2 "$2" 655 2>/dev/null && echo "$1" "$2" &"} + END {print"wait"} + ' | sh +} -_list_hostname_address | _lookup_address | _filter_public +_list_hostname_address | _lookup_address | _filter_public | _filter_online -- cgit v1.2.3 From ae5b25d9c15b598460e44f2fc54168936abaca81 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 2 Feb 2013 01:50:33 +0100 Subject: //retiolum list-known-public-addresses: don't check if online --- retiolum/bin/list-known-public-addresses | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'retiolum') diff --git a/retiolum/bin/list-known-public-addresses b/retiolum/bin/list-known-public-addresses index 00d8d4b9..21b1c389 100755 --- a/retiolum/bin/list-known-public-addresses +++ b/retiolum/bin/list-known-public-addresses @@ -35,4 +35,4 @@ _filter_online() { ' | sh } -_list_hostname_address | _lookup_address | _filter_public | _filter_online +_list_hostname_address | _lookup_address | _filter_public -- cgit v1.2.3 From a5974cc70cd35e6c5daeecc09f8bde687975ba9c Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 3 Feb 2013 11:34:08 +0100 Subject: added Discordius (lassulus' Bruder) --- retiolum/hosts/Discordius | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 retiolum/hosts/Discordius (limited to 'retiolum') diff --git a/retiolum/hosts/Discordius b/retiolum/hosts/Discordius new file mode 100644 index 00000000..561b28ca --- /dev/null +++ b/retiolum/hosts/Discordius @@ -0,0 +1,11 @@ +Subnet = 10.243.144.246 +Subnet = 42:017a:4584:17e1:685a:3991:6533:067b + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAsOoWkyydyfW9ml7SBV8d+qXU8E1c4l0vEpdBnmOouZozo1bzzkH3 +bLn2DkZaOLCqVUC1twbeGi2a7tXHh4dLvkIcT38V3XbEwxHhMn7enpKr79GO/VFf +Lu8t5dLbmPFFTOEeC54ke8X4MdlMrUMuXiGspnl/vc1NBSJIVECl6zdqvZt/UTWA +vI7evk3F+Tf5dPATqSMdxE5506i2y/W6obwYwaXdPbyBsAQkgdTjfVUe2u0GKfld +/THprmZYTwlBEZ3YAf12OdfO1aRsDpbogpZs/rcnebScDj7myzh7FkLHdH9nIfxg +dfGxSBV7kRMwQmgfKjp/yETPjvRz0OMZoQIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From 5b87cdd1f83e8191f01ac9e9c3441e2a47874a20 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 5 Feb 2013 13:10:05 +0100 Subject: retiolum/hosts/nomic2: test dummy --- retiolum/hosts/nomic2 | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 retiolum/hosts/nomic2 (limited to 'retiolum') diff --git a/retiolum/hosts/nomic2 b/retiolum/hosts/nomic2 new file mode 100644 index 00000000..63d83ff5 --- /dev/null +++ b/retiolum/hosts/nomic2 @@ -0,0 +1,10 @@ +Subnet = 10.243.0.111/32 +Subnet = 42:02d5:733f:d6da:c0f5:2bb7:2b18:09ed/128 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA4RATrMG+MJyNq77+qUqoXkBIpUeytIvUNXT5OdvU5v91Xo2eGI23 +NXiFtILDb1nEPB+L4vVWkUKRuPAy+ThgqgTH1vyugT6jRoRhWWmGmSn2GjaF+UxK +edTfGJqO0Iwn0kZsIFxXUibkmG5iRbJBoPXXz33VtNxOv2gZZ6klfv/pYWnrxmLm +RZXkE1H3Y0U2ulQEXvpexzVscfYmlAw7h0Ew4aaY2LK4spLLPjx9RdDgfwZOZdS+ +gi5cmi/qM71/o67/4XippR9+7GQ8YecbeoR4bcZpDNoDy1ri7HPPu/t6CiqsYVyg +jYGBm+IGbwI9hxGel2bXCVBGLE7gpN51TwIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3