freifunk-franken
/
firmware
9
7
Fork 13
Code Issues 48 Pull Requests 7 Releases 17 Wiki Activity

fastd-start-stop-fix #221

Closed
rohammer wants to merge 2 commits from rohammer:fastd-start-stop-fix into master
pull from: rohammer:fastd-start-stop-fix
merge into: freifunk-franken:master
Conversation 2 Commits 2 Files Changed 2 +19 -22
2 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/packages/fff/fff-fastd/files/usr/lib/vpn-select.d/fastd
View File

@ -1,7 +1,7 @@
protocol=fastd
fastd_clear() {
rm /tmp/fastd_fff_peers/*
rm /tmp/fastd_fff_peers/* 2>/dev/null
fbl commented 2022-03-19 17:20:28 +01:00
Review
Copy Link

Ich würde hier wohl eher rm -f <files..> verwenden, statt 2>/dev/null.

Ich würde hier wohl eher `rm -f <files..>` verwenden, statt 2>/dev/null.
rohammer commented 2022-03-19 22:48:22 +01:00
Review
Copy Link

ja ist huebscher.

ja ist huebscher.
}
fastd_addpeer() {
@ -21,14 +21,9 @@ fastd_addpeer() {
}
fastd_start_stop() {
/etc/init.d/fastd reload # does nothing if fastd was not running
# fastd start/stop for various situations
# this is needed for first start and if fastd comes up or disappears in hoodfile
pidfile="/tmp/run/fastd.fff.pid"
if [ "$(ls /etc/fastd/fff/peers/* 2>/dev/null)" ]; then
([ -s "$pidfile" ] && [ -d "/proc/$(cat "$pidfile")" ]) || /etc/init.d/fastd start
if ls /etc/fastd/fff/peers/* &>/dev/null; then
/etc/init.d/fastd reload
else
([ -s "$pidfile" ] && [ -d "/proc/$(cat "$pidfile")" ]) && /etc/init.d/fastd stop
/etc/init.d/fastd stop
fi
}

28
src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select
View File

@ -24,19 +24,21 @@ done
# configure vpn
if [ -n "$hoodfile" ] && [ -s "$hoodfile" ] ; then
json_load "$(cat "$hoodfile")"
json_select hood
json_get_var id id
json_select ".."
json_select vpn
json_get_keys vpn_keys
for key in $vpn_keys; do
json_select $key
json_get_var protocol protocol
"${protocol}_addpeer"
json_select ".." # back to vpn
done
if [ "$0" != "/usr/sbin/vpn-stop" ] ; then
if [ -n "$hoodfile" ] && [ -s "$hoodfile" ] ; then
json_load "$(cat "$hoodfile")"
json_select hood
json_get_var id id
json_select ".."
json_select vpn
json_get_keys vpn_keys
for key in $vpn_keys; do
json_select $key
json_get_var protocol protocol
"${protocol}_addpeer"
json_select ".." # back to vpn
done
fi
fi
# start/restart/stop vpnservices