From d352796d46a07672b9a694fd1bc9a24b2f389cc0 Mon Sep 17 00:00:00 2001
From: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
Date: Wed, 11 May 2022 10:04:49 +0100
Subject: [PATCH] udpecho: 2.0.0

---
 {udpechoserver => udpecho}/Makefile           | 35 ++++++++++++++-----
 .../files/etc/config/udpechoserver            |  0
 .../files/etc/init.d/udpechoserverd           |  0
 3 files changed, 26 insertions(+), 9 deletions(-)
 rename {udpechoserver => udpecho}/Makefile (62%)
 rename {udpechoserver => udpecho}/files/etc/config/udpechoserver (100%)
 rename {udpechoserver => udpecho}/files/etc/init.d/udpechoserverd (100%)

diff --git a/udpechoserver/Makefile b/udpecho/Makefile
similarity index 62%
rename from udpechoserver/Makefile
rename to udpecho/Makefile
index 4fd457490..78e233c86 100755
--- a/udpechoserver/Makefile
+++ b/udpecho/Makefile
@@ -7,14 +7,14 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=udpechoserver
-PKG_VERSION:=1.0.5
+PKG_NAME:=udpecho
+PKG_VERSION:=2.0.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/udpechoserver.git
-PKG_SOURCE_VERSION:=a4647fe5ae151eecdd8011efc0919f964ab5b8c9
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/udpecho.git
+PKG_SOURCE_VERSION:=aeaf8f5862fff7133e6299ac30ab02c8fbb1ff61
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -30,7 +30,7 @@ include $(INCLUDE_DIR)/package.mk
 
 MAKE_PATH:=src
 
-define Package/$(PKG_NAME)
+define Package/$(PKG_NAME)-server
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
@@ -38,21 +38,32 @@ define Package/$(PKG_NAME)
   DEPENDS:=+libuci
 endef
 
-define Package/$(PKG_NAME)/description
+define Package/$(PKG_NAME)-client
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=TRx69
+  TITLE:=BBF UDP Echo Client
+endef
+
+define Package/$(PKG_NAME)-server/description
 	BBF UDP Echo Server
 endef
 
+define Package/$(PKG_NAME)-client/description
+	BBF UDP Echo Client
+endef
+
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE \
 	-Wall -Werror
 
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
-	$(CP) -rf ~/git/udpechoserver/* $(PKG_BUILD_DIR)/
+	$(CP) -rf ~/git/udpecho/* $(PKG_BUILD_DIR)/
 endef
 endif
 
-define Package/$(PKG_NAME)/install
+define Package/$(PKG_NAME)-server/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
 	$(INSTALL_DIR) $(1)/etc/config
@@ -63,4 +74,10 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_BIN) ./files/etc/init.d/udpechoserverd $(1)/etc/init.d/udpechoserverd
 endef
 
-$(eval $(call BuildPackage,$(PKG_NAME)))
+define Package/$(PKG_NAME)-client/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/udpechoclientd $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)-server))
+$(eval $(call BuildPackage,$(PKG_NAME)-client))
diff --git a/udpechoserver/files/etc/config/udpechoserver b/udpecho/files/etc/config/udpechoserver
similarity index 100%
rename from udpechoserver/files/etc/config/udpechoserver
rename to udpecho/files/etc/config/udpechoserver
diff --git a/udpechoserver/files/etc/init.d/udpechoserverd b/udpecho/files/etc/init.d/udpechoserverd
similarity index 100%
rename from udpechoserver/files/etc/init.d/udpechoserverd
rename to udpecho/files/etc/init.d/udpechoserverd