Message ID | 20190627062007.25343-1-rlanghammer@web.de |
---|---|
State | Superseded |
Headers | show |
diff --git a/src/packages/fff/fff-vpn-select/Makefile b/src/packages/fff/fff-vpn-select/Makefile index 7bc3375..0bf4d5e 100644 --- a/src/packages/fff/fff-vpn-select/Makefile +++ b/src/packages/fff/fff-vpn-select/Makefile @@ -1,8 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-vpn-select -PKG_VERSION:=3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) @@ -14,13 +13,12 @@ define Package/$(PKG_NAME) TITLE:= Freifunk-Franken vpn-select URL:=http://www.freifunk-franken.de DEPENDS:=+@BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT \ - +fff-tunneldigger \ +fff-fastd endef define Package/$(PKG_NAME)/description This package selects and starts the VPN - In this version fastd and l2tp via tunneldigger + (currently only via fastd) endef define Build/Prepare diff --git a/src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select b/src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select index 58e48c4..b3efc6b 100755 --- a/src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select +++ b/src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select @@ -8,9 +8,7 @@ hoodfile="$1" make_config() { # remove old config ->/etc/config/tunneldigger rm /tmp/fastd_fff_peers/* -count=0 Index=1 json_load "$(cat "$hoodfile")" json_select vpn @@ -29,24 +27,6 @@ do echo "remote \"${address}\" port ${port};" >> "$filename" echo "" >> "$filename" echo "float yes;" >> "$filename" - - # ask for Broker and select the tunnel - if [ "l2tp" = "$(wget -T10 "${address}/vpn.txt" -O - 2>/dev/null)" ]; then - # Gateway offers l2tp - L2PORT=$((port + 10000)) - UUID=$hostname - - uci set tunneldigger.$count=broker - uci set tunneldigger.$count.address="${address}:$L2PORT" - uci set tunneldigger.$count.uuid="$UUID" - uci set tunneldigger.$count.interface="l2tp$count" - uci set tunneldigger.$count.enabled="1" - uci set tunneldigger.$count.hook_script='/etc/tunneldigger/tunneldigger.hook' - uci -c /tmp commit tunneldigger - count=$((count + 1)) - # remove this fastd-peer - rm "$filename" - fi fi json_select ".." # back to vpn Index=$(( Index + 1 )) @@ -58,25 +38,14 @@ json_select ".." # back to root # Only do something if file is there and not empty; otherwise exit 1 if [ -s "$hoodfile" ]; then - # set some vars - hostname=$(cat /proc/sys/kernel/hostname) - mac=$(awk '{ mac=toupper($1); gsub(":", "", mac); print mac }' /sys/class/net/br-mesh/address 2>/dev/null) - [ "$hostname" = "LEDE" ] && hostname="" - [ "$hostname" = "" ] && hostname="$mac" - if [ ! -d /tmp/fastd_fff_peers ]; then # first run after reboot mkdir /tmp/fastd_fff_peers make_config - # start fastd only if there are some peers left + # start fastd only if there are some peers [ "$(ls /etc/fastd/fff/peers/* 2>/dev/null)" ] && /etc/init.d/fastd start - /etc/init.d/tunneldigger start else - # check if new tunneldigger conf is different - sumold=$(sha256sum /etc/config/tunneldigger) make_config - sumnew=$(sha256sum /etc/config/tunneldigger) - [ "$sumnew" != "$sumold" ] && /etc/init.d/tunneldigger restart /etc/init.d/fastd reload # fastd start/stop for various situations diff --git a/src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-stop b/src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-stop index 9d7fd9a..03a160b 100755 --- a/src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-stop +++ b/src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-stop @@ -1,7 +1,5 @@ #!/bin/sh ->/etc/config/tunneldigger rm /tmp/fastd_fff_peers/* /etc/init.d/fastd stop -/etc/init.d/tunneldigger stop
Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Hab gerade alle Patches nochmal in Reihe geschickt und dabei das Review gleich mit. Grüße Adrian > -----Original Message----- > From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf Of > Robert Langhammer > Sent: Donnerstag, 27. Juni 2019 08:20 > To: franken-dev@freifunk.net > Subject: [PATCH v2 3/3] fff-vpn-select: remove tunneldigger > > Signed-off-by: Robert Langhammer <rlanghammer@web.de> > > --- > Changes in v2: > * Do not remove the fastd start-stop mechanism to prevent fastd running > without peers. > * Increment PKG_RELEASE > --- > --- > src/packages/fff/fff-vpn-select/Makefile | 6 ++-- > .../fff-vpn-select/files/usr/sbin/vpn-select | 33 +------------------ > .../fff-vpn-select/files/usr/sbin/vpn-stop | 2 -- > 3 files changed, 3 insertions(+), 38 deletions(-) > > diff --git a/src/packages/fff/fff-vpn-select/Makefile b/src/packages/fff/fff-vpn- > select/Makefile > index 7bc3375..0bf4d5e 100644 > --- a/src/packages/fff/fff-vpn-select/Makefile > +++ b/src/packages/fff/fff-vpn-select/Makefile > @@ -1,8 +1,7 @@ > include $(TOPDIR)/rules.mk > > PKG_NAME:=fff-vpn-select > -PKG_VERSION:=3 > -PKG_RELEASE:=1 > +PKG_RELEASE:=2 > > PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) > > @@ -14,13 +13,12 @@ define Package/$(PKG_NAME) > TITLE:= Freifunk-Franken vpn-select > URL:=http://www.freifunk-franken.de > DEPENDS:=+@BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT \ > - +fff-tunneldigger \ > +fff-fastd > endef > > define Package/$(PKG_NAME)/description > This package selects and starts the VPN > - In this version fastd and l2tp via tunneldigger > + (currently only via fastd) > endef > > define Build/Prepare > diff --git a/src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select > b/src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select > index 58e48c4..b3efc6b 100755 > --- a/src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select > +++ b/src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select > @@ -8,9 +8,7 @@ hoodfile="$1" > > make_config() { > # remove old config > ->/etc/config/tunneldigger > rm /tmp/fastd_fff_peers/* > -count=0 > Index=1 > json_load "$(cat "$hoodfile")" > json_select vpn > @@ -29,24 +27,6 @@ do > echo "remote \"${address}\" port ${port};" >> "$filename" > echo "" >> "$filename" > echo "float yes;" >> "$filename" > - > - # ask for Broker and select the tunnel > - if [ "l2tp" = "$(wget -T10 "${address}/vpn.txt" -O - 2>/dev/null)" > ]; then > - # Gateway offers l2tp > - L2PORT=$((port + 10000)) > - UUID=$hostname > - > - uci set tunneldigger.$count=broker > - uci set > tunneldigger.$count.address="${address}:$L2PORT" > - uci set tunneldigger.$count.uuid="$UUID" > - uci set tunneldigger.$count.interface="l2tp$count" > - uci set tunneldigger.$count.enabled="1" > - uci set > tunneldigger.$count.hook_script='/etc/tunneldigger/tunneldigger.hook' > - uci -c /tmp commit tunneldigger > - count=$((count + 1)) > - # remove this fastd-peer > - rm "$filename" > - fi > fi > json_select ".." # back to vpn > Index=$(( Index + 1 )) > @@ -58,25 +38,14 @@ json_select ".." # back to root > > # Only do something if file is there and not empty; otherwise exit 1 > if [ -s "$hoodfile" ]; then > - # set some vars > - hostname=$(cat /proc/sys/kernel/hostname) > - mac=$(awk '{ mac=toupper($1); gsub(":", "", mac); print mac }' > /sys/class/net/br-mesh/address 2>/dev/null) > - [ "$hostname" = "LEDE" ] && hostname="" > - [ "$hostname" = "" ] && hostname="$mac" > - > if [ ! -d /tmp/fastd_fff_peers ]; then > # first run after reboot > mkdir /tmp/fastd_fff_peers > make_config > - # start fastd only if there are some peers left > + # start fastd only if there are some peers > [ "$(ls /etc/fastd/fff/peers/* 2>/dev/null)" ] && /etc/init.d/fastd > start > - /etc/init.d/tunneldigger start > else > - # check if new tunneldigger conf is different > - sumold=$(sha256sum /etc/config/tunneldigger) > make_config > - sumnew=$(sha256sum /etc/config/tunneldigger) > - [ "$sumnew" != "$sumold" ] && /etc/init.d/tunneldigger restart > /etc/init.d/fastd reload > > # fastd start/stop for various situations > diff --git a/src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-stop > b/src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-stop > index 9d7fd9a..03a160b 100755 > --- a/src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-stop > +++ b/src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-stop > @@ -1,7 +1,5 @@ > #!/bin/sh > > ->/etc/config/tunneldigger > rm /tmp/fastd_fff_peers/* > /etc/init.d/fastd stop > -/etc/init.d/tunneldigger stop > > -- > 2.20.1
Signed-off-by: Robert Langhammer <rlanghammer@web.de> --- Changes in v2: * Do not remove the fastd start-stop mechanism to prevent fastd running without peers. * Increment PKG_RELEASE --- --- src/packages/fff/fff-vpn-select/Makefile | 6 ++-- .../fff-vpn-select/files/usr/sbin/vpn-select | 33 +------------------ .../fff-vpn-select/files/usr/sbin/vpn-stop | 2 -- 3 files changed, 3 insertions(+), 38 deletions(-) -- 2.20.1