From 2ff9c07c282238e0873b058fbbd5447e2805f719 Mon Sep 17 00:00:00 2001 From: Omar Kallel Date: Thu, 3 Dec 2020 15:17:35 +0100 Subject: [PATCH] GPA in case of empty parameter --- datamodel_interface.c | 2 +- inc/datamodel_interface.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/datamodel_interface.c b/datamodel_interface.c index 47d79e0..55bd8da 100644 --- a/datamodel_interface.c +++ b/datamodel_interface.c @@ -189,7 +189,7 @@ char* cwmp_get_parameter_names(char* object_name, bool next_level, json_object * char* cwmp_get_parameter_attributes(char* parameter_name, json_object **parameters) { json_object *get_attributes_res = NULL; - int e = cwmp_ubus_call("usp.raw", "getm_attributes", CWMP_UBUS_ARGS{{"paths", {.array_value={{.str_value=parameter_name}}}, UBUS_Array_Str}}, 1, &get_attributes_res); + int e = cwmp_ubus_call("usp.raw", "getm_attributes", CWMP_UBUS_ARGS{{"paths", {.array_value={{.str_value=!parameter_name||parameter_name[0]=='\0'?DM_ROOT_OBJ:parameter_name}}}, UBUS_Array_Str}}, 1, &get_attributes_res); if ( e < 0 || get_attributes_res == NULL) return "9002"; json_object *fault_code = NULL; diff --git a/inc/datamodel_interface.h b/inc/datamodel_interface.h index cee9b0e..46f2877 100644 --- a/inc/datamodel_interface.h +++ b/inc/datamodel_interface.h @@ -6,6 +6,7 @@ #include "ubus.h" #include "jshn.h" +#define DM_ROOT_OBJ "Device." int cwmp_transaction_start(); int cwmp_transaction_commit(); int cwmp_transaction_abort();