From 5dc13908b48c48ba995ec23ddf983268ec3426b7 Mon Sep 17 00:00:00 2001 From: Ivan Diaz Date: Fri, 21 Nov 2025 17:13:11 -0500 Subject: [PATCH] watchcat: fix argument handling and allow multiple ping hosts The backend now correctly supports multiple IP addresses and avoids argument shifting when mmifacename is empty. Signed-off-by: Ivan Diaz --- utils/watchcat/Makefile | 2 +- utils/watchcat/files/watchcat.init | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/utils/watchcat/Makefile b/utils/watchcat/Makefile index 8140edfe00..8541672e8d 100644 --- a/utils/watchcat/Makefile +++ b/utils/watchcat/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=watchcat PKG_VERSION:=1 -PKG_RELEASE:=17 +PKG_RELEASE:=18 PKG_MAINTAINER:=Roger D PKG_LICENSE:=GPL-2.0 diff --git a/utils/watchcat/files/watchcat.init b/utils/watchcat/files/watchcat.init index 688b44bb8c..a21712e1f5 100644 --- a/utils/watchcat/files/watchcat.init +++ b/utils/watchcat/files/watchcat.init @@ -38,8 +38,8 @@ config_watchcat() { config_get pingperiod "$1" pingperiod "60" config_get forcedelay "$1" forcedelay "60" config_get pingsize "$1" pingsize "standard" - config_get interface "$1" interface - config_get mmifacename "$1" mmifacename + config_get interface "$1" interface # CHEK only if need a default? + config_get mmifacename "$1" mmifacename # FIX HERE need a default? config_get_bool unlockbands "$1" unlockbands "0" config_get addressfamily "$1" addressfamily "any" config_get script "$1" script @@ -104,19 +104,19 @@ config_watchcat() { ;; ping_reboot) procd_open_instance "watchcat_${1}" - procd_set_param command /usr/bin/watchcat.sh "ping_reboot" "$period" "$forcedelay" "$pinghosts" "$pingperiod" "$pingsize" "$addressfamily" + procd_set_param command /usr/bin/watchcat.sh "ping_reboot" "$period" "$forcedelay" \"$pinghosts\" "$pingperiod" "$pingsize" "$addressfamily" procd_set_param respawn "${respawn_threshold:-3600}" "${respawn_timeout:-5}" "${respawn_retry:-5}" procd_close_instance ;; restart_iface) procd_open_instance "watchcat_${1}" - procd_set_param command /usr/bin/watchcat.sh "restart_iface" "$period" "$pinghosts" "$pingperiod" "$pingsize" "$interface" "$mmifacename" "$unlockbands" "$addressfamily" + procd_set_param command /usr/bin/watchcat.sh "restart_iface" "$period" \"$pinghosts\" "$pingperiod" "$pingsize" "$interface" "$mmifacename" "$unlockbands" "$addressfamily" procd_set_param respawn "${respawn_threshold:-3600}" "${respawn_timeout:-5}" "${respawn_retry:-5}" procd_close_instance ;; run_script) procd_open_instance "watchcat_${1}" - procd_set_param command /usr/bin/watchcat.sh "run_script" "$period" "$pinghosts" "$pingperiod" "$pingsize" "$interface" "$addressfamily" "$script" + procd_set_param command /usr/bin/watchcat.sh "run_script" "$period" \"$pinghosts\" "$pingperiod" "$pingsize" "$interface" "$addressfamily" "$script" procd_set_param respawn "${respawn_threshold:-3600}" "${respawn_timeout:-5}" "${respawn_retry:-5}" procd_close_instance ;;