tr104: voip reset extension

qosmngr: airoha: flush HW NAT to directly apply changes.
bulkdata: 2.1.21
2025-12-27 04:23:39 +08:00 · 2025-09-15 19:08:08 +05:30 · 2025-09-15 11:13:08 +02:00 · 2025-09-15 12:38:19 +05:30 · 2025-09-15 12:37:18 +05:30 · 2025-09-15 12:35:04 +05:30
8 changed files with 91 additions and 11 deletions
--- a/bbfdm/Makefile
+++ b/bbfdm/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=bbfdm
-PKG_VERSION:=1.18.2
+PKG_VERSION:=1.18.3

 USE_LOCAL:=0
 ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=786863cf0ef48dd70610598cdf8e2bbc0462a504
+PKG_SOURCE_VERSION:=252da0b8341ef92f78b448b506a7484dad6ef25d
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/bulkdata/Makefile
+++ b/bulkdata/Makefile
@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=bulkdata
-PKG_VERSION:=2.1.20
+PKG_VERSION:=2.1.21

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bulkdata.git
-PKG_SOURCE_VERSION:=a5e57962938ca143ede65d92be90b6e9fce66e15
+PKG_SOURCE_VERSION:=fdfffad21f1c0c15654c9a9740c5fb7beb6542e5
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=icwmp
-PKG_VERSION:=9.10.1
+PKG_VERSION:=9.10.2

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=c4b0fa4272ab44a8c78462d5cc8df6501acbeb55
+PKG_SOURCE_VERSION:=7a365e2112baa87e97545dc4ad5cd0a89a60da5c
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/periodicstats/Makefile
+++ b/periodicstats/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=periodicstats
-PKG_VERSION:=1.6.0
+PKG_VERSION:=1.6.1

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/periodicstats.git
-PKG_SOURCE_VERSION:=63c65f55d00442f5bc1f5a3100abf94e52cd0075
+PKG_SOURCE_VERSION:=dd8353d84ef9431936d09c7379d0e4b20035cdb3
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/qosmngr/files/airoha/lib/qos/qos.sh
+++ b/qosmngr/files/airoha/lib/qos/qos.sh
@@ -22,6 +22,10 @@ ip_rule_get_converted_tos() {
 	echo $con_tos
 }

+flush_hw_nat() {
+	hw_nat -! > /dev/null 2>&1
+}
+
 configure_qos() {
    # queue configuration is being done after shaper configuration,
    # If port shapingrate configuration on DISC device is called after queue configuration then
@@ -33,8 +37,9 @@ configure_qos() {
    configure_policer
    configure_classify
    if [ -f "/tmp/qos/classify.ebtables" ]; then
-	    sh /tmp/qos/classify.ebtables
+        sh /tmp/qos/classify.ebtables
    fi
+    flush_hw_nat
 }

 reload_qos() {
@@ -65,6 +70,7 @@ reload_qos() {
            ;;
    esac
    hw_commit_all
+    flush_hw_nat
 }

 reload_qos_service() {
--- a/tr104/Makefile
+++ b/tr104/Makefile
@@ -82,6 +82,7 @@ ifeq ($(CONFIG_TR104_RUNAS_BBFDM_MICROSERVICE),y)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/libdm/tr104/libtr104.so $(1) $(PKG_NAME)
 ifeq ($(CONFIG_TR104_VENDOR_EXTENSIONS),y)
 	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/libdm/extensions/iowrt/libtr104ext.so $(1) $(PKG_NAME)
+	$(BBFDM_INSTALL_MS_PLUGIN) ./files/dm_voip.json $(1) $(PKG_NAME)
 endif
 else
 	$(INSTALL_DIR) $(1)/usr/sbin
--- a/tr104/files/dm_voip.json
+++ b/tr104/files/dm_voip.json
@@ -0,0 +1,73 @@
+{
+    "json_plugin_version": 2,
+    "Device.Services.VoiceService.{i}.SIP.Client.{i}.": {
+        "type": "object",
+        "protocols": [
+            "cwmp",
+            "usp"
+        ],
+        "access": true,
+        "array": true,
+        "X_GENEXIS_EU_reset": {
+            "type": "string",
+            "read": false,
+            "write": true,
+            "protocols": [
+                "cwmp",
+                "usp"
+            ],
+            "mapping": [
+                {
+                    "rpc": "set",
+                    "type": "ubus",
+                    "ubus": {
+                        "object": "voip",
+                        "method": "reset",
+                        "args": {
+                            "sip": "@Value"
+			}
+		    }
+		}
+	    ]
+	},
+	"X_GENEXIS_EU_reset()": {
+		"type": "command",
+		"async": true,
+		"protocols": [
+			"usp"
+		],
+		"input": {
+			"sip": {
+				"type": "string",
+				"read": "true",
+				"write": "true",
+				"protocols": [
+					"usp"
+				]
+			}
+		},
+		"output": {
+			"result": {
+				"type": "string",
+				"read": "true",
+				"write": "false",
+				"protocols": [
+					"usp"
+				]
+			}
+		},
+		"mapping": [
+			{
+				"type": "ubus",
+				"ubus": {
+					"object": "voip",
+					"method": "reset",
+					"args": {
+						"sip": "@Input.sip"
+					}
+				}
+			}
+		]
+	}
+    }
+}
--- a/usermngr/Makefile
+++ b/usermngr/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=usermngr
-PKG_VERSION:=1.4.0
+PKG_VERSION:=1.4.1

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/usermngr.git
-PKG_SOURCE_VERSION:=4023f2045dbf498e332200eb1ee275b4a129483b
+PKG_SOURCE_VERSION:=0df79dc0c76bb0d4e903e19b20f85b51de0800a1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
Author	SHA1	Message	Date
Vivek Kumar Dutta	f9e5063f35	tr104: voip reset extension	2025-09-15 19:08:08 +05:30
Markus Gothe	c54fd95889	qosmngr: airoha: flush HW NAT to directly apply changes.	2025-09-15 11:13:08 +02:00
Vivek Kumar Dutta	86fb3db75b	bulkdata: 2.1.21	2025-09-15 12:38:19 +05:30
Vivek Kumar Dutta	70cda05eda	usermngr: 1.4.1	2025-09-15 12:37:18 +05:30
Vivek Kumar Dutta	502aab4f3c	periodicstats: 1.6.1	2025-09-15 12:35:04 +05:30
Vivek Kumar Dutta	34b63e84aa	icwmp: 9.10.2	2025-09-15 12:32:18 +05:30
Vivek Kumar Dutta	5f2aa06285	bbfdm: Fix setting debug log_level	2025-09-15 12:29:59 +05:30