mirror/bbfdm
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/bbfdm.git synced 2025-12-10 07:44:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix compilation errors for gcc-11

Browse source
This commit is contained in:
vdutta 2021-10-19 18:00:41 +05:30
parent fa5b1bf509
commit 1aee6718b0
19 changed files with 83 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dmdiagnostics.c
View file

@ -545,7 +545,7 @@ int bbf_fw_image_download(const char *url, const char *auto_activate, const char
string_to_bool((char *)auto_activate, &activate); string_to_bool((char *)auto_activate, &activate);
if (activate) { if (activate) {
sleep(30); // Wait for the image to become available sleep(30); // Wait for the image to become available
if (dmubus_call_set("system", "reboot", UBUS_ARGS{}, 0) != 0) if (dmubus_call_set("system", "reboot", UBUS_ARGS{0}, 0) != 0)
res = -1; res = -1;
} }
@ -559,7 +559,7 @@ end:
static void launch_activate_iamge_cb(struct uloop_timeout *t) static void launch_activate_iamge_cb(struct uloop_timeout *t)
{ {
dmubus_call_set("system", "reboot", UBUS_ARGS{}, 0); dmubus_call_set("system", "reboot", UBUS_ARGS{0}, 0);
} }
static void activate_fw_images(struct activate_image *active_img) static void activate_fw_images(struct activate_image *active_img)
@ -584,7 +584,7 @@ int bbf_fw_image_activate(const char *bank_id, struct activate_image *active_img
if (*active_img->start_time) { if (*active_img->start_time) {
activate_fw_images(active_img); activate_fw_images(active_img);
} else { } else {
if (dmubus_call_set("system", "reboot", UBUS_ARGS{}, 0) != 0) if (dmubus_call_set("system", "reboot", UBUS_ARGS{0}, 0) != 0)
return -1; return -1;
} }

2
dmtree/tr104/common.c
View file

@ -30,7 +30,7 @@ int init_supported_codecs(void)
{ {
json_object *res = NULL; json_object *res = NULL;
dmubus_call("voice.asterisk", "codecs", UBUS_ARGS{}, 0, &res); dmubus_call("voice.asterisk", "codecs", UBUS_ARGS{0}, 0, &res);
if (!res) if (!res)
return -1; return -1;

8
dmtree/tr104/servicesvoiceservicedect.c
View file

@ -20,7 +20,7 @@ static int browseServicesVoiceServiceDECTBaseInst(struct dmctx *dmctx, DMNODE *p
char *inst = NULL; char *inst = NULL;
int id = 0, i = 0; int id = 0, i = 0;
dmubus_call("dect", "status", UBUS_ARGS{}, 0, &res); dmubus_call("dect", "status", UBUS_ARGS{0}, 0, &res);
if (res) { if (res) {
dmjson_foreach_obj_in_array(res, arrobj, obj, i, 1, "base") { dmjson_foreach_obj_in_array(res, arrobj, obj, i, 1, "base") {
@ -40,7 +40,7 @@ static int browseServicesVoiceServiceDECTPortableInst(struct dmctx *dmctx, DMNOD
char *inst = NULL; char *inst = NULL;
int id = 0, i = 0; int id = 0, i = 0;
dmubus_call("dect", "status", UBUS_ARGS{}, 0, &res); dmubus_call("dect", "status", UBUS_ARGS{0}, 0, &res);
if (res) { if (res) {
dmjson_foreach_obj_in_array(res, arrobj, obj, i, 1, "handsets") { dmjson_foreach_obj_in_array(res, arrobj, obj, i, 1, "handsets") {
@ -62,7 +62,7 @@ static int get_ServicesVoiceServiceDECT_BaseNumberOfEntries(char *refparam, stru
size_t num = 0; size_t num = 0;
json_object *res, *base; json_object *res, *base;
dmubus_call("dect", "status", UBUS_ARGS{}, 0, &res); dmubus_call("dect", "status", UBUS_ARGS{0}, 0, &res);
DM_ASSERT(res, *value = "0"); DM_ASSERT(res, *value = "0");
json_object_object_get_ex(res, "base", &base); json_object_object_get_ex(res, "base", &base);
@ -79,7 +79,7 @@ static int get_ServicesVoiceServiceDECT_PortableNumberOfEntries(char *refparam,
size_t num = 0; size_t num = 0;
json_object *res, *handsets; json_object *res, *handsets;
dmubus_call("dect", "status", UBUS_ARGS{}, 0, &res); dmubus_call("dect", "status", UBUS_ARGS{0}, 0, &res);
DM_ASSERT(res, *value = "0"); DM_ASSERT(res, *value = "0");
json_object_object_get_ex(res, "handsets", &handsets); json_object_object_get_ex(res, "handsets", &handsets);

6
dmtree/tr104/servicesvoiceservicesip.c
View file

@ -203,7 +203,7 @@ static int get_ServicesVoiceServiceSIPClient_Status(char *refparam, struct dmctx
// Get registration status from ubus // Get registration status from ubus
json_object *res = NULL, *sip = NULL, *client = NULL; json_object *res = NULL, *sip = NULL, *client = NULL;
dmubus_call("voice.asterisk", "status", UBUS_ARGS{}, 0, &res); dmubus_call("voice.asterisk", "status", UBUS_ARGS{0}, 0, &res);
if (res) { if (res) {
sip = dmjson_get_obj(res, 1, "sip"); sip = dmjson_get_obj(res, 1, "sip");
if (sip) { if (sip) {
@ -358,7 +358,7 @@ static int get_ServicesVoiceServiceSIPClientContact_ExpireTime(char *refparam, s
return 0; return 0;
} }
dmubus_call("voice.asterisk", "status", UBUS_ARGS{}, 0, &res); dmubus_call("voice.asterisk", "status", UBUS_ARGS{0}, 0, &res);
if (res) { if (res) {
sip = dmjson_get_obj(res, 1, "sip"); sip = dmjson_get_obj(res, 1, "sip");
if (sip) { if (sip) {
@ -412,7 +412,7 @@ static int get_ServicesVoiceServiceSIPClientContact_UserAgent(char *refparam, st
return 0; return 0;
} }
dmubus_call("voice.asterisk", "status", UBUS_ARGS{}, 0, &res); dmubus_call("voice.asterisk", "status", UBUS_ARGS{0}, 0, &res);
if (res) { if (res) {
sip = dmjson_get_obj(res, 1, "sip"); sip = dmjson_get_obj(res, 1, "sip");
if (sip) { if (sip) {

2
dmtree/tr181/device.c
View file

@ -66,7 +66,7 @@ static int get_Device_RootDataModelVersion(char *refparam, struct dmctx *ctx, vo
*************************************************************/ *************************************************************/
static int operate_Device_Reboot(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) static int operate_Device_Reboot(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
{ {
return !dmubus_call_set("system", "reboot", UBUS_ARGS{}, 0) ? CMD_SUCCESS : CMD_FAIL; return !dmubus_call_set("system", "reboot", UBUS_ARGS{0}, 0) ? CMD_SUCCESS : CMD_FAIL;
} }
static int operate_Device_FactoryReset(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) static int operate_Device_FactoryReset(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)

10
dmtree/tr181/deviceinfo.c
View file

@ -165,7 +165,7 @@ static int browseDeviceInfoFirmwareImageInst(struct dmctx *dmctx, DMNODE *parent
char *inst = NULL; char *inst = NULL;
int id = 0, i = 0; int id = 0, i = 0;
dmubus_call("fwbank", "dump", UBUS_ARGS{}, 0, &res); dmubus_call("fwbank", "dump", UBUS_ARGS{0}, 0, &res);
dmjson_foreach_obj_in_array(res, arrobj, bank_obj, i, 1, "bank") { dmjson_foreach_obj_in_array(res, arrobj, bank_obj, i, 1, "bank") {
inst = handle_instance_without_section(dmctx, parent_node, ++id); inst = handle_instance_without_section(dmctx, parent_node, ++id);
if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)bank_obj, inst) == DM_STOP) if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)bank_obj, inst) == DM_STOP)
@ -181,7 +181,7 @@ static int browseProcessEntriesInst(struct dmctx *dmctx, DMNODE *parent_node, vo
char *inst = NULL; char *inst = NULL;
int id = 0, i = 0; int id = 0, i = 0;
dmubus_call("router.system", "processes", UBUS_ARGS{}, 0, &res); dmubus_call("router.system", "processes", UBUS_ARGS{0}, 0, &res);
dmjson_foreach_obj_in_array(res, arrobj, processes, i, 1, "processes") { dmjson_foreach_obj_in_array(res, arrobj, processes, i, 1, "processes") {
inst = handle_instance_without_section(dmctx, parent_node, ++id); inst = handle_instance_without_section(dmctx, parent_node, ++id);
if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)processes, inst) == DM_STOP) if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)processes, inst) == DM_STOP)
@ -242,7 +242,7 @@ static int get_device_active_fwimage(char *refparam, struct dmctx *ctx, void *da
char linker[32]; char linker[32];
int i = 0; int i = 0;
dmubus_call("fwbank", "dump", UBUS_ARGS{}, 0, &res); dmubus_call("fwbank", "dump", UBUS_ARGS{0}, 0, &res);
dmjson_foreach_obj_in_array(res, arrobj, bank_obj, i, 1, "bank") { dmjson_foreach_obj_in_array(res, arrobj, bank_obj, i, 1, "bank") {
active = dmjson_get_value(bank_obj, 1, "active"); active = dmjson_get_value(bank_obj, 1, "active");
if (active && strcmp(active, "true") == 0) { if (active && strcmp(active, "true") == 0) {
@ -265,7 +265,7 @@ static int get_device_boot_fwimage(char *refparam, struct dmctx *ctx, void *data
char linker[32]; char linker[32];
int i = 0; int i = 0;
dmubus_call("fwbank", "dump", UBUS_ARGS{}, 0, &res); dmubus_call("fwbank", "dump", UBUS_ARGS{0}, 0, &res);
dmjson_foreach_obj_in_array(res, arrobj, bank_obj, i, 1, "bank") { dmjson_foreach_obj_in_array(res, arrobj, bank_obj, i, 1, "bank") {
boot = dmjson_get_value(bank_obj, 1, "boot"); boot = dmjson_get_value(bank_obj, 1, "boot");
if (boot && strcmp(boot, "true") == 0) { if (boot && strcmp(boot, "true") == 0) {
@ -747,7 +747,7 @@ static int get_process_number_of_entries(char* refparam, struct dmctx *ctx, void
json_object *res = NULL, *processes = NULL; json_object *res = NULL, *processes = NULL;
int nbre_process = 0; int nbre_process = 0;
dmubus_call("router.system", "processes", UBUS_ARGS{}, 0, &res); dmubus_call("router.system", "processes", UBUS_ARGS{0}, 0, &res);
DM_ASSERT(res, *value = "0"); DM_ASSERT(res, *value = "0");
json_object_object_get_ex(res, "processes", &processes); json_object_object_get_ex(res, "processes", &processes);
nbre_process = (processes) ? json_object_array_length(processes) : 0; nbre_process = (processes) ? json_object_array_length(processes) : 0;

2
dmtree/tr181/dhcpv6.c
View file

@ -166,7 +166,7 @@ static int browseDHCPv6ServerPoolClientInst(struct dmctx *dmctx, DMNODE *parent_
dmubus_call("network.interface", "status", UBUS_ARGS{{"interface", section_name(dhcp_arg->dhcp_sections->config_section), String}}, 1, &res1); dmubus_call("network.interface", "status", UBUS_ARGS{{"interface", section_name(dhcp_arg->dhcp_sections->config_section), String}}, 1, &res1);
if (!res1) return 0; if (!res1) return 0;
device = dmjson_get_value(res1, 1, "device"); device = dmjson_get_value(res1, 1, "device");
dmubus_call("dhcp", "ipv6leases", UBUS_ARGS{}, 0, &res); dmubus_call("dhcp", "ipv6leases", UBUS_ARGS{0}, 0, &res);
if (!res) return 0; if (!res) return 0;
dev_obj = dmjson_get_obj(res, 1, "device"); dev_obj = dmjson_get_obj(res, 1, "device");
if (!dev_obj) return 0; if (!dev_obj) return 0;

10
dmtree/tr181/dsl.c
View file

@ -108,7 +108,7 @@ static int browseDSLLineInst(struct dmctx *dmctx, DMNODE *parent_node, void *pre
char *inst = NULL; char *inst = NULL;
int entries = 0; int entries = 0;
dmubus_call("dsl", "status", UBUS_ARGS{}, 0, &res); dmubus_call("dsl", "status", UBUS_ARGS{0}, 0, &res);
while (res) { while (res) {
line_obj = dmjson_select_obj_in_array_idx(res, entries, 1, "line"); line_obj = dmjson_select_obj_in_array_idx(res, entries, 1, "line");
if(line_obj) { if(line_obj) {
@ -136,7 +136,7 @@ static int browseDSLChannelInst(struct dmctx *dmctx, DMNODE *parent_node, void *
char *inst = NULL; char *inst = NULL;
int entries_line = 0, entries_channel = 0; int entries_line = 0, entries_channel = 0;
dmubus_call("dsl", "status", UBUS_ARGS{}, 0, &res); dmubus_call("dsl", "status", UBUS_ARGS{0}, 0, &res);
while (res) { while (res) {
line_obj = dmjson_select_obj_in_array_idx(res, entries_line, 1, "line"); line_obj = dmjson_select_obj_in_array_idx(res, entries_line, 1, "line");
while (line_obj) { while (line_obj) {
@ -171,7 +171,7 @@ static char *get_dsl_value_without_argument(char *command1, char *id, char *comm
char command[16], *value = "0"; char command[16], *value = "0";
snprintf(command, sizeof(command), "%s.%s", command1, id); snprintf(command, sizeof(command), "%s.%s", command1, id);
dmubus_call(command, command2, UBUS_ARGS{}, 0, &res); dmubus_call(command, command2, UBUS_ARGS{0}, 0, &res);
if (!res) return ""; if (!res) return "";
value = dmjson_get_value(res, 1, key); value = dmjson_get_value(res, 1, key);
return value; return value;
@ -183,7 +183,7 @@ static char *get_dsl_value_without_argument_and_with_two_key(char *command1, cha
char command[16], *value = "0"; char command[16], *value = "0";
snprintf(command, sizeof(command), "%s.%s", command1, id); snprintf(command, sizeof(command), "%s.%s", command1, id);
dmubus_call(command, command2, UBUS_ARGS{}, 0, &res); dmubus_call(command, command2, UBUS_ARGS{0}, 0, &res);
if (!res) return ""; if (!res) return "";
value = dmjson_get_value(res, 2, key1, key2); value = dmjson_get_value(res, 2, key1, key2);
return value; return value;
@ -207,7 +207,7 @@ static char *get_dsl_value_array_without_argument(char *command1, char *id, char
char command[16], *value= "0"; char command[16], *value= "0";
snprintf(command, sizeof(command), "%s.%s", command1, id); snprintf(command, sizeof(command), "%s.%s", command1, id);
dmubus_call(command, command2, UBUS_ARGS{}, 0, &res); dmubus_call(command, command2, UBUS_ARGS{0}, 0, &res);
if (!res) return ""; if (!res) return "";
value = dmjson_get_value_array_all(res, ",", 1, key); value = dmjson_get_value_array_all(res, ",", 1, key);
return value; return value;

10
dmtree/tr181/fast.c
View file

@ -71,7 +71,7 @@ static int browseFASTLineInst(struct dmctx *dmctx, DMNODE *parent_node, void *pr
char *inst = NULL; char *inst = NULL;
int entries = 0; int entries = 0;
dmubus_call("fast", "status", UBUS_ARGS{}, 0, &res); dmubus_call("fast", "status", UBUS_ARGS{0}, 0, &res);
while (res) { while (res) {
line_obj = dmjson_select_obj_in_array_idx(res, entries, 1, "line"); line_obj = dmjson_select_obj_in_array_idx(res, entries, 1, "line");
if(line_obj) { if(line_obj) {
@ -100,7 +100,7 @@ static char *get_fast_value_without_argument(char *command1, char *id, char *com
char command[16], *value = "0"; char command[16], *value = "0";
snprintf(command, sizeof(command), "%s.%s", command1, id); snprintf(command, sizeof(command), "%s.%s", command1, id);
dmubus_call(command, command2, UBUS_ARGS{}, 0, &res); dmubus_call(command, command2, UBUS_ARGS{0}, 0, &res);
if (!res) return ""; if (!res) return "";
value = dmjson_get_value(res, 1, key); value = dmjson_get_value(res, 1, key);
return value; return value;
@ -112,7 +112,7 @@ static char *get_fast_value_without_argument_and_with_two_key(char *command1, ch
char command[16], *value = "0"; char command[16], *value = "0";
snprintf(command, sizeof(command), "%s.%s", command1, id); snprintf(command, sizeof(command), "%s.%s", command1, id);
dmubus_call(command, command2, UBUS_ARGS{}, 0, &res); dmubus_call(command, command2, UBUS_ARGS{0}, 0, &res);
if (!res) return ""; if (!res) return "";
value = dmjson_get_value(res, 2, key1, key2); value = dmjson_get_value(res, 2, key1, key2);
return value; return value;
@ -124,7 +124,7 @@ static char *get_fast_value_array_without_argument(char *command1, char *id, cha
char command[16], *value= "0"; char command[16], *value= "0";
snprintf(command, sizeof(command), "%s.%s", command1, id); snprintf(command, sizeof(command), "%s.%s", command1, id);
dmubus_call(command, command2, UBUS_ARGS{}, 0, &res); dmubus_call(command, command2, UBUS_ARGS{0}, 0, &res);
if (!res) return ""; if (!res) return "";
value = dmjson_get_value_array_all(res, ",", 1, key); value = dmjson_get_value_array_all(res, ",", 1, key);
return value; return value;
@ -244,7 +244,7 @@ static int get_FASTLine_AllowedProfiles(char *refparam, struct dmctx *ctx, void
unsigned pos = 0, idx = 0; unsigned pos = 0, idx = 0;
snprintf(ubus_name, sizeof(ubus_name), "fast.line.%s", ((struct fast_line_args*)data)->id); snprintf(ubus_name, sizeof(ubus_name), "fast.line.%s", ((struct fast_line_args*)data)->id);
dmubus_call(ubus_name, "status", UBUS_ARGS{}, 0, &res); dmubus_call(ubus_name, "status", UBUS_ARGS{0}, 0, &res);
DM_ASSERT(res, *value = ""); DM_ASSERT(res, *value = "");
list_profile[0] = 0; list_profile[0] = 0;

2
dmtree/tr181/hosts.c
View file

@ -21,7 +21,7 @@ static int browseHostsHostInst(struct dmctx *dmctx, DMNODE *parent_node, void *p
char *inst = NULL; char *inst = NULL;
int id = 0, i = 0; int id = 0, i = 0;
dmubus_call("topology", "hosts", UBUS_ARGS{}, 0, &res); dmubus_call("topology", "hosts", UBUS_ARGS{0}, 0, &res);
dmjson_foreach_obj_in_array(res, arrobj, host_obj, i, 1, "hosts") { dmjson_foreach_obj_in_array(res, arrobj, host_obj, i, 1, "hosts") {
inst = handle_instance_without_section(dmctx, parent_node, ++id); inst = handle_instance_without_section(dmctx, parent_node, ++id);
if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)host_obj, inst) == DM_STOP) if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)host_obj, inst) == DM_STOP)

10
dmtree/tr181/ieee1905.c
View file

@ -22,7 +22,7 @@ static int browseIEEE1905ALInterfaceInst(struct dmctx *dmctx, DMNODE *parent_nod
char *inst = NULL; char *inst = NULL;
int id = 0, i = 0; int id = 0, i = 0;
dmubus_call("ieee1905", "info", UBUS_ARGS{}, 0, &res); dmubus_call("ieee1905", "info", UBUS_ARGS{0}, 0, &res);
dmjson_foreach_obj_in_array(res, arrobj, interface_obj, i, 1, "interface") { dmjson_foreach_obj_in_array(res, arrobj, interface_obj, i, 1, "interface") {
inst = handle_instance_without_section(dmctx, parent_node, ++id); inst = handle_instance_without_section(dmctx, parent_node, ++id);
if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)interface_obj, inst) == DM_STOP) if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)interface_obj, inst) == DM_STOP)
@ -95,7 +95,7 @@ static int browseIEEE1905ALNetworkTopologyIEEE1905DeviceInst(struct dmctx *dmctx
char *inst = NULL; char *inst = NULL;
int id = 0, i = 0; int id = 0, i = 0;
dmubus_call("ieee1905", "info", UBUS_ARGS{}, 0, &res); dmubus_call("ieee1905", "info", UBUS_ARGS{0}, 0, &res);
dmjson_foreach_obj_in_array(res, arrobj, device_obj, i, 2, "topology", "device") { dmjson_foreach_obj_in_array(res, arrobj, device_obj, i, 2, "topology", "device") {
inst = handle_instance_without_section(dmctx, parent_node, ++id); inst = handle_instance_without_section(dmctx, parent_node, ++id);
if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)device_obj, inst) == DM_STOP) if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)device_obj, inst) == DM_STOP)
@ -286,7 +286,7 @@ static int get_linker_topology_interface(char *refparam, struct dmctx *dmctx, vo
static int ubus_ieee1905_info(const char *option, char **value) static int ubus_ieee1905_info(const char *option, char **value)
{ {
json_object *res = NULL; json_object *res = NULL;
dmubus_call("ieee1905", "info", UBUS_ARGS{}, 0, &res); dmubus_call("ieee1905", "info", UBUS_ARGS{0}, 0, &res);
DM_ASSERT(res, *value = ""); DM_ASSERT(res, *value = "");
*value = dmjson_get_value(res, 1, option); *value = dmjson_get_value(res, 1, option);
return 0; return 0;
@ -295,7 +295,7 @@ static int ubus_ieee1905_info(const char *option, char **value)
static int ubus_ieee1905_info_options(const char *option1, const char *option2, char **value) static int ubus_ieee1905_info_options(const char *option1, const char *option2, char **value)
{ {
json_object *res = NULL; json_object *res = NULL;
dmubus_call("ieee1905", "info", UBUS_ARGS{}, 0, &res); dmubus_call("ieee1905", "info", UBUS_ARGS{0}, 0, &res);
DM_ASSERT(res, *value = ""); DM_ASSERT(res, *value = "");
*value = dmjson_get_value(res, 2, option1, option2); *value = dmjson_get_value(res, 2, option1, option2);
return 0; return 0;
@ -379,7 +379,7 @@ static int get_IEEE1905AL_RegistrarFreqBand(char *refparam, struct dmctx *ctx, v
char list_bands[64], *band = NULL; char list_bands[64], *band = NULL;
unsigned pos = 0, idx = 0; unsigned pos = 0, idx = 0;
dmubus_call("ieee1905", "info", UBUS_ARGS{}, 0, &res); dmubus_call("ieee1905", "info", UBUS_ARGS{0}, 0, &res);
DM_ASSERT(res, *value = ""); DM_ASSERT(res, *value = "");
list_bands[0] = 0; list_bands[0] = 0;

8
dmtree/tr181/ip.c
View file

@ -1477,8 +1477,8 @@ static int set_IPInterface_Reset(char *refparam, struct dmctx *ctx, void *data,
if (b) { if (b) {
char interface_obj[64] = {0}; char interface_obj[64] = {0};
snprintf(interface_obj, sizeof(interface_obj), "network.interface.%s", section_name(((struct uci_section *)data))); snprintf(interface_obj, sizeof(interface_obj), "network.interface.%s", section_name(((struct uci_section *)data)));
dmubus_call_set(interface_obj, "down", UBUS_ARGS{}, 0); dmubus_call_set(interface_obj, "down", UBUS_ARGS{0}, 0);
dmubus_call_set(interface_obj, "up", UBUS_ARGS{}, 0); dmubus_call_set(interface_obj, "up", UBUS_ARGS{0}, 0);
} }
break; break;
} }
@ -2220,8 +2220,8 @@ static int operate_IPInterface_Reset(char *refparam, struct dmctx *ctx, void *da
char interface_obj[64] = {0}; char interface_obj[64] = {0};
snprintf(interface_obj, sizeof(interface_obj), "network.interface.%s", section_name(((struct uci_section *)data))); snprintf(interface_obj, sizeof(interface_obj), "network.interface.%s", section_name(((struct uci_section *)data)));
dmubus_call_set(interface_obj, "down", UBUS_ARGS{}, 0); dmubus_call_set(interface_obj, "down", UBUS_ARGS{0}, 0);
dmubus_call_set(interface_obj, "up", UBUS_ARGS{}, 0); dmubus_call_set(interface_obj, "up", UBUS_ARGS{0}, 0);
return CMD_SUCCESS; return CMD_SUCCESS;
} }

10
dmtree/tr181/ppp.c
View file

@ -106,7 +106,7 @@ static int set_ppp_enable(char *refparam, struct dmctx *ctx, void *data, char *i
case VALUESET: case VALUESET:
string_to_bool(value, &b); string_to_bool(value, &b);
dmastrcat(&ubus_object, "network.interface.", section_name(((struct dmmap_dup *)data)->config_section)); dmastrcat(&ubus_object, "network.interface.", section_name(((struct dmmap_dup *)data)->config_section));
dmubus_call_set(ubus_object, b ? "up" : "down", UBUS_ARGS{}, 0); dmubus_call_set(ubus_object, b ? "up" : "down", UBUS_ARGS{0}, 0);
dmfree(ubus_object); dmfree(ubus_object);
break; break;
} }
@ -179,8 +179,8 @@ static int set_PPPInterface_Reset(char *refparam, struct dmctx *ctx, void *data,
if (b) { if (b) {
char intf_obj[64] = {0}; char intf_obj[64] = {0};
snprintf(intf_obj, sizeof(intf_obj), "network.interface.%s", section_name(((struct dmmap_dup *)data)->config_section)); snprintf(intf_obj, sizeof(intf_obj), "network.interface.%s", section_name(((struct dmmap_dup *)data)->config_section));
dmubus_call_set(intf_obj, "down", UBUS_ARGS{}, 0); dmubus_call_set(intf_obj, "down", UBUS_ARGS{0}, 0);
dmubus_call_set(intf_obj, "up", UBUS_ARGS{}, 0); dmubus_call_set(intf_obj, "up", UBUS_ARGS{0}, 0);
} }
break; break;
} }
@ -899,8 +899,8 @@ static int operate_PPPInterface_Reset(char *refparam, struct dmctx *ctx, void *d
char interface_obj[64] = {0}; char interface_obj[64] = {0};
snprintf(interface_obj, sizeof(interface_obj), "network.interface.%s", section_name(((struct dmmap_dup *)data)->config_section)); snprintf(interface_obj, sizeof(interface_obj), "network.interface.%s", section_name(((struct dmmap_dup *)data)->config_section));
dmubus_call_set(interface_obj, "down", UBUS_ARGS{}, 0); dmubus_call_set(interface_obj, "down", UBUS_ARGS{0}, 0);
dmubus_call_set(interface_obj, "up", UBUS_ARGS{}, 0); dmubus_call_set(interface_obj, "up", UBUS_ARGS{0}, 0);
return CMD_SUCCESS; return CMD_SUCCESS;
} }

2
dmtree/tr181/ptm.c
View file

@ -217,7 +217,7 @@ static int get_ptm_fast_line(struct dmctx *ctx, void *data, char *instance, char
{ {
json_object *res = NULL, *line_obj = NULL; json_object *res = NULL, *line_obj = NULL;
dmubus_call("fast", "status", UBUS_ARGS{}, 0, &res); dmubus_call("fast", "status", UBUS_ARGS{0}, 0, &res);
if (!res) if (!res)
return 0; return 0;
line_obj = dmjson_select_obj_in_array_idx(res, 0, 1, "line"); line_obj = dmjson_select_obj_in_array_idx(res, 0, 1, "line");

54
dmtree/tr181/wifi.c
View file

@ -76,7 +76,7 @@ static char *get_radio_option_nocache(const struct wifi_radio_args *args, char *
char object[32]; char object[32];
snprintf(object, sizeof(object), "wifi.radio.%s", section_name(args->sections->config_section)); snprintf(object, sizeof(object), "wifi.radio.%s", section_name(args->sections->config_section));
dmubus_call(object, "status", UBUS_ARGS{}, 0, &res); dmubus_call(object, "status", UBUS_ARGS{0}, 0, &res);
return (res) ? dmjson_get_value(res, 1, option) : ""; return (res) ? dmjson_get_value(res, 1, option) : "";
} }
@ -118,7 +118,7 @@ static int get_supported_modes(const char *ubus_method, const char *ifname, char
unsigned pos = 0, idx = 0; unsigned pos = 0, idx = 0;
snprintf(object, sizeof(object), "%s.%s", ubus_method, ifname); snprintf(object, sizeof(object), "%s.%s", ubus_method, ifname);
dmubus_call(object, "status", UBUS_ARGS{}, 0, &res); dmubus_call(object, "status", UBUS_ARGS{0}, 0, &res);
DM_ASSERT(res, *value = dm_default_modes_supported); DM_ASSERT(res, *value = dm_default_modes_supported);
list_modes[0] = 0; list_modes[0] = 0;
@ -215,7 +215,7 @@ static void wifi_start_scan(const char *radio)
char object[32]; char object[32];
snprintf(object, sizeof(object), "wifi.radio.%s", radio); snprintf(object, sizeof(object), "wifi.radio.%s", radio);
dmubus_call_set(object, "scan", UBUS_ARGS{}, 0); dmubus_call_set(object, "scan", UBUS_ARGS{0}, 0);
} }
/************************************************************* /*************************************************************
@ -454,7 +454,7 @@ static int browseWifiNeighboringWiFiDiagnosticResultInst(struct dmctx *dmctx, DM
uci_foreach_sections("wireless", "wifi-device", s) { uci_foreach_sections("wireless", "wifi-device", s) {
snprintf(object, sizeof(object), "wifi.radio.%s", section_name(s)); snprintf(object, sizeof(object), "wifi.radio.%s", section_name(s));
dmubus_call(object, "scanresults", UBUS_ARGS{}, 0, &res); dmubus_call(object, "scanresults", UBUS_ARGS{0}, 0, &res);
dmjson_foreach_obj_in_array(res, arrobj, accesspoints, i, 1, "accesspoints") { dmjson_foreach_obj_in_array(res, arrobj, accesspoints, i, 1, "accesspoints") {
inst = handle_instance_without_section(dmctx, parent_node, ++id); inst = handle_instance_without_section(dmctx, parent_node, ++id);
if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)accesspoints, inst) == DM_STOP) if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)accesspoints, inst) == DM_STOP)
@ -471,7 +471,7 @@ static int browse_wifi_associated_device(struct dmctx *dmctx, DMNODE *parent_nod
int id = 0, i = 0; int id = 0, i = 0;
snprintf(object, sizeof(object), "wifi.ap.%s", ((struct wifi_acp_args *)prev_data)->ifname); snprintf(object, sizeof(object), "wifi.ap.%s", ((struct wifi_acp_args *)prev_data)->ifname);
dmubus_call(object, "stations", UBUS_ARGS{}, 0, &res); dmubus_call(object, "stations", UBUS_ARGS{0}, 0, &res);
dmjson_foreach_obj_in_array(res, arrobj, stations, i, 1, "stations") { dmjson_foreach_obj_in_array(res, arrobj, stations, i, 1, "stations") {
inst = handle_instance_without_section(dmctx, parent_node, ++id); inst = handle_instance_without_section(dmctx, parent_node, ++id);
if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)stations, inst) == DM_STOP) if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)stations, inst) == DM_STOP)
@ -487,7 +487,7 @@ static int browseWiFiDataElementsNetworkDeviceInst(struct dmctx *dmctx, DMNODE *
json_object *res = NULL, *data_arr = NULL, *data_obj = NULL, *net_obj = NULL; json_object *res = NULL, *data_arr = NULL, *data_obj = NULL, *net_obj = NULL;
json_object *dev_arr = NULL, *dev_obj = NULL; json_object *dev_arr = NULL, *dev_obj = NULL;
dmubus_call("wifi.dataelements.collector", "dump", UBUS_ARGS{}, 0, &res); dmubus_call("wifi.dataelements.collector", "dump", UBUS_ARGS{0}, 0, &res);
dmjson_foreach_obj_in_array(res, data_arr, data_obj, i, 1, "data") { dmjson_foreach_obj_in_array(res, data_arr, data_obj, i, 1, "data") {
json_object_object_get_ex(data_obj, "wfa-dataelements:Network", &net_obj); json_object_object_get_ex(data_obj, "wfa-dataelements:Network", &net_obj);
dmjson_foreach_obj_in_array(net_obj, dev_arr, dev_obj, j, 1, "DeviceList") { dmjson_foreach_obj_in_array(net_obj, dev_arr, dev_obj, j, 1, "DeviceList") {
@ -646,7 +646,7 @@ static int browseWiFiDataElementsAssociationEventAssociationEventDataInst(struct
char *inst = NULL; char *inst = NULL;
int id = 0, i = 0; int id = 0, i = 0;
dmubus_call("wifi.dataelements.collector", "event", UBUS_ARGS{}, 0, &res); dmubus_call("wifi.dataelements.collector", "event", UBUS_ARGS{0}, 0, &res);
dmjson_foreach_obj_in_array(res, notify_arr, notify_obj, i, 1, "notification") { dmjson_foreach_obj_in_array(res, notify_arr, notify_obj, i, 1, "notification") {
if (json_object_object_get_ex(notify_obj, "wfa-dataelements:AssociationEvent", &assoc_ev)) { if (json_object_object_get_ex(notify_obj, "wfa-dataelements:AssociationEvent", &assoc_ev)) {
inst = handle_instance_without_section(dmctx, parent_node, ++id); inst = handle_instance_without_section(dmctx, parent_node, ++id);
@ -663,7 +663,7 @@ static int browseWiFiDataElementsDisassociationEventDisassociationEventDataInst(
char *inst = NULL; char *inst = NULL;
int id = 0, i = 0; int id = 0, i = 0;
dmubus_call("wifi.dataelements.collector", "event", UBUS_ARGS{}, 0, &res); dmubus_call("wifi.dataelements.collector", "event", UBUS_ARGS{0}, 0, &res);
dmjson_foreach_obj_in_array(res, notify_arr, notify_obj, i, 1, "notification") { dmjson_foreach_obj_in_array(res, notify_arr, notify_obj, i, 1, "notification") {
if (json_object_object_get_ex(notify_obj, "wfa-dataelements:DisassociationEvent", &disassoc_ev)) { if (json_object_object_get_ex(notify_obj, "wfa-dataelements:DisassociationEvent", &disassoc_ev)) {
inst = handle_instance_without_section(dmctx, parent_node, ++id); inst = handle_instance_without_section(dmctx, parent_node, ++id);
@ -996,7 +996,7 @@ static int get_WiFiRadio_SupportedOperatingChannelBandwidths(char *refparam, str
int i = 0, pos = 0; int i = 0, pos = 0;
snprintf(object, sizeof(object), "wifi.radio.%s", section_name((((struct wifi_radio_args *)data)->sections)->config_section)); snprintf(object, sizeof(object), "wifi.radio.%s", section_name((((struct wifi_radio_args *)data)->sections)->config_section));
dmubus_call(object, "status", UBUS_ARGS{}, 0, &res); dmubus_call(object, "status", UBUS_ARGS{0}, 0, &res);
DM_ASSERT(res, *value = "Auto"); DM_ASSERT(res, *value = "Auto");
bandwidth_list[0] = 0; bandwidth_list[0] = 0;
@ -2463,7 +2463,7 @@ static int get_wlan_bssid(char *refparam, struct dmctx *ctx, void *data, char *i
char object[32]; char object[32];
snprintf(object, sizeof(object), "wifi.ap.%s", ((struct wifi_ssid_args *)data)->ifname); snprintf(object, sizeof(object), "wifi.ap.%s", ((struct wifi_ssid_args *)data)->ifname);
dmubus_call(object, "status", UBUS_ARGS{}, 0, &res); dmubus_call(object, "status", UBUS_ARGS{0}, 0, &res);
DM_ASSERT(res, *value = ""); DM_ASSERT(res, *value = "");
*value = dmjson_get_value(res, 1, "bssid"); *value = dmjson_get_value(res, 1, "bssid");
return 0; return 0;
@ -2475,7 +2475,7 @@ static int ssid_read_ubus(const struct wifi_ssid_args *args, const char *name, c
char object[32]; char object[32];
snprintf(object, sizeof(object), "wifi.ap.%s", args->ifname); snprintf(object, sizeof(object), "wifi.ap.%s", args->ifname);
dmubus_call(object, "stats", UBUS_ARGS{}, 0, &res); dmubus_call(object, "stats", UBUS_ARGS{0}, 0, &res);
DM_ASSERT(res, *value = "0"); DM_ASSERT(res, *value = "0");
*value = dmjson_get_value(res, 1, name); *value = dmjson_get_value(res, 1, name);
return 0; return 0;
@ -2487,7 +2487,7 @@ static int radio_read_ubus(const struct wifi_radio_args *args, const char *name,
char object[32]; char object[32];
snprintf(object, sizeof(object), "wifi.radio.%s", section_name(args->sections->config_section)); snprintf(object, sizeof(object), "wifi.radio.%s", section_name(args->sections->config_section));
dmubus_call(object, "stats", UBUS_ARGS{}, 0, &res); dmubus_call(object, "stats", UBUS_ARGS{0}, 0, &res);
DM_ASSERT(res, *value = "0"); DM_ASSERT(res, *value = "0");
*value = dmjson_get_value(res, 1, name); *value = dmjson_get_value(res, 1, name);
return 0; return 0;
@ -2792,7 +2792,7 @@ static int get_wifi_access_point_status(char *refparam, struct dmctx *ctx, void
dmuci_get_value_by_section_string((((struct wifi_ssid_args *)data)->sections)->config_section, "device", &iface); dmuci_get_value_by_section_string((((struct wifi_ssid_args *)data)->sections)->config_section, "device", &iface);
snprintf(object, sizeof(object), "wifi.ap.%s", iface); snprintf(object, sizeof(object), "wifi.ap.%s", iface);
dmubus_call(object, "status", UBUS_ARGS{}, 0, &res); dmubus_call(object, "status", UBUS_ARGS{0}, 0, &res);
DM_ASSERT(res, status = "Error_Misconfigured"); DM_ASSERT(res, status = "Error_Misconfigured");
status = dmjson_get_value(res, 1, "status"); status = dmjson_get_value(res, 1, "status");
@ -2810,7 +2810,7 @@ static int get_radio_max_bit_rate (char *refparam, struct dmctx *ctx, void *data
char object[32]; char object[32];
snprintf(object, sizeof(object), "wifi.radio.%s", section_name((((struct wifi_radio_args *)data)->sections)->config_section)); snprintf(object, sizeof(object), "wifi.radio.%s", section_name((((struct wifi_radio_args *)data)->sections)->config_section));
dmubus_call(object, "status", UBUS_ARGS{}, 0, &res); dmubus_call(object, "status", UBUS_ARGS{0}, 0, &res);
DM_ASSERT(res, *value = "0"); DM_ASSERT(res, *value = "0");
*value = dmjson_get_value(res, 1, "maxrate"); *value = dmjson_get_value(res, 1, "maxrate");
return 0; return 0;
@ -2823,7 +2823,7 @@ static int get_radio_supported_frequency_bands(char *refparam, struct dmctx *ctx
char object[32]; char object[32];
snprintf(object, sizeof(object), "wifi.radio.%s", section_name((((struct wifi_radio_args *)data)->sections)->config_section)); snprintf(object, sizeof(object), "wifi.radio.%s", section_name((((struct wifi_radio_args *)data)->sections)->config_section));
dmubus_call(object, "status", UBUS_ARGS{}, 0, &res); dmubus_call(object, "status", UBUS_ARGS{0}, 0, &res);
DM_ASSERT(res, *value = "2.4GHz,5GHz"); DM_ASSERT(res, *value = "2.4GHz,5GHz");
*value = dmjson_get_value_array_all(res, ",", 1, "supp_bands"); *value = dmjson_get_value_array_all(res, ",", 1, "supp_bands");
return 0; return 0;
@ -2836,7 +2836,7 @@ static int get_radio_frequency(char *refparam, struct dmctx *ctx, void *data, ch
char object[32]; char object[32];
snprintf(object, sizeof(object), "wifi.radio.%s", section_name((((struct wifi_radio_args *)data)->sections)->config_section)); snprintf(object, sizeof(object), "wifi.radio.%s", section_name((((struct wifi_radio_args *)data)->sections)->config_section));
dmubus_call(object, "status", UBUS_ARGS{}, 0, &res); dmubus_call(object, "status", UBUS_ARGS{0}, 0, &res);
DM_ASSERT(res, *value = ""); DM_ASSERT(res, *value = "");
*value = dmjson_get_value(res, 1, "band"); *value = dmjson_get_value(res, 1, "band");
return 0; return 0;
@ -2873,7 +2873,7 @@ static int get_radio_channel(char *refparam, struct dmctx *ctx, void *data, char
json_object *res = NULL; json_object *res = NULL;
snprintf(object, sizeof(object), "wifi.radio.%s", section_name((((struct wifi_radio_args *)data)->sections)->config_section)); snprintf(object, sizeof(object), "wifi.radio.%s", section_name((((struct wifi_radio_args *)data)->sections)->config_section));
dmubus_call(object, "status", UBUS_ARGS{}, 0, &res); dmubus_call(object, "status", UBUS_ARGS{0}, 0, &res);
DM_ASSERT(res, *value = "0"); DM_ASSERT(res, *value = "0");
*value = dmjson_get_value(res, 1, "channel"); *value = dmjson_get_value(res, 1, "channel");
@ -2889,7 +2889,7 @@ static int get_neighboring_wifi_diagnostics_diagnostics_state(char *refparam, st
*value = "None"; *value = "None";
uci_foreach_sections("wireless", "wifi-device", ss) { uci_foreach_sections("wireless", "wifi-device", ss) {
snprintf(object, sizeof(object), "wifi.radio.%s", section_name(ss)); snprintf(object, sizeof(object), "wifi.radio.%s", section_name(ss));
dmubus_call(object, "scanresults", UBUS_ARGS{}, 0, &res); dmubus_call(object, "scanresults", UBUS_ARGS{0}, 0, &res);
DM_ASSERT(res, *value = "None"); DM_ASSERT(res, *value = "None");
neighboring_wifi_obj = dmjson_select_obj_in_array_idx(res, 0, 1, "accesspoints"); neighboring_wifi_obj = dmjson_select_obj_in_array_idx(res, 0, 1, "accesspoints");
if (neighboring_wifi_obj) { if (neighboring_wifi_obj) {
@ -2958,7 +2958,7 @@ static int get_radio_possible_channels(char *refparam, struct dmctx *ctx, void *
int i = 0; int i = 0;
snprintf(object, sizeof(object), "wifi.radio.%s", section_name((((struct wifi_radio_args *)data)->sections)->config_section)); snprintf(object, sizeof(object), "wifi.radio.%s", section_name((((struct wifi_radio_args *)data)->sections)->config_section));
dmubus_call(object, "status", UBUS_ARGS{}, 0, &res); dmubus_call(object, "status", UBUS_ARGS{0}, 0, &res);
DM_ASSERT(res, *value = ""); DM_ASSERT(res, *value = "");
cur_opclass = dmjson_get_value(res, 1, "opclass"); cur_opclass = dmjson_get_value(res, 1, "opclass");
dmjson_foreach_obj_in_array(res, arrobj, supp_channels, i, 1, "supp_channels") { dmjson_foreach_obj_in_array(res, arrobj, supp_channels, i, 1, "supp_channels") {
@ -2979,7 +2979,7 @@ static int get_WiFiRadio_CurrentOperatingChannelBandwidth(char *refparam, struct
char object[32]; char object[32];
snprintf(object, sizeof(object), "wifi.radio.%s", section_name((((struct wifi_radio_args *)data)->sections)->config_section)); snprintf(object, sizeof(object), "wifi.radio.%s", section_name((((struct wifi_radio_args *)data)->sections)->config_section));
dmubus_call(object, "status", UBUS_ARGS{}, 0, &res); dmubus_call(object, "status", UBUS_ARGS{0}, 0, &res);
DM_ASSERT(res, *value = "20MHz"); DM_ASSERT(res, *value = "20MHz");
dmasprintf(value, "%sMHz", dmjson_get_value(res, 1, "bandwidth")); dmasprintf(value, "%sMHz", dmjson_get_value(res, 1, "bandwidth"));
return 0; return 0;
@ -3001,7 +3001,7 @@ static int get_radio_operating_standard(char *refparam, struct dmctx *ctx, void
char object[16]; char object[16];
snprintf(object, sizeof(object), "wifi.radio.%s", section_name((((struct wifi_radio_args *)data)->sections)->config_section)); snprintf(object, sizeof(object), "wifi.radio.%s", section_name((((struct wifi_radio_args *)data)->sections)->config_section));
dmubus_call(object, "status", UBUS_ARGS{}, 0, &res); dmubus_call(object, "status", UBUS_ARGS{0}, 0, &res);
DM_ASSERT(res, *value = "n,ax"); DM_ASSERT(res, *value = "n,ax");
char *standard = dmjson_get_value(res, 1, "standard"); char *standard = dmjson_get_value(res, 1, "standard");
if (strstr(standard, "802.11")) { if (strstr(standard, "802.11")) {
@ -3088,7 +3088,7 @@ static int get_access_point_total_associations(char *refparam, struct dmctx *ctx
int i = 0, entries = 0; int i = 0, entries = 0;
snprintf(object, sizeof(object), "wifi.ap.%s", ((struct wifi_acp_args *)data)->ifname); snprintf(object, sizeof(object), "wifi.ap.%s", ((struct wifi_acp_args *)data)->ifname);
dmubus_call(object, "assoclist", UBUS_ARGS{}, 0, &res); dmubus_call(object, "assoclist", UBUS_ARGS{0}, 0, &res);
dmjson_foreach_obj_in_array(res, arrobj, assoclist, i, 1, "assoclist") { dmjson_foreach_obj_in_array(res, arrobj, assoclist, i, 1, "assoclist") {
entries++; entries++;
} }
@ -3101,7 +3101,7 @@ static int get_WiFiDataElementsNetwork_option(const char *option, char **value)
int i = 0; int i = 0;
json_object *res, *data_arr = NULL, *data_obj = NULL, *net_obj = NULL; json_object *res, *data_arr = NULL, *data_obj = NULL, *net_obj = NULL;
dmubus_call("wifi.dataelements.collector", "dump", UBUS_ARGS{}, 0, &res); dmubus_call("wifi.dataelements.collector", "dump", UBUS_ARGS{0}, 0, &res);
DM_ASSERT(res, *value = ""); DM_ASSERT(res, *value = "");
dmjson_foreach_obj_in_array(res, data_arr, data_obj, i, 1, "data") { dmjson_foreach_obj_in_array(res, data_arr, data_obj, i, 1, "data") {
json_object_object_get_ex(data_obj, "wfa-dataelements:Network", &net_obj); json_object_object_get_ex(data_obj, "wfa-dataelements:Network", &net_obj);
@ -3162,7 +3162,7 @@ static int get_WiFiDataElementsNetwork_DeviceNumberOfEntries(char *refparam, str
int i = 0; int i = 0;
json_object *res, *data_arr = NULL, *data_obj = NULL, *net_obj = NULL; json_object *res, *data_arr = NULL, *data_obj = NULL, *net_obj = NULL;
dmubus_call("wifi.dataelements.collector", "dump", UBUS_ARGS{}, 0, &res); dmubus_call("wifi.dataelements.collector", "dump", UBUS_ARGS{0}, 0, &res);
DM_ASSERT(res, *value = "0"); DM_ASSERT(res, *value = "0");
dmjson_foreach_obj_in_array(res, data_arr, data_obj, i, 1, "data") { dmjson_foreach_obj_in_array(res, data_arr, data_obj, i, 1, "data") {
json_object_object_get_ex(data_obj, "wfa-dataelements:Network", &net_obj); json_object_object_get_ex(data_obj, "wfa-dataelements:Network", &net_obj);
@ -4102,7 +4102,7 @@ static int operate_WiFi_NeighboringWiFiDiagnostic(char *refparam, struct dmctx *
{ {
json_object *res = NULL; json_object *res = NULL;
dmubus_call("wifi", "status", UBUS_ARGS{}, 0, &res); dmubus_call("wifi", "status", UBUS_ARGS{0}, 0, &res);
if (res) { if (res) {
json_object *radios = NULL, *arrobj = NULL; json_object *radios = NULL, *arrobj = NULL;
int i = 0; int i = 0;
@ -4119,9 +4119,9 @@ static int operate_WiFi_NeighboringWiFiDiagnostic(char *refparam, struct dmctx *
char *radio_name = dmjson_get_value(radios, 1, "name"); char *radio_name = dmjson_get_value(radios, 1, "name");
snprintf(object, sizeof(object), "wifi.radio.%s", radio_name); snprintf(object, sizeof(object), "wifi.radio.%s", radio_name);
dmubus_call_set(object, "scan", UBUS_ARGS{}, 0); dmubus_call_set(object, "scan", UBUS_ARGS{0}, 0);
sleep(2); // Wait for results to get populated in scanresults sleep(2); // Wait for results to get populated in scanresults
dmubus_call(object, "scanresults", UBUS_ARGS{}, 0, &scan_res); dmubus_call(object, "scanresults", UBUS_ARGS{0}, 0, &scan_res);
if (!scan_res) if (!scan_res)
continue; continue;

4
dmtree/vendor/iopsys/tr181/x_iopsys_eu_igmp.c vendored
View file

@ -535,7 +535,7 @@ static int browse_igmp_cgrp_inst(struct dmctx *dmctx, DMNODE *parent_node, void
json_object *res = NULL, *jobj = NULL, *arrobj = NULL, *group_obj = NULL; json_object *res = NULL, *jobj = NULL, *arrobj = NULL, *group_obj = NULL;
char *inst = NULL; char *inst = NULL;
dmubus_call("mcast", "stats", UBUS_ARGS{}, 0, &res); dmubus_call("mcast", "stats", UBUS_ARGS{0}, 0, &res);
if (res) { if (res) {
int i = 0, id = 0; int i = 0, id = 0;
@ -646,7 +646,7 @@ static int get_igmp_cgrps_no_of_entries(char *refparam, struct dmctx *ctx, void
int cnt = 0; int cnt = 0;
json_object *res = NULL, *jobj = NULL, *arrobj = NULL, *group_obj = NULL; json_object *res = NULL, *jobj = NULL, *arrobj = NULL, *group_obj = NULL;
dmubus_call("mcast", "stats", UBUS_ARGS{}, 0, &res); dmubus_call("mcast", "stats", UBUS_ARGS{0}, 0, &res);
if (res) { if (res) {
int i = 0; int i = 0;

2
test/bbf_test/libbbf_test.c
View file

@ -259,7 +259,7 @@ static int set_X_IOPSYS_EU_Syslog_ConsoleLogLevel(char *refparam, struct dmctx *
*************************************************************/ *************************************************************/
static int operate_Device_X_IOPSYS_EU_Reboot(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) static int operate_Device_X_IOPSYS_EU_Reboot(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
{ {
return !dmubus_call_set("system", "reboot", UBUS_ARGS{}, 0) ? CMD_SUCCESS : CMD_FAIL; return !dmubus_call_set("system", "reboot", UBUS_ARGS{0}, 0) ? CMD_SUCCESS : CMD_FAIL;
} }
static operation_args x_iopsys_eu_ping_test_run_args = { static operation_args x_iopsys_eu_ping_test_run_args = {

14
test/cmocka/functional_api_test_bbfd.c
View file

@ -398,11 +398,11 @@ static void test_bbf_api_ubus(void **state)
*/ */
// dmubus_call: test Wrong obj // dmubus_call: test Wrong obj
dmubus_call("ucii", "configs", UBUS_ARGS{}, 0, &res); dmubus_call("ucii", "configs", UBUS_ARGS{0}, 0, &res);
assert_null(res); assert_null(res);
// dmubus_call: test Wrong method // dmubus_call: test Wrong method
dmubus_call("uci", "configss", UBUS_ARGS{}, 0, &res); dmubus_call("uci", "configss", UBUS_ARGS{0}, 0, &res);
assert_null(res); assert_null(res);
// dmubus_call: test Wrong argument // dmubus_call: test Wrong argument
@ -410,7 +410,7 @@ static void test_bbf_api_ubus(void **state)
assert_null(res); assert_null(res);
// dmubus_call: test correct obj/method // dmubus_call: test correct obj/method
dmubus_call("uci", "configs", UBUS_ARGS{}, 0, &res); dmubus_call("uci", "configs", UBUS_ARGS{0}, 0, &res);
assert_non_null(res); assert_non_null(res);
// dmubus_call: test correct obj/method // dmubus_call: test correct obj/method
@ -422,11 +422,11 @@ static void test_bbf_api_ubus(void **state)
*/ */
// dmubus_call_set: test Wrong obj // dmubus_call_set: test Wrong obj
ubus_res = dmubus_call_set("ucii", "configs", UBUS_ARGS{}, 0); ubus_res = dmubus_call_set("ucii", "configs", UBUS_ARGS{0}, 0);
assert_int_not_equal(ubus_res, 0); assert_int_not_equal(ubus_res, 0);
// dmubus_call_set: test Wrong method // dmubus_call_set: test Wrong method
ubus_res = dmubus_call_set("uci", "configss", UBUS_ARGS{}, 0); ubus_res = dmubus_call_set("uci", "configss", UBUS_ARGS{0}, 0);
assert_int_not_equal(ubus_res, 0); assert_int_not_equal(ubus_res, 0);
// dmubus_call_set: test Wrong argument // dmubus_call_set: test Wrong argument
@ -434,7 +434,7 @@ static void test_bbf_api_ubus(void **state)
assert_int_not_equal(ubus_res, 0); assert_int_not_equal(ubus_res, 0);
// dmubus_call_set: test correct obj/method // dmubus_call_set: test correct obj/method
ubus_res = dmubus_call_set("uci", "configs", UBUS_ARGS{}, 0); ubus_res = dmubus_call_set("uci", "configs", UBUS_ARGS{0}, 0);
assert_int_equal(ubus_res, 0); assert_int_equal(ubus_res, 0);
// dmubus_call_set: test correct obj/method // dmubus_call_set: test correct obj/method
@ -477,7 +477,7 @@ static void test_bbf_api_json(void **state)
char *json_value = NULL; char *json_value = NULL;
int idx = 0; int idx = 0;
dmubus_call("wifi.ap.test2", "status", UBUS_ARGS{}, 0, &wifi_status); dmubus_call("wifi.ap.test2", "status", UBUS_ARGS{0}, 0, &wifi_status);
assert_non_null(wifi_status); assert_non_null(wifi_status);
/* /*

4
tools/convert_dm_json_to_c.py
View file

@ -498,7 +498,7 @@ def cprintBrowseObj(fbrowse, name, mappingobj, dmobject):
print(" int id = 0, i = 0;", file=fp) print(" int id = 0, i = 0;", file=fp)
print("", file=fp) print("", file=fp)
if res3 is None and res4 is None: if res3 is None and res4 is None:
print(" dmubus_call(\"%s\", \"%s\", UBUS_ARGS{}, 0, &res);" % print(" dmubus_call(\"%s\", \"%s\", UBUS_ARGS{0}, 0, &res);" %
(res1, res2), file=fp) (res1, res2), file=fp)
else: else:
print(" dmubus_call(\"%s\", \"%s\", UBUS_ARGS{{\"%s\", \"%s\", String}}, 1, &res);" % ( print(" dmubus_call(\"%s\", \"%s\", UBUS_ARGS{{\"%s\", \"%s\", String}}, 1, &res);" % (
@ -635,7 +635,7 @@ def cprintGetSetValue(getvalue, setvalue, mappingparam, instance, typeparam, par
else: else:
get_value += " json_object *res;\n" get_value += " json_object *res;\n"
if res3 is None and res4 is None: if res3 is None and res4 is None:
get_value += " dmubus_call(\"%s\", \"%s\", UBUS_ARGS{}, 0, &res);\n" % ( get_value += " dmubus_call(\"%s\", \"%s\", UBUS_ARGS{0}, 0, &res);\n" % (
res1, res2) res1, res2)
else: else:
if i == 2 and res4 == "prev_value": if i == 2 and res4 == "prev_value":