igmpproxy: remove procd_open_trigger/procd_close_trigger calls

[openwrt/openwrt.git] / package / network / services / igmpproxy / files / igmpproxy.init

diff --git a/package/network/services/igmpproxy/files/igmpproxy.init b/package/network/services/igmpproxy/files/igmpproxy.init
index dd2e430b516c006ec8367c444c606d534da36ab5..9f4e51ada4d8cc4205fb5b4f28b908ab94ac3755 100644 (file)
--- a/package/network/services/igmpproxy/files/igmpproxy.init
+++ b/package/network/services/igmpproxy/files/igmpproxy.init
@@ -6,24 +6,13 @@ USE_PROCD=1
 PROG=/usr/sbin/igmpproxy
 CONFIGFILE=/var/etc/igmpproxy.conf
 
-# igmpproxy supports both a debug mode and verbosity, which are very useful
-# when something isn't working.
-#
-# Debug mode will print everything to stdout instead of syslog. Generally
-# verbosity should NOT be set as it will quickly fill your syslog.
-#
-# Put any debug or verbosity options into IGMP_OPTS
-#
-# Examples:
-# OPTIONS="-d -v -v" - debug mode and very verbose, this will land in
-#                        stdout and not in syslog
-# OPTIONS="-v" - be verbose, this will write aditional information to syslog
-
-OPTIONS=""
-
 igmp_header() {
-       local quickleave
+       local quickleave verbose
        config_get_bool quickleave "$1" quickleave 0
+       config_get verbose "$1" verbose 0
+
+       [ $verbose = "1" ] && logopts="-v"
+       [ $verbose = "2" ] && logopts="-v -v"
 
        mkdir -p /var/etc
        rm -f /var/etc/igmpproxy.conf
@@ -39,7 +28,10 @@ igmp_add_phyint() {
        config_get direction $1 direction
        config_get altnets $1 altnet
 
-       json_load "$(ifstatus $network)"
+       local status="$(ubus -S call "network.interface.$network" status)"
+       [ -n "$status" ] || return
+
+       json_load "$status"
        json_get_var device l3_device
        json_get_var up up
 
@@ -48,6 +40,8 @@ igmp_add_phyint() {
                return;
        }
 
+       append netdevs "$device"
+
        [[ "$direction" = "upstream" ]] && has_upstream=1
 
        echo -e "\nphyint $device $direction ratelimit 0 threshold 1" >> /var/etc/igmpproxy.conf
@@ -64,7 +58,7 @@ igmp_add_network() {
        local network
 
        config_get network $1 network
-       procd_add_interface_trigger "interface.*" $network /etc/init.d/igmpproxy restart
+       procd_add_interface_trigger "interface.*" $network /etc/init.d/igmpproxy reload
 }
 
 igmp_add_firewall_routing() {
@@ -103,10 +97,13 @@ igmp_add_firewall_network() {
 
 service_triggers() {
        procd_add_reload_trigger "igmpproxy"
+       config_foreach igmp_add_network phyint
 }
 
 start_service() {
        has_upstream=
+       netdevs=
+       logopts=
        config_load igmpproxy
 
        config_foreach igmp_header igmpproxy
@@ -115,13 +112,11 @@ start_service() {
 
        procd_open_instance
        procd_set_param command $PROG
-       [ -n "$OPTIONS" ] && procd_append_param $OPTIONS
+       [ -n "$logopts" ] && procd_append_param command $logopts
        procd_append_param command $CONFIGFILE
        procd_set_param file $CONFIGFILE
+       procd_set_param netdev $netdevs
        procd_set_param respawn
-       procd_open_trigger
-       config_foreach igmp_add_network phyint
-       procd_close_trigger
 
        procd_open_data