icwmp: HEARTBEAT event

Enable the development log messages and fix compilation errors

bbf/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=6.6.24
+PKG_VERSION:=6.6.25
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_VERSION:=daa67e6bad5526c5904715214ac553366255765c
+PKG_SOURCE_VERSION:=e1d796c4fca5f4962fefdc5602b6daa922d40f08
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 

evoice/Makefile

@@ -11,7 +11,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/evoice.git
-PKG_SOURCE_VERSION:=c8d7ddd92be4ee5edb243112c590036ccc02f410
+PKG_SOURCE_VERSION:=391b822c7e7127c85245934139ac6344715fac9f
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=8.4.0
+PKG_VERSION:=8.4.2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
-PKG_SOURCE_VERSION:=a8463946f3df9227685947a6b5a7ffde17b10a44
+PKG_SOURCE_VERSION:=c7e55ed9070dd822452f132cc7112294d305a233
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 

icwmp/files/etc/config/cwmp

@@ -11,7 +11,6 @@ config acs 'acs'
 	option retry_min_wait_interval '5'
 	#­ possible configs interval :[1000:65535]
 	option retry_interval_multiplier '2000'
-	option https_ssl_capath ''
 	option ipv6_enable '0'
 	option ip_version '4'
 

icwmp/files/etc/init.d/icwmpd

@@ -106,7 +106,6 @@ validate_acs_section()
 		'compression:or("GZIP","Deflate","Disabled")' \
 		'retry_min_wait_interval:range(1, 65535)' \
 		'retry_interval_multiplier:range(1000, 65535)' \
-		'https_ssl_capath:file' \
 		'ipv6_enable:bool'
 
 }

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=7.1.34
+PKG_VERSION:=7.1.35
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=b94b561bc74ec7682cebcc3b4c9cb1bfc08b4c41
+PKG_SOURCE_VERSION:=cd0f2a4ecb3ee3a3bdbff6d18bb51e23ae673847
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 PKG_LICENSE:=PROPRIETARY IOPSYS

udpechoserver/Makefile

@@ -8,14 +8,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=udpechoserver
-PKG_VERSION:=1.0.3
+PKG_VERSION:=1.0.4
 
-PKG_SOURCE_VERSION:=4e80bbec15b284080798b5ffbe8655febaa239aa
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/udpechoserver.git
-
+PKG_SOURCE_VERSION:=bb89f350f8b5b2c554b4f484c87e99400d41d4a2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
+endif
+
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
@@ -42,6 +45,12 @@ TARGET_CFLAGS += \
 	-D_GNU_SOURCE \
 	-Wall -Werror
 
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	$(CP) -rf ~/git/udpechoserver/* $(PKG_BUILD_DIR)/
+endef
+endif
+
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm

udpechoserver/files/etc/init.d/udpechoserverd

@@ -4,29 +4,51 @@
 #Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
 
 START=99
-STOP=10
+STOP=02
 
 USE_PROCD=1
 PROG="/usr/sbin/udpechoserverd"
 
 start_service() {
-	local enable_udpechoserver=`uci -q get udpechoserver.udpechoserver.enable`
-	local port_udpechoserver=`uci -q get udpechoserver.udpechoserver.server_port`
-	if [ "$port_udpechoserver" != "0" ]; then
-		if [ "$enable_udpechoserver" = "1" ]; then
+	local enable_udpechoserver port_udpechoserver address_udpechoserver
+
+	enable_udpechoserver="$(uci -q get udpechoserver.udpechoserver.enable)"
+	port_udpechoserver="$(uci -q get udpechoserver.udpechoserver.server_port)"
+	address_udpechoserver="$(uci -q get udpechoserver.udpechoserver.address)"
+
+
+	if [ "${enable_udpechoserver}" -eq "1" ] && [ "$port_udpechoserver" -ne "0" ]; then
+		if [ -z "$address_udpechoserver" ]; then
 			iptables -I zone_wan_input -p udp --dport "$port_udpechoserver" -j ACCEPT -m comment --comment "Open UDPechoserver port"
-			procd_open_instance
-			procd_set_param command "$PROG"
-			procd_set_param respawn "3" "7" "0"
-			procd_close_instance
+			ip6tables -I zone_wan_input -p udp --dport "$port_udpechoserver" -j ACCEPT -m comment --comment "Open UDPechoserver port"
+		elif [[ "$address_udpechoserver" =~ .*:.* ]]; then
+			ip6tables -I zone_wan_input -p udp --dport "$port_udpechoserver" -j ACCEPT -m comment --comment "Open UDPechoserver port"
 		else
-			iptables -I zone_wan_input -p udp --dport "$port_udpechoserver" -j REJECT -m comment --comment "Close UDPechoserver port"
+			iptables -I zone_wan_input -p udp --dport "$port_udpechoserver" -j ACCEPT -m comment --comment "Open UDPechoserver port"
 		fi
+
+		procd_open_instance
+		procd_set_param command "$PROG"
+		procd_set_param respawn "3" "7" "0"
+		procd_close_instance
 	fi
 }
 
-boot() {
-	start
+stop_service() {
+	# Remove the USPechoserver ports created earlier
+	while iptables -L zone_wan_input --line-numbers | grep "Open UDPechoserver port" > /dev/null; do
+		iptables -D zone_wan_input $(iptables -L zone_wan_input --line-numbers | grep "Open UDPechoserver port" | head -1|awk '{print $1}');
+	done
+
+	while ip6tables -L zone_wan_input --line-numbers | grep "Open UDPechoserver port" > /dev/null; do
+		ip6tables -D zone_wan_input $(ip6tables -L zone_wan_input --line-numbers | grep "Open UDPechoserver port" | head -1|awk '{print $1}');
+	done
+
+	plus_enable="$(uci -q -c /var/state get udpechoserver.udpechoserver.plus)"
+	if [ -n "${plus_enable}" ]; then
+		uci -q set udpechoserver.udpechoserver.plus="${plus_enable}"
+		uci commit udpechoserver
+	fi
 }
 
 reload_service() {
@@ -36,4 +58,4 @@ reload_service() {
 
 service_triggers() {
 	procd_add_reload_trigger udpechoserver
-}
+}