obuspa: Fix notification logging

obuspa/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=9.0.0.16
+PKG_VERSION:=9.0.0.17
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -13,7 +13,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa.git
 PKG_SOURCE_VERSION:=91f9882651de301153060dfe0784859d849aa809
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 

obuspa/files/etc/firewall.usp

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. /lib/functions.sh
+
 log() {
 	echo "$*"|logger -t obuspa.firewall -p debug
 }

obuspa/patches/0001-validate-controller-mtp.patch

@@ -1,7 +1,5 @@
-Index: obuspa-9.0.0.13/src/core/device.h
-===================================================================
---- obuspa-9.0.0.13.orig/src/core/device.h
-+++ obuspa-9.0.0.13/src/core/device.h
+--- a/src/core/device.h
++++ b/src/core/device.h
 @@ -338,6 +338,10 @@ void DEVICE_CONTROLLER_SetInheritedRole(
  int DEVICE_CONTROLLER_CountEnabledWebsockClientConnections(void);
  #endif
@@ -13,10 +11,8 @@ Index: obuspa-9.0.0.13/src/core/device.h
  #ifndef REMOVE_USP_BROKER
  int DEVICE_SUBSCRIPTION_RouteNotification(Usp__Msg *usp, int instance);
  bool DEVICE_SUBSCRIPTION_MarkVendorLayerSubs(int broker_instance, subs_notify_t notify_type, char *path, int group_id);
-Index: obuspa-9.0.0.13/src/core/device_controller.c
-===================================================================
---- obuspa-9.0.0.13.orig/src/core/device_controller.c
-+++ obuspa-9.0.0.13/src/core/device_controller.c
+--- a/src/core/device_controller.c
++++ b/src/core/device_controller.c
 @@ -967,6 +967,78 @@ int DEVICE_CONTROLLER_QueueBinaryMessage
      return USP_ERR_OK;
  }
@@ -96,10 +92,8 @@ Index: obuspa-9.0.0.13/src/core/device_controller.c
  /*********************************************************************//**
  **
  ** DEVICE_CONTROLLER_IsMTPConfigured
-Index: obuspa-9.0.0.13/src/core/msg_handler.c
-===================================================================
---- obuspa-9.0.0.13.orig/src/core/msg_handler.c
-+++ obuspa-9.0.0.13/src/core/msg_handler.c
+--- a/src/core/msg_handler.c
++++ b/src/core/msg_handler.c
 @@ -1210,6 +1210,15 @@ int ValidateUspRecord(UspRecord__Record
      usp_service_instance = USP_BROKER_GetUspServiceInstance(rec->from_id, 0);
  #endif

obuspa/patches/0011-max_controllers.patch

@@ -1,7 +1,5 @@
-Index: obuspa-9.0.0.13/src/core/mqtt.c
-===================================================================
---- obuspa-9.0.0.13.orig/src/core/mqtt.c
-+++ obuspa-9.0.0.13/src/core/mqtt.c
+--- a/src/core/mqtt.c
++++ b/src/core/mqtt.c
 @@ -256,6 +256,8 @@ void MqttSubscriptionDestroy(mqtt_subscr
  #define DEFINE_MQTT_TrustCertVerifyCallbackIndex(index) \
  int MQTT_TrustCertVerifyCallback_##index (int preverify_ok, X509_STORE_CTX *x509_ctx) \

obuspa/patches/0021-fix_e2e_session_init.patch

@@ -1,6 +1,6 @@
---- a/src/core/device_controller.c	2024-08-23 18:22:55.378560809 +0530
-+++ b/src/core/device_controller.c	2024-08-23 19:09:07.130278193 +0530
-@@ -4282,6 +4282,14 @@
+--- a/src/core/device_controller.c
++++ b/src/core/device_controller.c
+@@ -4282,6 +4282,14 @@ int ProcessControllerAdded(int cont_inst
          goto exit;
      }
  
@@ -15,7 +15,7 @@
      // Exit if unable to get the object instance numbers present in this controller's MTP table
      USP_SNPRINTF(path, sizeof(path), "%s.%d.MTP", device_cont_root, cont_instance);
      err = DATA_MODEL_GetInstances(path, &iv);
-@@ -4323,14 +4331,6 @@
+@@ -4323,14 +4331,6 @@ int ProcessControllerAdded(int cont_inst
      DEVICE_MQTT_UpdateControllerTopics();
  #endif
  

obuspa/patches/0022-use-datamodel-caching.patch

@@ -1,8 +1,6 @@
-diff --git a/src/core/cli_server.c b/src/core/cli_server.c
-index d45555a..016c0b7 100644
 --- a/src/core/cli_server.c
 +++ b/src/core/cli_server.c
-@@ -753,6 +753,15 @@ int ExecuteCli_Get(char *arg1, char *arg2, char *usage)
+@@ -753,6 +753,15 @@ int ExecuteCli_Get(char *arg1, char *arg
  }
  #endif
  
@@ -18,39 +16,18 @@ index d45555a..016c0b7 100644
      // Exit if unable to get a list of all parameters referenced by the expression
      STR_VECTOR_Init(&params);
      INT_VECTOR_Init(&group_ids);
-diff --git a/src/core/data_model.h b/src/core/data_model.h
-index b9dc686..0767d02 100755
 --- a/src/core/data_model.h
 +++ b/src/core/data_model.h
-@@ -371,5 +371,6 @@ bool DM_PRIV_IsChildOf(char *path, dm_node_t *parent_node);
+@@ -371,5 +371,6 @@ bool DM_PRIV_IsChildOf(char *path, dm_no
  bool DM_PRIV_IsChildNodeOf(dm_node_t *node, dm_node_t *parent_node);
  bool DM_PRIV_AreAllChildrenGroupId(dm_node_t *parent, int group_id);
  
 +int vendor_create_dm_cache(char *paths[], int num_paths);
  #endif
  
-diff --git a/src/core/device_subscription.c b/src/core/device_subscription.c
-index a35c0d5..fb2fdcd 100644
---- a/src/core/device_subscription.c
-+++ b/src/core/device_subscription.c
-@@ -72,10 +72,10 @@
- //------------------------------------------------------------------------------
- // Uncomment the following define to turn on extra debug which helps with debugging issues related to object
- // creation/deletion notifications not being sent
--//#define DEBUG_OBJECT_NOTIFICATIONS
-+#define DEBUG_OBJECT_NOTIFICATIONS
- 
- #ifdef DEBUG_OBJECT_NOTIFICATIONS
--#define USP_LOG_DebugNotifications(...)  USP_LOG_Info(__VA_ARGS__)
-+#define USP_LOG_DebugNotifications(...)  USP_LOG_Debug(__VA_ARGS__)
- #else
- #define USP_LOG_DebugNotifications(...)
- #endif
-diff --git a/src/core/handle_get.c b/src/core/handle_get.c
-index 170d27d..e4edfab 100644
 --- a/src/core/handle_get.c
 +++ b/src/core/handle_get.c
-@@ -123,6 +123,7 @@ void MSG_HANDLER_HandleGet(Usp__Msg *usp, char *controller_endpoint, mtp_conn_t
+@@ -123,6 +123,7 @@ void MSG_HANDLER_HandleGet(Usp__Msg *usp
          goto exit;
      }