[PATCH 2/4] Add package fff-vpn
Tim Niemeyer
tim at tn-x.org
Sa Mai 7 23:33:54 CEST 2016
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Hi
Am 3. Mai 2016 21:24:57 MESZ, schrieb Robert Langhammer <rlanghammer at web.de>:
>Signed-off-by: Robert Langhammer <rlanghammer at web.de>
>---
>src/packages/fff/fff-vpn/Makefile | 39
>+++++++++++++++++++
>src/packages/fff/fff-vpn/files/usr/sbin/fff-vpn | 50
>+++++++++++++++++++++++++
> src/packages/fff/fff/Makefile | 6 ++-
> 3 files changed, 93 insertions(+), 2 deletions(-)
> create mode 100644 src/packages/fff/fff-vpn/Makefile
> create mode 100644 src/packages/fff/fff-vpn/files/usr/sbin/fff-vpn
>
>diff --git a/src/packages/fff/fff-vpn/Makefile
>b/src/packages/fff/fff-vpn/Makefile
>new file mode 100644
>index 0000000..976375a
>--- /dev/null
>+++ b/src/packages/fff/fff-vpn/Makefile
>@@ -0,0 +1,39 @@
>+include $(TOPDIR)/rules.mk
>+
>+PKG_NAME:=fff-vpn
>+PKG_VERSION:=1
>+PKG_RELEASE:=1
>+
>+PKG_BUILD_DIR:=$(BUILD_DIR)/fff-vpn
>+
>+include $(INCLUDE_DIR)/package.mk
>+
>+define Package/fff-vpn
>+ SECTION:=base
>+ CATEGORY:=Freifunk
>+ TITLE:= Freifunk-Franken vpn
>+ URL:=http://www.freifunk-franken.de
>+endef
>+
>+define Package/fff-vpn/description
>+ This selects the vpn-tunnel for the Freifunk Franken Firmware
>+ When a Gateway announces a Broker, l2tp is preferred
>+endef
>+
>+define Build/Prepare
>+ echo "all: " > $(PKG_BUILD_DIR)/Makefile
>+endef
>+
>+define Build/Configure
>+ # nothing
>+endef
>+
>+define Build/Compile
>+ # nothing
>+endef
>+
>+define Package/fff-vpn/install
>+ $(CP) ./files/* $(1)/
>+endef
>+
>+$(eval $(call BuildPackage,fff-vpn))
>diff --git a/src/packages/fff/fff-vpn/files/usr/sbin/fff-vpn
>b/src/packages/fff/fff-vpn/files/usr/sbin/fff-vpn
>new file mode 100644
>index 0000000..8ac62d1
>--- /dev/null
>+++ b/src/packages/fff/fff-vpn/files/usr/sbin/fff-vpn
>@@ -0,0 +1,50 @@
>+# sourced by faststart
>+/etc/init.d/tunneldigger disable && sed -i '/tunneldigger disable/d'
>$0
>+broker=no
>+fastd=no
>+count=0
>+conf="/etc/config/tunneldigger"
>+conftmp="/tmp/tunneldigger.conf.tmp"
>+>$conftmp
>+peers=$(ls /etc/fastd/fff/peers)
>+
>+for peer in $peers; do
>+ ip=$(grep ipv4 /etc/fastd/fff/peers/$peer | cut -f2 -d "\"")
>+ # ask gateway
>+ vpn=$(wget http://$ip/vpn.txt -O - 2>/dev/nuTim
Ich bin nach wie vor dafür, dass wir die Entscheidung hier nicht von einem txt file auf dem GW abhängig machen sollten, sondern den dez.keyXchange nutzen sollten.
>+ if [ "$vpn" = "l2tp" ]; then
>+ broker=yes
>+ #write l2tp config
>+ fdport=$(greo ipv4 /etc/fastd/fff/peers/$peer | cut -f5 -d " " | tr
>-d \;)
>+ brport=$((fdport + 10000))
>+ echo "config broker
>+ list address '$ip:$brport'
>+ option uuid '_$hostname'
>+ option interface 'l2tp$count'
>+ option enabled '1'
>+ option hook_script '/etc/tunneldigger.hook'
>+ " >> $conftmp
>+ count=$((count + 1))
>+ #remove peer
>+ rm /etc/fastd/fff/peers/$peer
>+ else
>+ fastd=yes
>+ fi
>+done
>+
>+if [ "$broker" = "yes" ]; then
>+ if !(diff $conftmp $conf &>/dev/null) ; then
>+ #broker changed
>+ /etc/init.d/tunneldigger stop
>+ # remove pid-files
>+ rm /var/run/tunneldigger* 2>/dev/null
>+ #copy new config
>+ cp $conftmp $conf
>+ fi
>+ /etc/init.d/tunneldigger start
>+fi
>+
>+if [ "$fastd" = "no" ]; then
>+ kill -TERM $(cat /var/run/fastd.$project.pid)
Fastd erst starten lassen, um es dann zu töten? Nicht so schön.
>+ etxit
Tippfehler.
Tim
>+fi
>diff --git a/src/packages/fff/fff/Makefile
>b/src/packages/fff/fff/Makefile
>index e709987..662b6d2 100644
>--- a/src/packages/fff/fff/Makefile
>+++ b/src/packages/fff/fff/Makefile
>@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
>
> PKG_NAME:=fff
> PKG_VERSION:=0.0.2
>-PKG_RELEASE:=1
>+PKG_RELEASE:=2
>
> PKG_BUILD_DIR:=$(BUILD_DIR)/fff
>
>@@ -20,7 +20,9 @@ define Package/fff-base
> +fff-uradvd \
> +fff-batman-adv-legacy \
> +fff-fastd \
>- +fff-firewall
>+ +fff-firewall \
>+ +fff-tunneldigger \
>+ +fff-vpn
> endef
>
> define Package/fff-base/description
-----BEGIN PGP SIGNATURE-----
iQE5BAEBCgAjHBxUaW0gTmllbWV5ZXIgPHRpbUB0bi14Lm9yZz4FAlcuXzEACgkQ
ELiw0DPkKM/Pgwf/V6CH5T1G3rV+PCaeCi0BH1kXPiPCPhmESFzkNHfFjZ35GxLF
oLbUrCycl2D5QNyk4IWLd/CXsrgLKIZ/zq+JsmoPc/+SPdOKYxedYZqmmkKv+uvV
c6hjv0rP/zHaJqto8JhCv3/V/iyS5x8oUP+i+OzwVngnujLShuvsYFD5FtkXeUOf
T+IWaIzZD6k4jvit00a0/y9vkJqzTeWiwIlQVipn/U53kCjVX5AZ0SSwgTgNhIN8
x7Ba2t3H2xCBV73anmR47CWQD6vnMu5Hpv5WJePf3+8gbLaaSMqnlRAZvkHb+sBI
05H7ZRsEfCfxNvNOKmScDH1trr/471XOvKKXsQ==
=oKBs
-----END PGP SIGNATURE-----
Mehr Informationen über die Mailingliste franken-dev