2
0
forked from Ivasoft/openwrt

igmpproxy: fix creation of firewall rules

The init sccript for igmpproxy uses the option 'network' both as an interface name for fetching the l3_device name and for creating the firewall rules. This only works if the name of the network and firewall zone are identical.

This commit introduces a new option 'zone' for configuring the upstream and downstream firewall zones in order for the init script to create the required firewall rules automatically. When no such options are given, the init script falls back to not creating the firewall rules and the user can opt to create these manually.

Signed-off-by: Jaap Buurman <jaapbuurman@gmail.com>
This commit is contained in:
Jaap Buurman
2018-05-01 11:53:53 +02:00
committed by John Crispin
parent 0a7657c300
commit 0b04926433
3 changed files with 14 additions and 9 deletions

View File

@@ -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,18 +79,21 @@ 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
}
}