igmpproxy: run in foreground for procd

[openwrt/staging/mkresin.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 9e337221f1e3bab1b982173833835a2d268badb0..0c30895ad610cc3a4fb570ddb2d42049cc8b9a7c 100644 (file)
--- a/package/network/services/igmpproxy/files/igmpproxy.init
+++ b/package/network/services/igmpproxy/files/igmpproxy.init
@@ -62,15 +62,15 @@ igmp_add_network() {
 }
 
 igmp_add_firewall_routing() {
-       config_get network $1 network
        config_get direction $1 direction
+       config_get zone $1 zone
 
-       [[ "$direction" = "downstream" ]] || return 0
+       [[ "$direction" = "downstream" && ! -z "$zone" ]] || return 0
 
        json_add_object ""
        json_add_string type rule
        json_add_string src "$upstream"
-       json_add_string dest "$network"
+       json_add_string dest "$zone"
        json_add_string family ipv4
        json_add_string proto udp
        json_add_string dest_ip "224.0.0.0/4"
@@ -79,24 +79,28 @@ igmp_add_firewall_routing() {
 }
 
 igmp_add_firewall_network() {
-       config_get network $1 network
        config_get direction $1 direction
+       config_get zone $1 zone
+
+       [ ! -z "$zone" ] || return
 
        json_add_object ""
        json_add_string type rule
-       json_add_string src "$network"
+       json_add_string src "$zone"
+       json_add_string family ipv4
        json_add_string proto igmp
        json_add_string target ACCEPT
        json_close_object
 
        [[ "$direction" = "upstream" ]] && {
-               upstream="$network"
+               upstream="$zone"
                config_foreach igmp_add_firewall_routing phyint
        }
 }
 
 service_triggers() {
        procd_add_reload_trigger "igmpproxy"
+       config_foreach igmp_add_network phyint
 }
 
 start_service() {
@@ -110,15 +114,12 @@ start_service() {
        [ -n "$has_upstream" ] || return
 
        procd_open_instance
-       procd_set_param command $PROG
+       procd_set_param command $PROG '-n'
        [ -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
 
@@ -134,3 +135,7 @@ start_service() {
 service_started() {
        procd_set_config_changed firewall
 }
+
+stop_service() {
+       procd_set_config_changed firewall
+}