aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/network/services/igmpproxy/Makefile2
-rw-r--r--package/network/services/igmpproxy/files/igmpproxy.config6
-rw-r--r--package/network/services/igmpproxy/files/igmpproxy.init15
3 files changed, 14 insertions, 9 deletions
diff --git a/package/network/services/igmpproxy/Makefile b/package/network/services/igmpproxy/Makefile
index 38efabe1cb..e335b72d6a 100644
--- a/package/network/services/igmpproxy/Makefile
+++ b/package/network/services/igmpproxy/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=igmpproxy
PKG_VERSION:=0.1
-PKG_RELEASE:=10
+PKG_RELEASE:=11
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/igmpproxy
diff --git a/package/network/services/igmpproxy/files/igmpproxy.config b/package/network/services/igmpproxy/files/igmpproxy.config
index d89013ca98..6230f8aa1d 100644
--- a/package/network/services/igmpproxy/files/igmpproxy.config
+++ b/package/network/services/igmpproxy/files/igmpproxy.config
@@ -2,11 +2,13 @@ config igmpproxy
option quickleave 1
# option verbose [0-2]
-config phyint wan
+config phyint
option network wan
+ option zone wan
option direction upstream
list altnet 192.168.1.0/24
-config phyint lan
+config phyint
option network lan
+ option zone lan
option direction downstream
diff --git a/package/network/services/igmpproxy/files/igmpproxy.init b/package/network/services/igmpproxy/files/igmpproxy.init
index 403854546f..009bb5d429 100644
--- 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,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
}
}