From db207a87fc3ca3bd02c9243cf233d2a519a72141 Mon Sep 17 00:00:00 2001 From: Vivek Kumar Dutta Date: Sat, 23 Aug 2025 10:08:37 +0530 Subject: [PATCH] obuspa: Integrate v10.0.7 --- obuspa/Makefile | 4 +-- obuspa/patches/1000-suppress-logs.patch | 22 +++++++-------- .../patches/1001-use-datamodel-caching.patch | 28 +++++++++---------- .../patches/1003-ct-full-access-rename.patch | 8 +++--- .../2004-mqtt-dualstack-fallback.patch | 6 ++-- .../patches/2005-revert-mqtt-sub-error.patch | 15 ---------- 6 files changed, 34 insertions(+), 49 deletions(-) delete mode 100644 obuspa/patches/2005-revert-mqtt-sub-error.patch diff --git a/obuspa/Makefile b/obuspa/Makefile index 5e6473191..e90e5b03b 100644 --- a/obuspa/Makefile +++ b/obuspa/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=obuspa -PKG_VERSION:=10.0.6.2 +PKG_VERSION:=10.0.7.0 LOCAL_DEV:=0 ifneq ($(LOCAL_DEV),1) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa.git -PKG_SOURCE_VERSION:=9bf15af88a0f8ee19c2bbf40adcb0fb4850a2f3a +PKG_SOURCE_VERSION:=6584b9f8facf0e688b80ca40d5961bad3f4922f8 PKG_MAINTAINER:=Vivek Dutta PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MIRROR_HASH:=skip diff --git a/obuspa/patches/1000-suppress-logs.patch b/obuspa/patches/1000-suppress-logs.patch index 54f5ad457..93c2ce5be 100644 --- a/obuspa/patches/1000-suppress-logs.patch +++ b/obuspa/patches/1000-suppress-logs.patch @@ -1,8 +1,8 @@ -Index: obuspa-10.0.6.0/src/core/cli_server.c +Index: obuspa-10.0.7.0/src/core/cli_server.c =================================================================== ---- obuspa-10.0.6.0.orig/src/core/cli_server.c -+++ obuspa-10.0.6.0/src/core/cli_server.c -@@ -725,10 +725,6 @@ int ExecuteCli_Get(str_vector_t *args) +--- obuspa-10.0.7.0.orig/src/core/cli_server.c ++++ obuspa-10.0.7.0/src/core/cli_server.c +@@ -726,10 +726,6 @@ int ExecuteCli_Get(str_vector_t *args) USP_ASSERT(gge->value != NULL); SendCliResponse("%s => %s\n", gge->path, gge->value); } @@ -13,10 +13,10 @@ Index: obuspa-10.0.6.0/src/core/cli_server.c } GROUP_GET_VECTOR_Destroy(&ggv); -Index: obuspa-10.0.6.0/src/core/data_model.c +Index: obuspa-10.0.7.0/src/core/data_model.c =================================================================== ---- obuspa-10.0.6.0.orig/src/core/data_model.c -+++ obuspa-10.0.6.0/src/core/data_model.c +--- obuspa-10.0.7.0.orig/src/core/data_model.c ++++ obuspa-10.0.7.0/src/core/data_model.c @@ -1398,7 +1398,7 @@ int DATA_MODEL_NotifyInstanceAdded(char // Exit if instance already exists - nothing to do if (exists) @@ -35,11 +35,11 @@ Index: obuspa-10.0.6.0/src/core/data_model.c return USP_ERR_OBJECT_DOES_NOT_EXIST; } -Index: obuspa-10.0.6.0/src/core/mqtt.c +Index: obuspa-10.0.7.0/src/core/mqtt.c =================================================================== ---- obuspa-10.0.6.0.orig/src/core/mqtt.c -+++ obuspa-10.0.6.0/src/core/mqtt.c -@@ -4059,7 +4059,7 @@ void MessageV5Callback(struct mosquitto +--- obuspa-10.0.7.0.orig/src/core/mqtt.c ++++ obuspa-10.0.7.0/src/core/mqtt.c +@@ -4070,7 +4070,7 @@ void MessageV5Callback(struct mosquitto if (mosquitto_property_read_string(props, RESPONSE_TOPIC, &response_info_ptr, false) == NULL) { diff --git a/obuspa/patches/1001-use-datamodel-caching.patch b/obuspa/patches/1001-use-datamodel-caching.patch index e0e211ad3..c7f6ab861 100644 --- a/obuspa/patches/1001-use-datamodel-caching.patch +++ b/obuspa/patches/1001-use-datamodel-caching.patch @@ -4,11 +4,11 @@ Date: Wed Apr 30 17:18:27 2025 +0530 1001-use-datamodel-caching.patch -Index: obuspa-10.0.6.0/src/core/cli_server.c +Index: obuspa-10.0.7.0/src/core/cli_server.c =================================================================== ---- obuspa-10.0.6.0.orig/src/core/cli_server.c -+++ obuspa-10.0.6.0/src/core/cli_server.c -@@ -512,6 +512,7 @@ int CLI_SERVER_ExecuteCliCommand(char *c +--- obuspa-10.0.7.0.orig/src/core/cli_server.c ++++ obuspa-10.0.7.0/src/core/cli_server.c +@@ -513,6 +513,7 @@ int CLI_SERVER_ExecuteCliCommand(char *c SendCliResponse("WARNING: Discarding unused args: %s\n", args.vector[cli_cmd->max_args+1]); } @@ -16,7 +16,7 @@ Index: obuspa-10.0.6.0/src/core/cli_server.c // Process command err = cli_cmd->exec_cmd(&args); print_help = false; -@@ -671,6 +672,11 @@ int ExecuteCli_Version(str_vector_t *arg +@@ -672,6 +673,11 @@ int ExecuteCli_Version(str_vector_t *arg int ExecuteCli_Get(str_vector_t *args) { combined_role_t *combined_role; @@ -28,10 +28,10 @@ Index: obuspa-10.0.6.0/src/core/cli_server.c #ifndef REMOVE_USP_BROKER char *arg1; -Index: obuspa-10.0.6.0/src/core/data_model.h +Index: obuspa-10.0.7.0/src/core/data_model.h =================================================================== ---- obuspa-10.0.6.0.orig/src/core/data_model.h -+++ obuspa-10.0.6.0/src/core/data_model.h +--- obuspa-10.0.7.0.orig/src/core/data_model.h ++++ obuspa-10.0.7.0/src/core/data_model.h @@ -417,5 +417,6 @@ int DM_PRIV_ReRegister_DBParam_Default(c bool DM_PRIV_IsChildNodeOf(dm_node_t *node, dm_node_t *parent_node); void DM_PRIV_GetAllEventsAndCommands(dm_node_t *node, str_vector_t *events, str_vector_t *commands); @@ -39,10 +39,10 @@ Index: obuspa-10.0.6.0/src/core/data_model.h +int vendor_create_dm_cache(char *paths[], int num_paths); #endif -Index: obuspa-10.0.6.0/src/core/handle_get.c +Index: obuspa-10.0.7.0/src/core/handle_get.c =================================================================== ---- obuspa-10.0.6.0.orig/src/core/handle_get.c -+++ obuspa-10.0.6.0/src/core/handle_get.c +--- obuspa-10.0.7.0.orig/src/core/handle_get.c ++++ obuspa-10.0.7.0/src/core/handle_get.c @@ -129,6 +129,7 @@ void MSG_HANDLER_HandleGet(Usp__Msg *usp goto exit; } @@ -51,10 +51,10 @@ Index: obuspa-10.0.6.0/src/core/handle_get.c // Calculate the number of hierarchical levels to traverse in the data model when performing partial path resolution // NOTE: protocol buffer has depth as an unsigned quantity, but internally we use a signed number, so limit range to that of a signed number depth = usp->body->request->get->max_depth; -Index: obuspa-10.0.6.0/src/core/msg_handler.c +Index: obuspa-10.0.7.0/src/core/msg_handler.c =================================================================== ---- obuspa-10.0.6.0.orig/src/core/msg_handler.c -+++ obuspa-10.0.6.0/src/core/msg_handler.c +--- obuspa-10.0.7.0.orig/src/core/msg_handler.c ++++ obuspa-10.0.7.0/src/core/msg_handler.c @@ -987,6 +987,8 @@ int HandleUspMessage(Usp__Msg *usp, char MSG_HANDLER_UspMsgTypeToString(usp->header->msg_type), iso8601_cur_time(buf, sizeof(buf)) ); diff --git a/obuspa/patches/1003-ct-full-access-rename.patch b/obuspa/patches/1003-ct-full-access-rename.patch index c785f9cfb..e41fd8e7f 100644 --- a/obuspa/patches/1003-ct-full-access-rename.patch +++ b/obuspa/patches/1003-ct-full-access-rename.patch @@ -1,8 +1,8 @@ -Index: obuspa-10.0.6.0/src/core/data_model.c +Index: obuspa-10.0.7.0/src/core/data_model.c =================================================================== ---- obuspa-10.0.6.0.orig/src/core/data_model.c -+++ obuspa-10.0.6.0/src/core/data_model.c -@@ -5516,7 +5516,7 @@ int RegisterDefaultControllerTrust(void) +--- obuspa-10.0.7.0.orig/src/core/data_model.c ++++ obuspa-10.0.7.0/src/core/data_model.c +@@ -5519,7 +5519,7 @@ int RegisterDefaultControllerTrust(void) int err = USP_ERR_OK; // Register 'Full Access' role diff --git a/obuspa/patches/2004-mqtt-dualstack-fallback.patch b/obuspa/patches/2004-mqtt-dualstack-fallback.patch index 3ded7f2d1..12e5b038a 100644 --- a/obuspa/patches/2004-mqtt-dualstack-fallback.patch +++ b/obuspa/patches/2004-mqtt-dualstack-fallback.patch @@ -1,7 +1,7 @@ -Index: obuspa-10.0.6.0/src/core/mqtt.c +Index: obuspa-10.0.7.0/src/core/mqtt.c =================================================================== ---- obuspa-10.0.6.0.orig/src/core/mqtt.c -+++ obuspa-10.0.6.0/src/core/mqtt.c +--- obuspa-10.0.7.0.orig/src/core/mqtt.c ++++ obuspa-10.0.7.0/src/core/mqtt.c @@ -53,6 +53,7 @@ #include #include diff --git a/obuspa/patches/2005-revert-mqtt-sub-error.patch b/obuspa/patches/2005-revert-mqtt-sub-error.patch deleted file mode 100644 index 8ccc46a9e..000000000 --- a/obuspa/patches/2005-revert-mqtt-sub-error.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: obuspa-10.0.6.0/src/core/mqtt.c -=================================================================== ---- obuspa-10.0.6.0.orig/src/core/mqtt.c -+++ obuspa-10.0.6.0/src/core/mqtt.c -@@ -3447,8 +3447,8 @@ void SubscribeToAll(mqtt_client_t *clien - // Exit if no agent response topic configured (or set by the CONNACK) - USP_SNPRINTF(buf, sizeof(buf), "%s: No response topic configured (or set by the CONNACK)", __FUNCTION__); - USP_LOG_Error("%s", buf); -- HandleMqttError(client, kMqttFailure_Misconfigured, buf); -- return; -+ //HandleMqttError(client, kMqttFailure_Misconfigured, buf); -+ //return; - } - - // Subscribe to all subscriptions configured in Device.MQTT.Client.{i}.Subscription.{i}