udpechoserver: init script changes

udpechoserver/Makefile

@@ -10,13 +10,16 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=udpechoserver
 PKG_VERSION:=1.0.3
 
-PKG_SOURCE_VERSION:=4e80bbec15b284080798b5ffbe8655febaa239aa
+LOCAL_DEV:=1
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_VERSION:=973684979939496d57b93db9f83f09945ad53858
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/udpechoserver.git
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+endif
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_LICENSE:=GPL-2.0-only
@@ -24,8 +27,6 @@ PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 
-MAKE_PATH:=src
-
 define Package/$(PKG_NAME)
   SECTION:=utils
   CATEGORY:=Utilities
@@ -42,6 +43,14 @@ TARGET_CFLAGS += \
 	-D_GNU_SOURCE \
 	-Wall -Werror
 
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	$(CP) -rf ~/git/udpechoserver/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+MAKE_PATH:=src
+
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm

udpechoserver/files/etc/init.d/udpechoserverd

@@ -12,21 +12,40 @@ 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`
+	local address_udpechoserver=`uci -q get udpechoserver.udpechoserver.address`
 	if [ "$port_udpechoserver" != "0" ]; then
 		if [ "$enable_udpechoserver" = "1" ]; then
-			iptables -I zone_wan_input -p udp --dport "$port_udpechoserver" -j ACCEPT -m comment --comment "Open UDPechoserver port"
+			if [ -z "$address_udpechoserver" ]; then
+				iptables -I zone_wan_input -p udp --dport "$port_udpechoserver" -j ACCEPT -m comment --comment "Open UDPechoserver port"
+				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 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
-		else
-			iptables -I zone_wan_input -p udp --dport "$port_udpechoserver" -j REJECT -m comment --comment "Close UDPechoserver port"
 		fi
 	fi
 }
 
-boot() {
-	start
+stop_service() {
+	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
+
+	local 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 +55,4 @@ reload_service() {
 
 service_triggers() {
 	procd_add_reload_trigger udpechoserver
-}
+}