Factor out some new libraries

	word64-map:
		Data.Word64Map
	network-addr:
		Network.Address
	tox-crypto:
		Crypto.Tox
	lifted-concurrent:
		Control.Concurrent.Lifted.Instrument
		Control.Concurrent.Async.Lifted.Instrument
	psq-wrap:
		Data.Wrapper.PSQInt
		Data.Wrapper.PSQ
	minmax-psq:
		Data.MinMaxPSQ
        tasks:
                Control.Concurrent.Tasks
	kad:
		Network.Kademlia
		Network.Kademlia.Bootstrap
		Network.Kademlia.Routing
		Network.Kademlia.CommonAPI
		Network.Kademlia.Persistence
		Network.Kademlia.Search

8 files changed, 252 insertions, 0 deletions

diff --git a/dht/vnet/build.sh b/dht/vnet/build.sh
new file mode 100755
index 00000000..5354969a
--- /dev/null
+++ b/dht/vnet/build.sh
@@ -0,0 +1,93 @@
+#!/bin/sh
+
+
+wire() {
+    ip link add $1   \
+           type veth \
+      peer name $2
+}
+
+set -x
+
+# Not using this...
+buildhub() {
+        wire hub0 ep0
+        wire hub1 ep1
+        wire hub2 ep2
+        wire hub3 ep3
+        wire hub4 ep4
+        wire hub5 ep5
+        wire hub6 ep6
+        wire hub7 ep7
+
+        wire hub8 ep8
+        wire hub9 ep9
+        wire hubA epA
+        wire hubB epB
+        wire hubC epC
+        wire hubD epD
+        wire hubE epE
+        wire hubF epF
+
+        brctl addbr hub
+        brctl addif hub hub0
+        brctl addif hub hub1
+        brctl addif hub hub2
+        brctl addif hub hub3
+        brctl addif hub hub4
+        brctl addif hub hub5
+        brctl addif hub hub6
+        brctl addif hub hub7
+        brctl addif hub hub8
+        brctl addif hub hub9
+        brctl addif hub hubA
+        brctl addif hub hubB
+        brctl addif hub hubC
+        brctl addif hub hubD
+        brctl addif hub hubE
+        brctl addif hub hubF
+
+        ip addr add 222.0.0.1 dev hub
+}
+
+# This is simpler...
+buildtaps() {
+    ip tuntap add ep0 mode tap
+    ip tuntap add ep1 mode tap
+    ip tuntap add ep2 mode tap
+    ip tuntap add ep3 mode tap
+    ip tuntap add ep4 mode tap
+    ip tuntap add ep5 mode tap
+    ip tuntap add ep6 mode tap
+    ip tuntap add ep7 mode tap
+    ip tuntap add ep8 mode tap
+    ip tuntap add ep9 mode tap
+    ip tuntap add epA mode tap
+    ip tuntap add epB mode tap
+    ip tuntap add epC mode tap
+    ip tuntap add epD mode tap
+    ip tuntap add epE mode tap
+    ip tuntap add epF mode tap
+}
+
+buildtaps
+
+num=$(ip addr show wlan0 | sed -n '/\s\+inet 192/ s/\s\+inet 192\.168\.[0-9]*\.\([0-9]*\).*$/\1/ p')
+num=${num:-88}
+
+ip addr add 80.$num.99.99 dev ep0
+ip addr add 81.$num.99.99 dev ep1
+ip addr add 82.$num.99.99 dev ep2
+ip addr add 83.$num.99.99 dev ep3
+ip addr add 84.$num.99.99 dev ep4
+ip addr add 85.$num.99.99 dev ep5
+ip addr add 86.$num.99.99 dev ep6
+ip addr add 87.$num.99.99 dev ep7
+ip addr add 88.$num.99.99 dev ep8
+ip addr add 89.$num.99.99 dev ep9
+ip addr add 90.$num.99.99 dev epA
+ip addr add 91.$num.99.99 dev epB
+ip addr add 92.$num.99.99 dev epC
+ip addr add 93.$num.99.99 dev epD
+ip addr add 94.$num.99.99 dev epE
+ip addr add 95.$num.99.99 dev epF
diff --git a/dht/vnet/clean.sh b/dht/vnet/clean.sh
new file mode 100755
index 00000000..3e0af1bd
--- /dev/null
+++ b/dht/vnet/clean.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+cleanhub() {
+        brctl delbr hub
+
+        ip link del hub0
+        ip link del hub1
+        ip link del hub2
+        ip link del hub3
+        ip link del hub4
+        ip link del hub5
+        ip link del hub6
+        ip link del hub7
+
+        ip link del hub8
+        ip link del hub9
+        ip link del hubA
+        ip link del hubB
+        ip link del hubC
+        ip link del hubD
+        ip link del hubE
+        ip link del hubF
+}
+
+cleantaps()
+{
+        ip link del ep0
+        ip link del ep1
+        ip link del ep2
+        ip link del ep3
+        ip link del ep4
+        ip link del ep5
+        ip link del ep6
+        ip link del ep7
+
+        ip link del ep8
+        ip link del ep9
+        ip link del epA
+        ip link del epB
+        ip link del epC
+        ip link del epD
+        ip link del epE
+        ip link del epF
+}
+
+cleantaps
+
+rm -rf ep0 ep1 ep2 ep3 ep4 ep5 ep6 ep7 \
+       ep8 ep9 epA epB epC epD epE epF
diff --git a/dht/vnet/everywhere.sh b/dht/vnet/everywhere.sh
new file mode 100755
index 00000000..ebd4ca38
--- /dev/null
+++ b/dht/vnet/everywhere.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+cmd="$@"
+for ep in ep?
+do
+    ( cd $ep
+      $cmd
+      )
+done
diff --git a/dht/vnet/mkroutes.sh b/dht/vnet/mkroutes.sh
new file mode 100755
index 00000000..8b13faaa
--- /dev/null
+++ b/dht/vnet/mkroutes.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+host=$1
+num=${1#*.*.*.}
+ip route add 80.$num.99.99/32 via $host
+ip route add 80.$num.99.99/32 via $host
+ip route add 81.$num.99.99/32 via $host
+ip route add 82.$num.99.99/32 via $host
+ip route add 83.$num.99.99/32 via $host
+ip route add 84.$num.99.99/32 via $host
+ip route add 85.$num.99.99/32 via $host
+ip route add 86.$num.99.99/32 via $host
+ip route add 87.$num.99.99/32 via $host
+ip route add 88.$num.99.99/32 via $host
+ip route add 89.$num.99.99/32 via $host
+ip route add 90.$num.99.99/32 via $host
+ip route add 91.$num.99.99/32 via $host
+ip route add 92.$num.99.99/32 via $host
+ip route add 93.$num.99.99/32 via $host
+ip route add 94.$num.99.99/32 via $host
+ip route add 95.$num.99.99/32 via $host
diff --git a/dht/vnet/run.sh b/dht/vnet/run.sh
new file mode 100755
index 00000000..0189b6b7
--- /dev/null
+++ b/dht/vnet/run.sh
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+[ -L ./dhtd ] || ( echo "Missing symbolic link to your build: ./dhtd" ; exit 1 )
+
+mkdir -p ep0 ep1 ep2 ep3 ep4 ep5 ep6 ep7 \
+         ep8 ep9 epA epB epC epD epE epF
+
+rm -f window-count
+echo detach > detached
+
+screen -S test -s ./screen-shell.sh -c detached
+sleep 0.5
+screen -S test -X screen
+sleep 0.5
+screen -S test -X screen
+sleep 0.5
+screen -S test -X screen
+sleep 0.5
+
+screen -S test -X screen
+sleep 0.5
+screen -S test -X screen
+sleep 0.5
+screen -S test -X screen
+sleep 0.5
+screen -S test -X screen
+sleep 0.5
+
+screen -S test -X screen
+sleep 0.5
+screen -S test -X screen
+sleep 0.5
+screen -S test -X screen
+sleep 0.5
+screen -S test -X screen
+sleep 0.5
+
+screen -S test -X screen
+sleep 0.5
+screen -S test -X screen
+sleep 0.5
+screen -S test -X screen
+sleep 0.5
+screen -S test -X screen
+sleep 0.5
diff --git a/dht/vnet/screen-everywhere.sh b/dht/vnet/screen-everywhere.sh
new file mode 100755
index 00000000..e4f75374
--- /dev/null
+++ b/dht/vnet/screen-everywhere.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+cmd="$@"
+echo "$cmd" > /tmp/screen-exchange
+screen -S test -X eval readbuf \
+    "select 15" "paste ." \
+    "select 14" "paste ." \
+    "select 13" "paste ." \
+    "select 12" "paste ." \
+    "select 11" "paste ." \
+    "select 10" "paste ." \
+    "select 9" "paste ." \
+    "select 8" "paste ." \
+    "select 7" "paste ." \
+    "select 6" "paste ." \
+    "select 5" "paste ." \
+    "select 5" "paste ." \
+    "select 4" "paste ." \
+    "select 3" "paste ." \
+    "select 2" "paste ." \
+    "select 1" "paste ." \
+    "select 0" "paste ."
diff --git a/dht/vnet/screen-shell.sh b/dht/vnet/screen-shell.sh
new file mode 100755
index 00000000..fa420b9d
--- /dev/null
+++ b/dht/vnet/screen-shell.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+ifaddr() {
+    ip -o address show dev $1 | sed -n 's#.* inet \([^ /]*\).*#\1#p'
+}
+touch window-count
+count=$(cat window-count)
+count=${count:-(-1)}
+count=$(( $count + 1 ))
+echo $count > window-count
+digit=$(printf '%X' $count)
+cd ep$digit
+port=$(( 33400 + $count ))
+pwd
+../dhtd tox=$(ifaddr ep$digit):$port,bt=,xmpp=
diff --git a/dht/vnet/show-links.sh b/dht/vnet/show-links.sh
new file mode 100755
index 00000000..d7115a0b
--- /dev/null
+++ b/dht/vnet/show-links.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+ip -o link | sed 's/\([^:]*:[^:]*:*\).*/\1/'