KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

igmpproxy: fix creation of firewall rules

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/network/services/igmpproxy/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=igmpproxy PKG_NAME:=igmpproxy
PKG_VERSION:=0.1 PKG_VERSION:=0.1
PKG_RELEASE:=10 PKG_RELEASE:=11
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/igmpproxy PKG_SOURCE_URL:=@SF/igmpproxy

6
package/network/services/igmpproxy/files/igmpproxy.config
View file

@ -2,11 +2,13 @@ config igmpproxy
option quickleave 1 option quickleave 1
# option verbose [0-2] # option verbose [0-2]
config phyint wan config phyint
option network wan option network wan
option zone wan
option direction upstream option direction upstream
list altnet 192.168.1.0/24 list altnet 192.168.1.0/24
config phyint lan config phyint
option network lan option network lan
option zone lan
option direction downstream option direction downstream

15
package/network/services/igmpproxy/files/igmpproxy.init
View file

@ -62,15 +62,15 @@ igmp_add_network() {
} }
igmp_add_firewall_routing() { igmp_add_firewall_routing() {
config_get network $1 network
config_get direction $1 direction 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_object ""
json_add_string type rule json_add_string type rule
json_add_string src "$upstream" json_add_string src "$upstream"
json_add_string dest "$network" json_add_string dest "$zone"
json_add_string family ipv4 json_add_string family ipv4
json_add_string proto udp json_add_string proto udp
json_add_string dest_ip "224.0.0.0/4" json_add_string dest_ip "224.0.0.0/4"
@ -79,18 +79,21 @@ igmp_add_firewall_routing() {
} }
igmp_add_firewall_network() { igmp_add_firewall_network() {
config_get network $1 network
config_get direction $1 direction config_get direction $1 direction
config_get zone $1 zone
[ ! -z "$zone" ] || return
json_add_object "" json_add_object ""
json_add_string type rule 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 proto igmp
json_add_string target ACCEPT json_add_string target ACCEPT
json_close_object json_close_object
[[ "$direction" = "upstream" ]] && { [[ "$direction" = "upstream" ]] && {
upstream="$network" upstream="$zone"
config_foreach igmp_add_firewall_routing phyint config_foreach igmp_add_firewall_routing phyint
} }
} }