From f952712b5e6daf4eb9f501c0805e8dad6cead68e Mon Sep 17 00:00:00 2001
From: Vivek Kumar Dutta <vivek.dutta@iopsys.eu>
Date: Thu, 16 Nov 2023 11:04:12 +0530
Subject: [PATCH] tr104: 1.0.8

---
 tr104/Config.in               |  5 +++++
 tr104/Makefile                | 13 +++++++++----
 tr104/files/etc/init.d/tr104d |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/tr104/Config.in b/tr104/Config.in
index bee8c8ef4..74e3a0f28 100644
--- a/tr104/Config.in
+++ b/tr104/Config.in
@@ -2,3 +2,8 @@ config TR104_DOTSO_PLUGIN
 	bool "Use bbfdm DotSO plugin backend to provide TR104 and extension datamodel"
 	depends on PACKAGE_tr104
 	default n
+
+config TR104_VENDOR_EXTENSIONS
+	bool "Use TR104 vendor extensions"
+	depends on PACKAGE_tr104
+	default y
diff --git a/tr104/Makefile b/tr104/Makefile
index 274dd1361..18acecdee 100644
--- a/tr104/Makefile
+++ b/tr104/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tr104
-PKG_VERSION:=1.0.7
+PKG_VERSION:=1.0.8
 
 LOCAL_DEV:=0
 ifeq ($(LOCAL_DEV),0)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/voice/tr104.git
-PKG_SOURCE_VERSION:=cd0c5d1f4a8489e3d93b5cf433f8f0df638bf62b
+PKG_SOURCE_VERSION:=bd1fabcdd82dae9f1314f1510849486b5e89e2ef
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -45,6 +45,11 @@ CMAKE_OPTIONS += \
 	-DDAEMON_JSON_INPUT:String="/etc/tr104/input.json" \
 	-DDM_ENABLE_UBUS=ON
 
+ifeq ($(CONFIG_TR104_VENDOR_EXTENSIONS),y)
+CMAKE_OPTIONS += \
+	-DTR104_EXTENSION_DIR:String="iowrt"
+endif
+
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
 	$(CP) ~/git/$(PKG_NAME)/* $(PKG_BUILD_DIR)/
@@ -55,13 +60,13 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 ifeq ($(CONFIG_TR104_DOTSO_PLUGIN),y)
 	$(call BbfdmInstallPlugin,$(1),$(PKG_BUILD_DIR)/libdm/tr104/libtr104.so)
-	$(call BbfdmInstallPlugin,$(1),$(PKG_BUILD_DIR)/libdm/tr104_ext/libtr104ext.so)
+	$(call BbfdmInstallPlugin,$(1),$(PKG_BUILD_DIR)/libdm/extensions/iowrt/libtr104ext.so)
 else
 	$(INSTALL_DIR) $(1)/etc/tr104/plugins/
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/daemon/ubus/tr104d $(1)/usr/sbin/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libdm/tr104/libtr104.so $(1)/etc/tr104/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libdm/tr104_ext/libtr104ext.so $(1)/etc/tr104/plugins/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libdm/extensions/iowrt/libtr104ext.so $(1)/etc/tr104/plugins/
 	$(INSTALL_BIN) ./files/etc/init.d/tr104d $(1)/etc/init.d/
 	$(INSTALL_BIN) ./files/etc/tr104/input.json $(1)/etc/tr104/input.json
 endif
diff --git a/tr104/files/etc/init.d/tr104d b/tr104/files/etc/init.d/tr104d
index faa702b0e..d7e0e1fa8 100644
--- a/tr104/files/etc/init.d/tr104d
+++ b/tr104/files/etc/init.d/tr104d
@@ -1,6 +1,6 @@
 #!/bin/sh /etc/rc.common
 
-START=96
+START=60
 STOP=10
 
 USE_PROCD=1