From a15f586ecf88510f9b17d15560f599c3e8b04474 Mon Sep 17 00:00:00 2001
From: vdutta <vivek.dutta@iopsys.eu>
Date: Tue, 26 Oct 2021 20:04:02 +0530
Subject: [PATCH] icwmp: Fix raise condition for con-req

---
 icwmp/Makefile                | 4 ++--
 icwmp/files/etc/firewall.cwmp | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/icwmp/Makefile b/icwmp/Makefile
index e7a03fe64..75ed01e40 100755
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=8.2.4-2021-10-25
+PKG_VERSION:=8.2.5-2021-10-26
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=c9eac993f0faa69c4102bcc5d05f07b42f1e6554
+PKG_SOURCE_VERSION:=bf33885bf7a4c61fa32d19a96d48acf0abf92d25
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
diff --git a/icwmp/files/etc/firewall.cwmp b/icwmp/files/etc/firewall.cwmp
index 54a7f72bb..f2e16d8e3 100644
--- a/icwmp/files/etc/firewall.cwmp
+++ b/icwmp/files/etc/firewall.cwmp
@@ -5,7 +5,7 @@ if [ ! -f "/var/state/cwmp" ]; then
 fi
 
 zone_name=$(uci -c /var/state -q get cwmp.acs.zonename)
-port=$(uci -c /var/state -q get cwmp.acs.port)
+port=$(uci -q get cwmp.cpe.port)
 ipaddr=$(uci -c /var/state -q get cwmp.acs.ip)
 ip6addr=$(uci -c /var/state -q get cwmp.acs.ip6)
 incoming_rule=$(uci -q get cwmp.cpe.incoming_rule|tr [A-Z] [a-z])
@@ -28,8 +28,8 @@ else
 	iptables -X zone_icwmp_input 2> /dev/null
 fi
 
-cmd="iptables -I zone_${zone_name}_input -p tcp"
-cmd6="ip6tables -I zone_${zone_name}_input -p tcp"
+cmd="iptables -w 1 -I zone_${zone_name}_input -p tcp"
+cmd6="ip6tables -w 1 -I zone_${zone_name}_input -p tcp"
 
 # default incoming rule is Port only
 if [ -z "${incoming_rule}" ]; then
@@ -68,4 +68,4 @@ echo ${cmd6}|grep -q "\-\-dport \|\-s "
 if [ "$?" -eq 0 ]; then
 	cmd6="${cmd6} -j ACCEPT -m comment --comment=Open_ACS_port"
 	${cmd6}
-fi
\ No newline at end of file
+fi