gnunet: update source, enable local iperf and echo services

Signed-off-by: Daniel Golle <redacted>

diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile
index 808039de9342364bf0d160390e607929e7afad62..9660a314f08b53e70a557eeb51fed6f3eb5675b0 100644 (file)
--- a/net/gnunet/Makefile
+++ b/net/gnunet/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gnunet
-PKG_SOURCE_VERSION:=36127
+PKG_SOURCE_VERSION:=36139
 PKG_VERSION:=0.10.1-svn$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 

diff --git a/net/gnunet/files/gnunet.init b/net/gnunet/files/gnunet.init
index aa0774a6d64ba0d10c838ce9cb511e290866f33b..8b810d7b0d342d4d00ba5687e9b4390ebe337c54 100644 (file)
--- a/net/gnunet/files/gnunet.init
+++ b/net/gnunet/files/gnunet.init
@@ -55,7 +55,10 @@ prepare_config() {
        gnunet-config -c $CONFIGFILE -s namestore-sqlite -o FILENAME -V /etc/gnunet/namestore.sqlite
 
        # minimal datastore (todo: make this configurable)
+       gnunet-config -c $CONFIGFILE -s datastore -o DATABASE -V heap
        gnunet-config -c $CONFIGFILE -s datastore -o QUOTA -V "4 MB"
+       gnunet-config -c $CONFIGFILE -s fs -o CONTENT_PUSHING -V NO
+       gnunet-config -c $CONFIGFILE -s fs -o CONTENT_CACHING -V NO
 
        # limit dhtcache memory usage to 4 MB
        gnunet-config -c $CONFIGFILE -s dhtcache -o QUOTA -V "4 MB"
@@ -73,6 +76,19 @@ prepare_config() {
                        transport_plugins="$transport_plugins $transplug"
        done
        gnunet-config -c $CONFIGFILE -s transport -o PLUGINS -V "$transport_plugins"
+
+       gnunet-config -c $CONFIGFILE -s pt -o FORCESTART -V YES
+       gnunet-config -c $CONFIGFILE -s exit -o AUTOSTART -V YES
+       gnunet-config -c $CONFIGFILE -s exit -o FORCESTART -V YES
+       gnunet-config -c $CONFIGFILE -s exit -o EXIT_IPV4 -V YES
+       # ssh and www services
+#      gnunet-config -c $CONFIGFILE -s exit -o EXIT_RANGE_IPV4_POLICY -V "169.254.86.1:22;169.254.86.1:80;"
+#      gnunet-config -c $CONFIGFILE -s ssh.gnunet. -o TCP_REDIRECTS -V "22:169.254.86.1:22"
+#      gnunet-config -c $CONFIGFILE -s www.gnunet. -o TCP_REDIRECTS -V "80:169.254.86.1:80"
+       # iperf (TCP) and echo (UDP) for battlemesh
+       gnunet-config -c $CONFIGFILE -s exit -o EXIT_RANGE_IPV4_POLICY -V "169.254.86.1:7;169.254.86.1:5201;"
+       gnunet-config -c $CONFIGFILE -s iperf.gnunet. -o TCP_REDIRECTS -V "5201:169.254.86.1:5201"
+       gnunet-config -c $CONFIGFILE -s echo.gnunet. -o UDP_REDIRECTS -V "7:169.254.86.1:7"
 }
 
 start_service() {