Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fwknop: init script improvements

Browse source 
* Log with pid instead of placeholder.
* Make sure directory for config files generated from uci config exists.
* Remove forced defaults.
* Simplify compares.

Signed-off-by: Kimmo Vuorinen <kimmo.vuorinen@gmail.com>
This commit is contained in:
Kimmo Vuorinen 2020-02-15 22:03:22 +02:00
parent eb29b5aa8a
commit 39f2e30b41
2 changed files with 77 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/fwknop/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=fwknop PKG_NAME:=fwknop
PKG_VERSION:=2.6.10 PKG_VERSION:=2.6.10
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://www.cipherdyne.org/fwknop/download PKG_SOURCE_URL:=https://www.cipherdyne.org/fwknop/download

158
net/fwknop/files/fwknopd.init
View file

@ -8,28 +8,29 @@
USE_PROCD=1 USE_PROCD=1
START=95 START=95
. /lib/functions/network.sh . "${IPKG_INSTROOT}/lib/functions/network.sh"
FWKNOPD_BIN=/usr/sbin/fwknopd FWKNOPD_BIN=/usr/sbin/fwknopd
FWKNOPD_CFGDIR=/var/etc/fwknop
start_service() start_service()
{ {
generate_configuration generate_configuration
if [ -n "$DEPEND_IFNAME" ] ; then if [ -n "${DEPEND_IFNAME}" ] ; then
# We know the interface, so we can start # We know the interface, so we can start
procd_open_instance procd_open_instance
procd_set_param command "$FWKNOPD_BIN" --foreground --syslog-enable procd_set_param command "${FWKNOPD_BIN}" --foreground --syslog-enable
procd_set_param respawn procd_set_param respawn
if [ $UCI_ENABLED -eq 1 ]; then if [ "${UCI_ENABLED}" -eq 1 ]; then
procd_append_param command -c /var/etc/fwknopd.conf procd_append_param command -c "${FWKNOPD_CFGDIR}/fwknopd.conf"
procd_append_param command -a /var/etc/access.conf procd_append_param command -a "${FWKNOPD_CFGDIR}/access.conf"
fi fi
procd_append_param command -i "$DEPEND_IFNAME" procd_append_param command -i "${DEPEND_IFNAME}"
procd_set_param netdev "$DEPEND_IFNAME" procd_set_param netdev "${DEPEND_IFNAME}"
procd_close_instance procd_close_instance
else else
logger -p daemon.info -t "fwknopd[----]" "Postponing start-up of fwknopd, network $NETWORK is not up" logger -p daemon.info -t "fwknopd[$$]" "Postponing start-up of fwknopd, network ${NETWORK} is not up"
fi fi
} }
@ -37,21 +38,21 @@ service_triggers()
{ {
procd_add_reload_trigger "fwknopd" procd_add_reload_trigger "fwknopd"
if [ -n "$NETWORK" ] ; then if [ -n "${NETWORK}" ] ; then
logger -p daemon.info -t "fwknopd[----]" "Listening for changes on network $NETWORK" logger -p daemon.info -t "fwknopd[$$]" "Listening for changes on network ${NETWORK}"
procd_add_reload_interface_trigger "$NETWORK" procd_add_reload_interface_trigger "${NETWORK}"
fi fi
} }
get_bool() get_bool()
{ {
local _tmp="$1" local _tmp="${1}"
case "$_tmp" in case "${_tmp}" in
1|on|true|yes|enabled) _tmp=1;; 1|on|true|yes|enabled) _tmp=1;;
0|off|false|no|disabled) _tmp=0;; 0|off|false|no|disabled) _tmp=0;;
*) _tmp="$2";; *) _tmp="${2}";;
esac esac
echo -n "$_tmp" echo -n "${_tmp}"
} }
generate_configuration() generate_configuration()
@ -66,72 +67,65 @@ generate_configuration()
local DEFAULT_UCI_NETWORK=wan local DEFAULT_UCI_NETWORK=wan
local DEFAULT_FWKNOPD_IFNAME= local DEFAULT_FWKNOPD_IFNAME=
network_get_device DEFAULT_FWKNOPD_IFNAME $DEFAULT_UCI_NETWORK network_get_device DEFAULT_FWKNOPD_IFNAME "${DEFAULT_UCI_NETWORK}"
config_cb() { config_cb() {
local type="$1" local type="${1}"
local name="$2" local name="${2}"
if [ "$type" = "global" ]; then if [ "${type}" = "global" ]; then
option_cb() { option_cb() {
local option="$1" local option="${1}"
local value="$2" local value="${2}"
if [ "$option" = "uci_enabled" ] && [ "$(get_bool "$value" 0)" -eq 1 ] ; then if [ "${option}" = "uci_enabled" ] && [ "$(get_bool "${value}" 0)" -eq 1 ] ; then
> /var/etc/fwknopd.conf mkdir -p "${FWKNOPD_CFGDIR}"
> /var/etc/access.conf > "${FWKNOPD_CFGDIR}/fwknopd.conf"
chmod 600 /var/etc/fwknopd.conf > "${FWKNOPD_CFGDIR}/access.conf"
chmod 600 /var/etc/access.conf chmod 600 "${FWKNOPD_CFGDIR}/fwknopd.conf"
chmod 600 "${FWKNOPD_CFGDIR}/access.conf"
UCI_ENABLED=1 UCI_ENABLED=1
# Forced defaults
# Do not let fwknopd to shut-down when interface goes down,
# control it from the start-up script instead:
# https://bugs.openwrt.org/index.php?do=details&task_id=1481
echo "EXIT_AT_INTF_DOWN n" >> /var/etc/fwknopd.conf
fi fi
} }
elif [ "$type" = "network" ]; then elif [ "${type}" = "network" ]; then
option_cb() { option_cb() {
local option="$1" local option="${1}"
local value="$2" local value="${2}"
if [ $UCI_ENABLED -eq 1 ] && [ $option = "network" ]; then if [ "${UCI_ENABLED}" -eq 1 ] && [ "${option}" = "network" ]; then
NETWORK="$value" NETWORK="${value}"
fi fi
} }
elif [ "$type" = "config" ]; then elif [ "${type}" = "config" ]; then
option_cb() { option_cb() {
local option="$1" local option="${1}"
local value="$2" local value="${2}"
if [ $UCI_ENABLED -eq 1 ] && [ $option = "PCAP_INTF" ]; then if [ "${UCI_ENABLED}" -eq 1 ]; then
PCAP_INTF="$value" if [ "${option}" = "PCAP_INTF" ]; then
echo "$option $value" >> /var/etc/fwknopd.conf #writing each option to fwknopd.conf PCAP_INTF="${value}"
elif [ $UCI_ENABLED -eq 1 ] && [ $option = "EXIT_AT_INTF_DOWN" ]; then fi
logger -p daemon.warn -t "fwknopd[----]" "Ignoring EXIT_AT_INTF_DOWN option, forced to N (no) to work reliably with procd" echo "${option} ${value}" >> "${FWKNOPD_CFGDIR}/fwknopd.conf" #writing each option to fwknopd.conf
elif [ $UCI_ENABLED -eq 1 ]; then
echo "$option $value" >> /var/etc/fwknopd.conf #writing each option to fwknopd.conf
fi fi
} }
elif [ "$type" = "access" ]; then elif [ "${type}" = "access" ]; then
if [ -f /tmp/access.conf.tmp ] ; then if [ -f /tmp/access.conf.tmp ] ; then
cat /tmp/access.conf.tmp >> /var/etc/access.conf cat /tmp/access.conf.tmp >> "${FWKNOPD_CFGDIR}/access.conf"
rm /tmp/access.conf.tmp rm /tmp/access.conf.tmp
fi fi
option_cb() { option_cb() {
local option="$1" local option="${1}"
local value="$2" local value="${2}"
if [ $UCI_ENABLED -eq 1 ] && [ $option = "SOURCE" ]; then if [ "${UCI_ENABLED}" -eq 1 ]; then
echo "$option $value" >> /var/etc/access.conf #writing each option to access.conf if [ "${option}" = "SOURCE" ]; then
fi echo "${option} ${value}" >> "${FWKNOPD_CFGDIR}/access.conf" #writing each option to access.conf
if [ $UCI_ENABLED -eq 1 ] && [ $option != "SOURCE" ]; then else
echo "$option $value" >> /tmp/access.conf.tmp #writing each option to access.conf echo "${option} ${value}" >> /tmp/access.conf.tmp #writing each option to access.conf
fi
fi fi
} }
else else
reset_cb reset_cb
if [ -z "$type" ]; then if [ -z "${type}" ]; then
# Finalize reading # Finalize reading
if [ -f /tmp/access.conf.tmp ] ; then if [ -f /tmp/access.conf.tmp ] ; then
cat /tmp/access.conf.tmp >> /var/etc/access.conf cat /tmp/access.conf.tmp >> "${FWKNOPD_CFGDIR}/access.conf"
rm /tmp/access.conf.tmp rm /tmp/access.conf.tmp
fi fi
fi fi
@ -142,40 +136,40 @@ generate_configuration()
config_load fwknopd config_load fwknopd
fi fi
if [ $UCI_ENABLED -eq 0 ]; then if [ "${UCI_ENABLED}" -eq 0 ]; then
if [ -f $USER_CONFIG_PATH ] ; then if [ -f "${USER_CONFIG_PATH}" ] ; then
# Scan user configuration for PCAP_INTF settings and fallback to fwknopd's default # Scan user configuration for PCAP_INTF settings and fallback to fwknopd's default
DEPEND_IFNAME="$( sed -ne '/^\s*PCAP_INTF\s\+/ { s/^\s*PCAP_INTF\s\+//; s/\s\+$//; p; q; }' $USER_CONFIG_PATH )" DEPEND_IFNAME="$( sed -ne '/^\s*PCAP_INTF\s\+/ { s/^\s*PCAP_INTF\s\+//; s/\s\+$//; p; q; }' ${USER_CONFIG_PATH} )"
if [ -n "$DEPEND_IFNAME" ]; then if [ -n "${DEPEND_IFNAME}" ]; then
logger -p daemon.debug -t "fwknopd[----]" "Found fwknopd.conf configuration, using PCAP_INTF interface $DEPEND_IFNAME" logger -p daemon.debug -t "fwknopd[$$]" "Found fwknopd.conf configuration, using PCAP_INTF interface ${DEPEND_IFNAME}"
else else
logger -p daemon.info -t "fwknopd[----]" "No PCAP_INTF interface specified in fwknopd.conf, fwknopd's default $DEFAULT_FWKNOPD_IFNAME will be used" logger -p daemon.info -t "fwknopd[$$]" "No PCAP_INTF interface specified in fwknopd.conf, fwknopd's default ${DEFAULT_FWKNOPD_IFNAME} will be used"
DEPEND_IFNAME="$DEFAULT_FWKNOPD_IFNAME" DEPEND_IFNAME="${DEFAULT_FWKNOPD_IFNAME}"
fi fi
else else
logger -p daemon.error -t "fwknopd[----]" "No $USER_CONFIG_PATH found, not starting" logger -p daemon.error -t "fwknopd[$$]" "No ${USER_CONFIG_PATH} found, not starting"
exit 1 exit 1
fi fi
elif [ $UCI_ENABLED -eq 1 ]; then elif [ "${UCI_ENABLED}" -eq 1 ]; then
if [ -n "$NETWORK" ] && [ -n "$PCAP_INTF" ]; then if [ -n "${NETWORK}" ] && [ -n "${PCAP_INTF}" ]; then
logger -p daemon.warn -t "fwknopd[----]" "Specified both network and PCAP_INTF. Ignoring PCAP_INTF" logger -p daemon.warn -t "fwknopd[$$]" "Specified both network and PCAP_INTF. Ignoring PCAP_INTF"
elif [ -z "$NETWORK" ] && [ -z "$PCAP_INTF" ]; then elif [ -z "${NETWORK}" ] && [ -z "${PCAP_INTF}" ]; then
# Fallback - compatibility with old script, which used wan interface by default # Fallback - compatibility with old script, which used wan interface by default
logger -p daemon.info -t "fwknopd[----]" "Neither network, nor PCAP_INTF interface specified, trying network $DEFAULT_UCI_NETWORK" logger -p daemon.info -t "fwknopd[$$]" "Neither network, nor PCAP_INTF interface specified, trying network ${DEFAULT_UCI_NETWORK}"
NETWORK="$DEFAULT_UCI_NETWORK" NETWORK="${DEFAULT_UCI_NETWORK}"
fi fi
# Resolve network if possible # Resolve network if possible
if [ -n "$NETWORK" ]; then if [ -n "${NETWORK}" ]; then
network_get_device DEPEND_IFNAME "$NETWORK" network_get_device DEPEND_IFNAME "${NETWORK}"
if [ -n "$DEPEND_IFNAME" ]; then if [ -n "${DEPEND_IFNAME}" ]; then
logger -p daemon.debug -t "fwknopd[----]" "Resolved network $NETWORK as interface $DEPEND_IFNAME" logger -p daemon.debug -t "fwknopd[$$]" "Resolved network ${NETWORK} as interface ${DEPEND_IFNAME}"
else else
logger -p daemon.warn -t "fwknopd[----]" "Cannot find interface for network $NETWORK, probably the network is not up" logger -p daemon.warn -t "fwknopd[$$]" "Cannot find interface for network ${NETWORK}, probably the network is not up"
fi fi
elif [ -n "$PCAP_INTF" ]; then elif [ -n "${PCAP_INTF}" ]; then
DEPEND_IFNAME="$PCAP_INTF" DEPEND_IFNAME="${PCAP_INTF}"
logger -p daemon.debug -t "fwknopd[----]" "Using configured PCAP_INTF interface $DEPEND_IFNAME" logger -p daemon.debug -t "fwknopd[$$]" "Using configured PCAP_INTF interface ${DEPEND_IFNAME}"
fi fi
fi fi
} }