mirror of
https://dev.iopsys.eu/bbf/bbfdm.git
synced 2025-12-10 07:44:39 +01:00
bbfdm: Update Operate handling
This commit is contained in:
Amin Ben Romdhane
parent
1300dedbe0
commit
0e8cb4dbd3
19 changed files with 130 additions and 142 deletions
|
|
@ -30,38 +30,17 @@
|
|||
|
||||
static int bbfdm_dm_operate(bbfdm_data_t *data)
|
||||
{
|
||||
int fault = 0, ret = 0;
|
||||
int fault = 0;
|
||||
void *table, *array;
|
||||
|
||||
bbf_init(&data->bbf_ctx);
|
||||
|
||||
ret = bbf_entry_method(&data->bbf_ctx, BBF_OPERATE);
|
||||
// This switch should be removed in the future and will be treated internally
|
||||
switch (ret) {
|
||||
case CMD_NOT_FOUND:
|
||||
fault = bbfdm_FAULT_INVALID_PATH;
|
||||
break;
|
||||
case CMD_INVALID_ARGUMENTS:
|
||||
fault = bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
break;
|
||||
case CMD_FAIL:
|
||||
fault = bbfdm_FAULT_COMMAND_FAILURE;
|
||||
break;
|
||||
case CMD_SUCCESS:
|
||||
fault = 0;
|
||||
DEBUG("command executed successfully");
|
||||
break;
|
||||
default:
|
||||
WARNING("Case(%d) not defined", fault);
|
||||
fault = bbfdm_FAULT_INVALID_PATH;
|
||||
break;
|
||||
}
|
||||
|
||||
void *global_table = blobmsg_open_table(&data->bb, NULL);
|
||||
blobmsg_add_string(&data->bb, "path", data->bbf_ctx.in_param);
|
||||
blobmsg_add_string(&data->bb, "data", data->bbf_ctx.linker);
|
||||
|
||||
if (ret == CMD_SUCCESS) {
|
||||
fault = bbf_entry_method(&data->bbf_ctx, BBF_OPERATE);
|
||||
if (fault == 0) {
|
||||
struct dm_parameter *n;
|
||||
|
||||
if (data->is_raw) {
|
||||
|
|
@ -98,12 +77,7 @@ static int bbfdm_dm_operate(bbfdm_data_t *data)
|
|||
|
||||
bbf_cleanup(&data->bbf_ctx);
|
||||
|
||||
if (fault != 0) {
|
||||
WARNING("Fault(%d) path(%s) input(%s)", fault, data->bbf_ctx.in_param, data->bbf_ctx.in_value);
|
||||
return fault;
|
||||
}
|
||||
|
||||
return 0;
|
||||
return fault;
|
||||
}
|
||||
|
||||
static void bbfdm_operate_cmd(bbfdm_data_t *data)
|
||||
|
|
|
|||
|
|
@ -1341,11 +1341,12 @@ static int operate_ubus(struct dmctx *dmctx, struct dmnode *node)
|
|||
|
||||
dmubus_call(ubus_name, "operate",
|
||||
UBUS_ARGS{
|
||||
{"path", dmctx->in_param, String},
|
||||
{"command", dmctx->in_param, String},
|
||||
{"command_key", dmctx->linker, String},
|
||||
{"input", dmctx->in_value ? dmctx->in_value : "{}", Table},
|
||||
{"optional", json_object_to_json_string(in_args), Table}
|
||||
},
|
||||
3, &res);
|
||||
4, &res);
|
||||
|
||||
json_object_put(in_args);
|
||||
|
||||
|
|
@ -1367,7 +1368,20 @@ static int operate_ubus(struct dmctx *dmctx, struct dmnode *node)
|
|||
if (DM_STRLEN(fault))
|
||||
return DM_STRTOUL(fault);
|
||||
|
||||
//TODO
|
||||
json_object *output_array = dmjson_get_obj(res_obj, 1, "output");
|
||||
if (output_array) {
|
||||
size_t out_nbre = json_object_array_length(output_array);
|
||||
|
||||
for (size_t j = 0; j < out_nbre; j++) {
|
||||
json_object *out_obj = json_object_array_get_idx(output_array, j);
|
||||
|
||||
char *path = dmjson_get_value(out_obj, 1, "path");
|
||||
char *data = dmjson_get_value(out_obj, 1, "data");
|
||||
char *type = dmjson_get_value(out_obj, 1, "type");
|
||||
|
||||
add_list_parameter(dmctx, dmstrdup(path), dmstrdup(data), dmstrdup(type), NULL);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
@ -2120,7 +2134,7 @@ int dm_entry_get_linker_value(struct dmctx *dmctx)
|
|||
* **************/
|
||||
static int mobj_operate(DMOBJECT_ARGS)
|
||||
{
|
||||
return CMD_NOT_FOUND;
|
||||
return bbfdm_FAULT_INVALID_PATH;
|
||||
}
|
||||
|
||||
static int mparam_operate(DMPARAM_ARGS)
|
||||
|
|
@ -2132,12 +2146,12 @@ static int mparam_operate(DMPARAM_ARGS)
|
|||
|
||||
snprintf(full_param, MAX_DM_PATH, "%s%s", node->current_object, leaf->parameter);
|
||||
if (DM_STRCMP(full_param, dmctx->in_param) != 0)
|
||||
return CMD_NOT_FOUND;
|
||||
return bbfdm_FAULT_INVALID_PATH;
|
||||
|
||||
dmctx->stop = 1;
|
||||
|
||||
if (!leaf->setvalue)
|
||||
return CMD_FAIL;
|
||||
return bbfdm_FAULT_COMMAND_FAILURE;
|
||||
|
||||
json_object *j_input = (dmctx->in_value) ? json_tokener_parse(dmctx->in_value) : NULL;
|
||||
int fault = (leaf->setvalue)(full_param, dmctx, data, instance, (char *)j_input, VALUESET);
|
||||
|
|
@ -2154,7 +2168,7 @@ int dm_entry_operate(struct dmctx *dmctx)
|
|||
int err = 0;
|
||||
|
||||
if (dmctx->in_param == NULL || dmctx->in_param[0] == '\0' || (*(dmctx->in_param + DM_STRLEN(dmctx->in_param) - 1) != ')'))
|
||||
return CMD_NOT_FOUND;
|
||||
return bbfdm_FAULT_INVALID_PATH;
|
||||
|
||||
dmctx->iscommand = 1;
|
||||
dmctx->inparam_isparam = 1;
|
||||
|
|
@ -2166,5 +2180,5 @@ int dm_entry_operate(struct dmctx *dmctx)
|
|||
|
||||
err = dm_browse(dmctx, &node, root, NULL, NULL);
|
||||
|
||||
return (dmctx->stop) ? err : CMD_NOT_FOUND;
|
||||
return (dmctx->stop) ? err : bbfdm_FAULT_INVALID_PATH;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -958,7 +958,7 @@ static int ubus_set_operate(json_object *mapping_obj, int json_version, char *re
|
|||
json_object_put(res);
|
||||
}
|
||||
|
||||
return CMD_SUCCESS;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int linker_obj(char *refparam, struct dmctx *dmctx, void *data, char *instance, char **linker)
|
||||
|
|
@ -1025,7 +1025,7 @@ static int setcommand_param(char *refparam, struct dmctx *ctx, void *data, char
|
|||
}
|
||||
|
||||
if (p_obj == NULL) {
|
||||
return CMD_FAIL;
|
||||
return bbfdm_FAULT_COMMAND_FAILURE;
|
||||
}
|
||||
|
||||
json_object_object_get_ex(p_obj, "mapping", &map_arr);
|
||||
|
|
@ -1033,7 +1033,7 @@ static int setcommand_param(char *refparam, struct dmctx *ctx, void *data, char
|
|||
map_obj = json_object_array_get_idx(map_arr, 0);
|
||||
|
||||
if (!map_obj) {
|
||||
return CMD_FAIL;
|
||||
return bbfdm_FAULT_COMMAND_FAILURE;
|
||||
}
|
||||
|
||||
json_object_object_get_ex(map_obj, "type", &type);
|
||||
|
|
@ -1042,7 +1042,7 @@ static int setcommand_param(char *refparam, struct dmctx *ctx, void *data, char
|
|||
return ubus_set_operate(map_obj, json_version, refparam, ctx, data, value, instance);
|
||||
}
|
||||
|
||||
return CMD_FAIL;
|
||||
return bbfdm_FAULT_COMMAND_FAILURE;
|
||||
}
|
||||
|
||||
static int getevent_param(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
|
||||
|
|
|
|||
|
|
@ -1705,7 +1705,7 @@ static int operate_IPDiagnostics_IPPing(char *refparam, struct dmctx *ctx, void
|
|||
|
||||
char *ipping_host = dmjson_get_value((json_object *)value, 1, "Host");
|
||||
if (ipping_host[0] == '\0')
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
char *ip_interface = dmjson_get_value((json_object *)value, 1, "Interface");
|
||||
char *ipping_interface = get_diagnostics_interface_option(ctx, ip_interface);
|
||||
char *ipping_proto = dmjson_get_value((json_object *)value, 1, "ProtocolVersion");
|
||||
|
|
@ -1729,7 +1729,7 @@ static int operate_IPDiagnostics_IPPing(char *refparam, struct dmctx *ctx, void
|
|||
8, &res);
|
||||
|
||||
if (res == NULL)
|
||||
return CMD_FAIL;
|
||||
return bbfdm_FAULT_COMMAND_FAILURE;
|
||||
|
||||
char *ipping_status = dmjson_get_value(res, 1, "Status");
|
||||
char *ipping_ip_address_used = dmjson_get_value(res, 1, "IPAddressUsed");
|
||||
|
|
@ -1756,7 +1756,7 @@ static int operate_IPDiagnostics_IPPing(char *refparam, struct dmctx *ctx, void
|
|||
if (res != NULL)
|
||||
json_object_put(res);
|
||||
|
||||
return CMD_SUCCESS;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static operation_args ip_diagnostics_trace_route_args = {
|
||||
|
|
@ -1803,7 +1803,7 @@ static int operate_IPDiagnostics_TraceRoute(char *refparam, struct dmctx *ctx, v
|
|||
|
||||
char *host = dmjson_get_value((json_object *)value, 1, "Host");
|
||||
if (host[0] == '\0')
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
char *ip_interface = dmjson_get_value((json_object *)value, 1, "Interface");
|
||||
char *interface = get_diagnostics_interface_option(ctx, ip_interface);
|
||||
|
|
@ -1832,13 +1832,13 @@ static int operate_IPDiagnostics_TraceRoute(char *refparam, struct dmctx *ctx, v
|
|||
fgets(output, sizeof(output) , pp);
|
||||
pclose(pp);
|
||||
} else {
|
||||
return CMD_FAIL;
|
||||
return bbfdm_FAULT_COMMAND_FAILURE;
|
||||
}
|
||||
|
||||
json_object *res = (DM_STRLEN(output)) ? json_tokener_parse(output) : NULL;
|
||||
|
||||
if (res == NULL)
|
||||
return CMD_FAIL;
|
||||
return bbfdm_FAULT_COMMAND_FAILURE;
|
||||
|
||||
char *status = dmjson_get_value(res, 1, "Status");
|
||||
char *ip_address_used = dmjson_get_value(res, 1, "IPAddressUsed");
|
||||
|
|
@ -1868,7 +1868,7 @@ static int operate_IPDiagnostics_TraceRoute(char *refparam, struct dmctx *ctx, v
|
|||
if (res != NULL)
|
||||
json_object_put(res);
|
||||
|
||||
return CMD_SUCCESS;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static operation_args ip_diagnostics_download_args = {
|
||||
|
|
@ -1931,12 +1931,12 @@ static int operate_IPDiagnostics_DownloadDiagnostics(char *refparam, struct dmct
|
|||
char *download_url = dmjson_get_value((json_object *)value, 1, "DownloadURL");
|
||||
|
||||
if (download_url[0] == '\0')
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
if (strncmp(download_url, HTTP_URI, strlen(HTTP_URI)) != 0 &&
|
||||
strncmp(download_url, FTP_URI, strlen(FTP_URI)) != 0 &&
|
||||
strchr(download_url,'@') != NULL)
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
char *ip_interface = dmjson_get_value((json_object *)value, 1, "Interface");
|
||||
char *download_interface = get_diagnostics_interface_option(ctx, ip_interface);
|
||||
|
|
@ -1963,13 +1963,13 @@ static int operate_IPDiagnostics_DownloadDiagnostics(char *refparam, struct dmct
|
|||
fgets(output, sizeof(output) , pp);
|
||||
pclose(pp);
|
||||
} else {
|
||||
return CMD_FAIL;
|
||||
return bbfdm_FAULT_COMMAND_FAILURE;
|
||||
}
|
||||
|
||||
json_object *res = (DM_STRLEN(output)) ? json_tokener_parse(output) : NULL;
|
||||
|
||||
if (res == NULL)
|
||||
return CMD_FAIL;
|
||||
return bbfdm_FAULT_COMMAND_FAILURE;
|
||||
|
||||
char *status = dmjson_get_value(res, 1, "Status");
|
||||
char *ip_address_used = dmjson_get_value(res, 1, "IPAddressUsed");
|
||||
|
|
@ -2001,7 +2001,7 @@ static int operate_IPDiagnostics_DownloadDiagnostics(char *refparam, struct dmct
|
|||
if (res != NULL)
|
||||
json_object_put(res);
|
||||
|
||||
return CMD_SUCCESS;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static operation_args ip_diagnostics_upload_args = {
|
||||
|
|
@ -2065,16 +2065,16 @@ static int operate_IPDiagnostics_UploadDiagnostics(char *refparam, struct dmctx
|
|||
char *upload_url = dmjson_get_value((json_object *)value, 1, "UploadURL");
|
||||
|
||||
if (upload_url[0] == '\0')
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
if (strncmp(upload_url, HTTP_URI, strlen(HTTP_URI)) != 0 &&
|
||||
strncmp(upload_url, FTP_URI, strlen(FTP_URI)) != 0 &&
|
||||
strchr(upload_url,'@') != NULL)
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
char *upload_test_file_length = dmjson_get_value((json_object *)value, 1, "TestFileLength");
|
||||
if (upload_test_file_length[0] == '\0')
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
char *ip_interface = dmjson_get_value((json_object *)value, 1, "Interface");
|
||||
char *upload_interface = get_diagnostics_interface_option(ctx, ip_interface);
|
||||
|
|
@ -2102,13 +2102,13 @@ static int operate_IPDiagnostics_UploadDiagnostics(char *refparam, struct dmctx
|
|||
fgets(output, sizeof(output) , pp);
|
||||
pclose(pp);
|
||||
} else {
|
||||
return CMD_FAIL;
|
||||
return bbfdm_FAULT_COMMAND_FAILURE;
|
||||
}
|
||||
|
||||
json_object *res = (DM_STRLEN(output)) ? json_tokener_parse(output) : NULL;
|
||||
|
||||
if (res == NULL)
|
||||
return CMD_FAIL;
|
||||
return bbfdm_FAULT_COMMAND_FAILURE;
|
||||
|
||||
char *upload_status = dmjson_get_value(res, 1, "Status");
|
||||
char *upload_ip_address_used = dmjson_get_value(res, 1, "IPAddressUsed");
|
||||
|
|
@ -2140,7 +2140,7 @@ static int operate_IPDiagnostics_UploadDiagnostics(char *refparam, struct dmctx
|
|||
if (res != NULL)
|
||||
json_object_put(res);
|
||||
|
||||
return CMD_SUCCESS;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static operation_args ip_diagnostics_udpecho_args = {
|
||||
|
|
@ -2189,7 +2189,7 @@ static int operate_IPDiagnostics_UDPEchoDiagnostics(char *refparam, struct dmctx
|
|||
|
||||
char *udpecho_host = dmjson_get_value((json_object *)value, 1, "Host");
|
||||
if (udpecho_host[0] == '\0')
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
char *udpecho_port = dmjson_get_value((json_object *)value, 1, "Port");
|
||||
char *ip_interface = dmjson_get_value((json_object *)value, 1, "Interface");
|
||||
|
|
@ -2218,7 +2218,7 @@ static int operate_IPDiagnostics_UDPEchoDiagnostics(char *refparam, struct dmctx
|
|||
10, &res);
|
||||
|
||||
if (res == NULL)
|
||||
return CMD_FAIL;
|
||||
return bbfdm_FAULT_COMMAND_FAILURE;
|
||||
|
||||
char *status = dmjson_get_value(res, 1, "Status");
|
||||
char *ip_address_used = dmjson_get_value(res, 1, "IPAddressUsed");
|
||||
|
|
@ -2239,7 +2239,7 @@ static int operate_IPDiagnostics_UDPEchoDiagnostics(char *refparam, struct dmctx
|
|||
if (res != NULL)
|
||||
json_object_put(res);
|
||||
|
||||
return CMD_SUCCESS;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static operation_args ip_diagnostics_server_selection_args = {
|
||||
|
|
@ -2275,7 +2275,7 @@ static int operate_IPDiagnostics_ServerSelectionDiagnostics(char *refparam, stru
|
|||
|
||||
char *hostlist = dmjson_get_value((json_object *)value, 1, "HostList");
|
||||
if (hostlist[0] == '\0')
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
char *port = dmjson_get_value((json_object *)value, 1, "Port");
|
||||
char *protocol_used = dmjson_get_value((json_object *)value, 1, "Protocol");
|
||||
|
|
@ -2300,7 +2300,7 @@ static int operate_IPDiagnostics_ServerSelectionDiagnostics(char *refparam, stru
|
|||
8, &res);
|
||||
|
||||
if (res == NULL)
|
||||
return CMD_FAIL;
|
||||
return bbfdm_FAULT_COMMAND_FAILURE;
|
||||
|
||||
char *status = dmjson_get_value(res, 1, "Status");
|
||||
char *fasthost = dmjson_get_value(res, 1, "FastestHost");
|
||||
|
|
@ -2319,7 +2319,7 @@ static int operate_IPDiagnostics_ServerSelectionDiagnostics(char *refparam, stru
|
|||
if (res != NULL)
|
||||
json_object_put(res);
|
||||
|
||||
return CMD_SUCCESS;
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -68,12 +68,12 @@ 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)
|
||||
{
|
||||
return !dmubus_call_set("system", "reboot", UBUS_ARGS{0}, 0) ? CMD_SUCCESS : CMD_FAIL;
|
||||
return !dmubus_call_set("system", "reboot", UBUS_ARGS{0}, 0) ? 0 : bbfdm_FAULT_COMMAND_FAILURE;
|
||||
}
|
||||
|
||||
static int operate_Device_FactoryReset(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
|
||||
{
|
||||
return !dmcmd_no_wait("/sbin/defaultreset", 0) ? CMD_SUCCESS : CMD_FAIL;
|
||||
return !dmcmd_no_wait("/sbin/defaultreset", 0) ? 0 : bbfdm_FAULT_COMMAND_FAILURE;
|
||||
}
|
||||
|
||||
/**********************************************************************************************************************************
|
||||
|
|
|
|||
|
|
@ -1265,7 +1265,7 @@ static int operate_DeviceInfoVendorLogFile_Upload(char *refparam, struct dmctx *
|
|||
char *url = dmjson_get_value((json_object *)value, 1, "URL");
|
||||
|
||||
if (url[0] == '\0')
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
dmuci_get_value_by_section_string(((struct dmmap_dup *)data)->config_section, "log_file", &vlf_file_path);
|
||||
|
||||
|
|
@ -1281,7 +1281,7 @@ static int operate_DeviceInfoVendorLogFile_Upload(char *refparam, struct dmctx *
|
|||
if (file_exists(DEF_VENDOR_LOG_FILE))
|
||||
remove(DEF_VENDOR_LOG_FILE);
|
||||
|
||||
return res ? CMD_FAIL : CMD_SUCCESS;
|
||||
return res ? bbfdm_FAULT_COMMAND_FAILURE : 0;
|
||||
}
|
||||
|
||||
static operation_args vendor_config_file_backup_args = {
|
||||
|
|
@ -1311,7 +1311,7 @@ static int operate_DeviceInfoVendorConfigFile_Backup(char *refparam, struct dmct
|
|||
|
||||
char *url = dmjson_get_value((json_object *)value, 1, "URL");
|
||||
if (url[0] == '\0')
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
char *user = dmjson_get_value((json_object *)value, 1, "Username");
|
||||
char *pass = dmjson_get_value((json_object *)value, 1, "Password");
|
||||
|
|
@ -1320,7 +1320,7 @@ static int operate_DeviceInfoVendorConfigFile_Backup(char *refparam, struct dmct
|
|||
|
||||
int res = bbf_config_backup(url, user, pass, vcf_name, backup_command, backup_path);
|
||||
|
||||
return res ? CMD_FAIL : CMD_SUCCESS;
|
||||
return res ? bbfdm_FAULT_COMMAND_FAILURE : 0;
|
||||
}
|
||||
|
||||
static operation_args vendor_config_file_restore_args = {
|
||||
|
|
@ -1353,7 +1353,7 @@ static int operate_DeviceInfoVendorConfigFile_Restore(char *refparam, struct dmc
|
|||
|
||||
char *url = dmjson_get_value((json_object *)value, 1, "URL");
|
||||
if (url[0] == '\0')
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
char *user = dmjson_get_value((json_object *)value, 1, "Username");
|
||||
char *pass = dmjson_get_value((json_object *)value, 1, "Password");
|
||||
|
|
@ -1363,7 +1363,7 @@ static int operate_DeviceInfoVendorConfigFile_Restore(char *refparam, struct dmc
|
|||
|
||||
int res = bbf_config_restore(url, user, pass, file_size, checksum_algorithm, checksum, restore_command, restore_path);
|
||||
|
||||
return res ? CMD_FAIL : CMD_SUCCESS;
|
||||
return res ? bbfdm_FAULT_COMMAND_FAILURE : 0;
|
||||
}
|
||||
|
||||
static operation_args firmware_image_download_args = {
|
||||
|
|
@ -1398,7 +1398,7 @@ static int operate_DeviceInfoFirmwareImage_Download(char *refparam, struct dmctx
|
|||
char *url = dmjson_get_value((json_object *)value, 1, "URL");
|
||||
char *auto_activate = dmjson_get_value((json_object *)value, 1, "AutoActivate");
|
||||
if (url[0] == '\0')
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
// Assuming auto activate as false, if not provided by controller, in case of strict validation,
|
||||
// this should result into a fault
|
||||
|
|
@ -1417,7 +1417,7 @@ static int operate_DeviceInfoFirmwareImage_Download(char *refparam, struct dmctx
|
|||
|
||||
int res = bbf_fw_image_download(url, auto_activate, username, password, file_size, checksum_algorithm, checksum, bank_id, command, obj_path, commandKey);
|
||||
|
||||
return res ? CMD_FAIL : CMD_SUCCESS;
|
||||
return res ? bbfdm_FAULT_COMMAND_FAILURE : 0;
|
||||
}
|
||||
|
||||
static operation_args firmware_image_activate_args = {
|
||||
|
|
@ -1469,37 +1469,37 @@ static int operate_DeviceInfoFirmwareImage_Activate(char *refparam, struct dmctx
|
|||
break;
|
||||
|
||||
if (!DM_STRLEN(end_time[i]) || !DM_STRLEN(mode[i]))
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
if (dm_validate_unsignedInt(start_time[i], RANGE_ARGS{{NULL,NULL}}, 1))
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
if (dm_validate_unsignedInt(end_time[i], RANGE_ARGS{{NULL,NULL}}, 1))
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
if (DM_STRLEN(max_retries[i]) && dm_validate_int(max_retries[i], RANGE_ARGS{{"-1","10"}}, 1))
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
if (dm_validate_string(mode[i], -1, -1, FW_Mode, NULL))
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
if (DM_STRTOL(start_time[i]) > DM_STRTOL(end_time[i]))
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
if (i != 0 && DM_STRTOL(end_time[i - 1]) > DM_STRTOL(start_time[i]))
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
last_idx++;
|
||||
}
|
||||
|
||||
char *bank_id = dmjson_get_value((json_object *)data, 1, "id");
|
||||
if (!DM_STRLEN(bank_id))
|
||||
return CMD_FAIL;
|
||||
return bbfdm_FAULT_COMMAND_FAILURE;
|
||||
|
||||
if (DM_STRLEN(start_time[0])) {
|
||||
FILE *file = fopen(CRONTABS_ROOT, "a");
|
||||
if (!file)
|
||||
return CMD_FAIL;
|
||||
return bbfdm_FAULT_COMMAND_FAILURE;
|
||||
|
||||
for (int i = 0; i < MAX_TIME_WINDOW && DM_STRLEN(start_time[i]); i++) {
|
||||
char buffer[512] = {0};
|
||||
|
|
@ -1533,13 +1533,13 @@ static int operate_DeviceInfoFirmwareImage_Activate(char *refparam, struct dmctx
|
|||
dmubus_call("fwbank", "set_bootbank", UBUS_ARGS{{"bank", bank_id, Integer}}, 1, &json_obj);
|
||||
char *status = dmjson_get_value(json_obj, 1, "success");
|
||||
if (strcasecmp(status, "true") != 0)
|
||||
return CMD_FAIL;
|
||||
return bbfdm_FAULT_COMMAND_FAILURE;
|
||||
|
||||
res = dmubus_call_set("rpc-sys", "reboot", UBUS_ARGS{0}, 0);
|
||||
sleep(10); // Wait for reboot to happen
|
||||
}
|
||||
|
||||
return res ? CMD_FAIL : CMD_SUCCESS;
|
||||
return res ? bbfdm_FAULT_COMMAND_FAILURE : 0;
|
||||
}
|
||||
|
||||
/**********************************************************************************************************************************
|
||||
|
|
|
|||
|
|
@ -3347,7 +3347,7 @@ static int operate_DHCPv4Client_Renew(char *refparam, struct dmctx *ctx, void *d
|
|||
dmubus_call_set("network.interface", "renew", UBUS_ARGS{{"interface", if_name, String}}, 1);
|
||||
}
|
||||
|
||||
return CMD_SUCCESS;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**********************************************************************************************************************************
|
||||
|
|
|
|||
|
|
@ -1366,7 +1366,7 @@ static int operate_DHCPv6Client_Renew(char *refparam, struct dmctx *ctx, void *d
|
|||
dmubus_call_set("network.interface", "renew", UBUS_ARGS{{"interface", if_name, String}}, 1);
|
||||
}
|
||||
|
||||
return CMD_SUCCESS;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**********************************************************************************************************************************
|
||||
|
|
|
|||
|
|
@ -755,7 +755,7 @@ static int operate_DNSDiagnostics_NSLookupDiagnostics(char *refparam, struct dmc
|
|||
|
||||
char *hostname = dmjson_get_value((json_object *)value, 1, "HostName");
|
||||
if (hostname[0] == '\0')
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
char *interface = dmjson_get_value((json_object *)value, 1, "Interface");
|
||||
char *dnsserver = dmjson_get_value((json_object *)value, 1, "DNSServer");
|
||||
char *timeout = dmjson_get_value((json_object *)value, 1, "Timeout");
|
||||
|
|
@ -774,7 +774,7 @@ static int operate_DNSDiagnostics_NSLookupDiagnostics(char *refparam, struct dmc
|
|||
6, &res);
|
||||
|
||||
if (res == NULL)
|
||||
return CMD_FAIL;
|
||||
return bbfdm_FAULT_COMMAND_FAILURE;
|
||||
|
||||
char *status = dmjson_get_value(res, 1, "Status");
|
||||
char *success_count = dmjson_get_value(res, 1, "SuccessCount");
|
||||
|
|
@ -809,7 +809,7 @@ static int operate_DNSDiagnostics_NSLookupDiagnostics(char *refparam, struct dmc
|
|||
if (res != NULL)
|
||||
json_object_put(res);
|
||||
|
||||
return CMD_SUCCESS;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**********************************************************************************************************************************
|
||||
|
|
|
|||
|
|
@ -2196,7 +2196,7 @@ static int operate_IPInterface_Reset(char *refparam, struct dmctx *ctx, void *da
|
|||
dmubus_call_set(interface_obj, "down", UBUS_ARGS{0}, 0);
|
||||
dmubus_call_set(interface_obj, "up", UBUS_ARGS{0}, 0);
|
||||
|
||||
return CMD_SUCCESS;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**********************************************************************************************************************************
|
||||
|
|
|
|||
|
|
@ -1184,7 +1184,7 @@ static int operate_PPPInterface_Reset(char *refparam, struct dmctx *ctx, void *d
|
|||
dmubus_call_set(interface_obj, "up", UBUS_ARGS{0}, 0);
|
||||
}
|
||||
|
||||
return CMD_SUCCESS;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**********************************************************************************************************************************
|
||||
|
|
|
|||
|
|
@ -928,7 +928,7 @@ static int operate_session_delete(char *refparam, struct dmctx *ctx, void *data,
|
|||
ret = system(cmd);
|
||||
}
|
||||
|
||||
return (ret != -1) ? CMD_SUCCESS : CMD_FAIL;
|
||||
return (ret != -1) ? 0 : bbfdm_FAULT_COMMAND_FAILURE;
|
||||
}
|
||||
|
||||
/**********************************************************************************************************************************
|
||||
|
|
|
|||
|
|
@ -1968,7 +1968,7 @@ static int operate_WiFiAccessPointWPS_InitiateWPSPBC(char *refparam, struct dmct
|
|||
int ubus_ret = 0;
|
||||
|
||||
if (ifname == NULL)
|
||||
return CMD_FAIL;
|
||||
return bbfdm_FAULT_COMMAND_FAILURE;
|
||||
|
||||
snprintf(object, sizeof(object), "hostapd.%s", ifname);
|
||||
ubus_ret = dmubus_call_set(object, "wps_start", UBUS_ARGS{0}, 0);
|
||||
|
|
@ -1976,7 +1976,7 @@ static int operate_WiFiAccessPointWPS_InitiateWPSPBC(char *refparam, struct dmct
|
|||
status = "Error_Not_Ready";
|
||||
|
||||
add_list_parameter(ctx, dmstrdup("Status"), dmstrdup(status), DMT_TYPE[DMT_STRING], NULL);
|
||||
return CMD_SUCCESS;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*#Device.WiFi.AccessPoint.{i}.Accounting.ServerIPAddr!UCI:wireless/wifi-iface,@i-1/acct_server*/
|
||||
|
|
@ -3267,7 +3267,7 @@ static int get_access_point_total_associations(char *refparam, struct dmctx *ctx
|
|||
*************************************************************/
|
||||
static int operate_WiFi_Reset(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
|
||||
{
|
||||
return !dmcmd_no_wait("/sbin/wifi", 1, "reload") ? CMD_SUCCESS : CMD_FAIL;
|
||||
return !dmcmd_no_wait("/sbin/wifi", 1, "reload") ? 0 : bbfdm_FAULT_COMMAND_FAILURE;
|
||||
}
|
||||
|
||||
static operation_args neighboring_wifi_diagnostic_args = {
|
||||
|
|
@ -3390,7 +3390,7 @@ static int operate_WiFi_NeighboringWiFiDiagnostic(char *refparam, struct dmctx *
|
|||
}
|
||||
}
|
||||
|
||||
return CMD_SUCCESS;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int operate_WiFiAccessPointSecurity_Reset(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
|
||||
|
|
@ -3399,7 +3399,7 @@ static int operate_WiFiAccessPointSecurity_Reset(char *refparam, struct dmctx *c
|
|||
dmuci_set_value_by_section((((struct wifi_acp_args *)data)->sections)->config_section, "key", get_default_wpa_key());
|
||||
dmuci_set_value_by_section((((struct wifi_acp_args *)data)->sections)->config_section, "wps_pushbutton", "1");
|
||||
|
||||
return CMD_SUCCESS;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**********************************************************************************************************************************
|
||||
|
|
|
|||
|
|
@ -3163,7 +3163,7 @@ static int operate_WiFiDataElementsNetwork_SetTrafficSeparation(char *refparam,
|
|||
|
||||
end:
|
||||
add_list_parameter(ctx, dmstrdup("Status"), dmstrdup(status), DMT_TYPE[DMT_STRING], NULL);
|
||||
return CMD_SUCCESS;
|
||||
return 0;
|
||||
|
||||
#undef MAX_ARGS
|
||||
}
|
||||
|
|
@ -3237,7 +3237,7 @@ static int operate_WiFiDataElementsNetwork_SetPreferredBackhauls(char *refparam,
|
|||
dmubus_call_set("uci", "commit", UBUS_ARGS{{"config", "mapcontroller", String}}, 1);
|
||||
|
||||
add_list_parameter(ctx, dmstrdup("Status"), dmstrdup(status), DMT_TYPE[DMT_STRING], NULL);
|
||||
return CMD_SUCCESS;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static operation_args WiFiDataElementsNetwork_SetSSID_args = {
|
||||
|
|
@ -3367,7 +3367,7 @@ static int operate_WiFiDataElementsNetwork_SetSSID(char *refparam, struct dmctx
|
|||
|
||||
end:
|
||||
add_list_parameter(ctx, dmstrdup("Status"), dmstrdup(status), DMT_TYPE[DMT_STRING], NULL);
|
||||
return CMD_SUCCESS;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -3406,7 +3406,7 @@ static int operate_WiFiDataElementsNetworkDevice_SetSTASteeringState(char *refpa
|
|||
|
||||
end:
|
||||
add_list_parameter(ctx, dmstrdup("Status"), dmstrdup(status), DMT_TYPE[DMT_STRING], NULL);
|
||||
return CMD_SUCCESS;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static operation_args WiFiDataElementsNetworkDevice_SetDFSState_args = {
|
||||
|
|
@ -3429,7 +3429,7 @@ static int get_operate_args_WiFiDataElementsNetworkDevice_SetDFSState(char *refp
|
|||
static int operate_WiFiDataElementsNetworkDevice_SetDFSState(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
|
||||
{
|
||||
//TODO
|
||||
return CMD_SUCCESS;
|
||||
return 0;
|
||||
}*/
|
||||
|
||||
static operation_args wifidataelementsnetworkdeviceradio_channelscanrequest_args = {
|
||||
|
|
@ -3499,7 +3499,7 @@ static int operate_WiFiDataElementsNetworkDeviceRadio_ChannelScanRequest(char *r
|
|||
|
||||
end:
|
||||
add_list_parameter(ctx, dmstrdup("Status"), dmstrdup(status), DMT_TYPE[DMT_STRING], NULL);
|
||||
return CMD_SUCCESS;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*static operation_args wifidataelementsnetworkdeviceradio_wifirestart_args = {
|
||||
|
|
@ -3518,7 +3518,7 @@ static int get_operate_args_WiFiDataElementsNetworkDeviceRadio_WiFiRestart(char
|
|||
static int operate_WiFiDataElementsNetworkDeviceRadio_WiFiRestart(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
|
||||
{
|
||||
//TODO
|
||||
return CMD_SUCCESS;
|
||||
return 0;
|
||||
}*/
|
||||
|
||||
/*************************************************************
|
||||
|
|
|
|||
|
|
@ -977,17 +977,17 @@ int operate_IPDiagnostics_IPLayerCapacity(char *refparam, struct dmctx *ctx, voi
|
|||
|
||||
char *host = dmjson_get_value((json_object *)value, 1, "Host");
|
||||
if (host[0] == '\0')
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
char *ip_interface = dmjson_get_value((json_object *)value, 1, "Interface");
|
||||
char *interface = get_diagnostics_interface_option(ctx, ip_interface);
|
||||
char *role = dmjson_get_value((json_object *)value, 1, "Role");
|
||||
if (role[0] != '\0' && dm_validate_string(role, -1, -1, IPLayerCapacityRole, NULL))
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
char *port = dmjson_get_value((json_object *)value, 1, "Port");
|
||||
if (port[0] != '\0' && dm_validate_unsignedInt(port, RANGE_ARGS{{"1","65535"}}, 1))
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
char *jumbo = dmjson_get_value((json_object *)value, 1, "JumboFramesPermitted");
|
||||
bool jumbo_en = false;
|
||||
|
|
@ -995,19 +995,19 @@ int operate_IPDiagnostics_IPLayerCapacity(char *refparam, struct dmctx *ctx, voi
|
|||
|
||||
char *dscp = dmjson_get_value((json_object *)value, 1, "DSCP");
|
||||
if (dscp[0] != '\0' && dm_validate_unsignedInt(dscp, RANGE_ARGS{{"0","63"}}, 1))
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
char *ip_proto = dmjson_get_value((json_object *)value, 1, "ProtocolVersion");
|
||||
if (ip_proto[0] != '\0' && dm_validate_string(ip_proto, -1, -1, ProtocolVersion, NULL))
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
char *content = dmjson_get_value((json_object *)value, 1, "UDPPayloadContent");
|
||||
if (content[0] != '\0' && dm_validate_string(content, -1, -1, UDPPayloadContent, NULL))
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
char *test_type = dmjson_get_value((json_object *)value, 1, "TestType");
|
||||
if (test_type[0] != '\0' && dm_validate_string(test_type, -1, -1, IPLayerCapacityTestType, NULL))
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
char *ipdv = dmjson_get_value((json_object *)value, 1, "IPDVEnable");
|
||||
bool ipdv_en = false;
|
||||
|
|
@ -1015,27 +1015,27 @@ int operate_IPDiagnostics_IPLayerCapacity(char *refparam, struct dmctx *ctx, voi
|
|||
|
||||
char *start_rate = dmjson_get_value((json_object *)value, 1, "StartSendingRateIndex");
|
||||
if (start_rate[0] != '\0' && dm_validate_unsignedInt(start_rate, RANGE_ARGS{{"0","1108"}}, 1))
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
char *num_interval = dmjson_get_value((json_object *)value, 1, "NumberTestSubIntervals");
|
||||
if (num_interval[0] != '\0' && dm_validate_unsignedInt(num_interval, RANGE_ARGS{{"1","60"}}, 1))
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
char *mode_test = dmjson_get_value((json_object *)value, 1, "NumberFirstModeTestSubIntervals");
|
||||
if (mode_test[0] != '\0' && dm_validate_unsignedInt(mode_test, RANGE_ARGS{{"0","100"}}, 1))
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
char *sub_interval = dmjson_get_value((json_object *)value, 1, "TestSubInterval");
|
||||
if (sub_interval[0] != '\0' && dm_validate_unsignedInt(sub_interval, RANGE_ARGS{{"1000","6000"}}, 1))
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
char *feed_interval = dmjson_get_value((json_object *)value, 1, "StatusFeedbackInterval");
|
||||
if (feed_interval[0] != '\0' && dm_validate_unsignedInt(feed_interval, RANGE_ARGS{{"5","250"}}, 1))
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
char *seq_err = dmjson_get_value((json_object *)value, 1, "SeqErrThresh");
|
||||
if (seq_err[0] != '\0' && dm_validate_unsignedInt(seq_err, RANGE_ARGS{{"0","100"}}, 1))
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
char *dup_ignore = dmjson_get_value((json_object *)value, 1, "ReordDupIgnoreEnable");
|
||||
bool dup_ignore_en = false;
|
||||
|
|
@ -1043,23 +1043,23 @@ int operate_IPDiagnostics_IPLayerCapacity(char *refparam, struct dmctx *ctx, voi
|
|||
|
||||
char *low_thresh = dmjson_get_value((json_object *)value, 1, "LowerThresh");
|
||||
if (low_thresh[0] != '\0' && dm_validate_unsignedInt(low_thresh, RANGE_ARGS{{"5","250"}}, 1))
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
char *up_thresh = dmjson_get_value((json_object *)value, 1, "UpperThresh");
|
||||
if (up_thresh[0] != '\0' && dm_validate_unsignedInt(up_thresh, RANGE_ARGS{{"5","250"}}, 1))
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
char *speed_delta = dmjson_get_value((json_object *)value, 1, "HighSpeedDelta");
|
||||
if (speed_delta[0] != '\0' && dm_validate_unsignedInt(speed_delta, RANGE_ARGS{{"2", NULL}}, 1))
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
char *slow_adj = dmjson_get_value((json_object *)value, 1, "SlowAdjThresh");
|
||||
if (slow_adj[0] != '\0' && dm_validate_unsignedInt(slow_adj, RANGE_ARGS{{"2", NULL}}, 1))
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
char *rate_adj = dmjson_get_value((json_object *)value, 1, "RateAdjAlgorithm");
|
||||
if (rate_adj[0] != '\0' && dm_validate_string(rate_adj, -1, -1, RateAdjAlgorithm, NULL))
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
snprintf(input, sizeof(input), "'{\"host\": \"%s\",\"interface\":\"%s\",\"role\":\"%s\",\"port\":\"%s\",\"jumbo_frames\":\"%s\",\"proto_ver\":\"%s\",\"udp_content\":\"%s\",\"test_type\":\"%s\",\"ipdv_enable\":\"%s\",\"DSCP\":\"%s\",\"rate_index\":\"%s\",\"mode_subintervals\":\"%s\",\"test_subinterval\":\"%s\",\"feedback_interval\":\"%s\",\"seq_err_thresh\":\"%s\",\"dup_ignore\":\"%s\",\"lower_thresh\":\"%s\",\"upper_thresh\":\"%s\",\"high_speed_delta\":\"%s\",\"algorithm\":\"%s\",\"slow_adj_thresh\":\"%s\",\"num_interval\":\"%s\",\"proto\":\"%s\"}'",
|
||||
host, interface, role, port, DM_STRLEN(jumbo) > 0 ? (jumbo_en ? "1" : "0") : "\0",
|
||||
|
|
@ -1075,13 +1075,13 @@ int operate_IPDiagnostics_IPLayerCapacity(char *refparam, struct dmctx *ctx, voi
|
|||
fgets(output, sizeof(output), pp);
|
||||
pclose(pp);
|
||||
} else {
|
||||
return CMD_FAIL;
|
||||
return bbfdm_FAULT_COMMAND_FAILURE;
|
||||
}
|
||||
|
||||
json_object *res = (DM_STRLEN(output)) ? json_tokener_parse(output) : NULL;
|
||||
|
||||
if (res == NULL) {
|
||||
return CMD_FAIL;
|
||||
return bbfdm_FAULT_COMMAND_FAILURE;
|
||||
}
|
||||
|
||||
char *status = NULL;
|
||||
|
|
@ -1283,7 +1283,7 @@ int operate_IPDiagnostics_IPLayerCapacity(char *refparam, struct dmctx *ctx, voi
|
|||
if (res != NULL)
|
||||
json_object_put(res);
|
||||
|
||||
return CMD_SUCCESS;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**********************************************************************************************************************************
|
||||
|
|
|
|||
|
|
@ -85,7 +85,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)
|
||||
{
|
||||
return !dmubus_call_set("system", "reboot", UBUS_ARGS{0}, 0) ? CMD_SUCCESS : CMD_FAIL;
|
||||
return !dmubus_call_set("system", "reboot", UBUS_ARGS{0}, 0) ? 0 : bbfdm_FAULT_COMMAND_FAILURE;
|
||||
}
|
||||
|
||||
static operation_args x_iopsys_eu_ping_test_run_args = {
|
||||
|
|
@ -114,7 +114,7 @@ static int operate_DeviceXIOPSYSEUPingTEST_Run(char *refparam, struct dmctx *ctx
|
|||
|
||||
char *host = dmjson_get_value((json_object *)value, 1, "Host");
|
||||
if(host[0] == '\0')
|
||||
return CMD_INVALID_ARGUMENTS;
|
||||
return bbfdm_FAULT_INVALID_ARGUMENT;
|
||||
|
||||
snprintf(command, sizeof(command), "ping -c 1 -W 1 %s", host);
|
||||
|
||||
|
|
@ -135,7 +135,7 @@ static int operate_DeviceXIOPSYSEUPingTEST_Run(char *refparam, struct dmctx *ctx
|
|||
}
|
||||
pclose(log);
|
||||
}
|
||||
return CMD_SUCCESS;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*************************************************************
|
||||
|
|
|
|||
|
|
@ -1097,7 +1097,7 @@ static void test_api_bbfdm_valid_standard_operate(void **state)
|
|||
ctx->in_value = "{\"Host\":\"iopsys.eu\",\"NumberOfRepetitions\":\"1\",\"Timeout\":\"5000\",\"DataBlockSize\":\"64\"}";
|
||||
|
||||
fault = bbf_entry_method(ctx, BBF_OPERATE);
|
||||
assert_int_equal(fault, CMD_SUCCESS);
|
||||
assert_int_equal(fault, 0);
|
||||
|
||||
list_for_each_entry(n, &ctx->list_parameter, list) {
|
||||
if (DM_STRCMP(n->name, "Status") == 0) {
|
||||
|
|
@ -1133,7 +1133,7 @@ static void test_api_bbfdm_valid_standard_list_operate(void **state)
|
|||
ctx->isinfo = false;
|
||||
|
||||
fault = bbf_entry_method(ctx, BBF_SCHEMA);
|
||||
assert_int_equal(fault, CMD_SUCCESS);
|
||||
assert_int_equal(fault, 0);
|
||||
|
||||
list_for_each_entry(n, &ctx->list_parameter, list) {
|
||||
|
||||
|
|
@ -1207,7 +1207,7 @@ static void test_api_bbfdm_valid_library_operate(void **state)
|
|||
ctx->in_value = "{\"Host\":\"iopsys.eu\"}";
|
||||
|
||||
fault = bbf_entry_method(ctx, BBF_OPERATE);
|
||||
assert_int_equal(fault, CMD_SUCCESS);
|
||||
assert_int_equal(fault, 0);
|
||||
|
||||
list_for_each_entry(n, &ctx->list_parameter, list) {
|
||||
assert_string_not_equal(n->data, "0");
|
||||
|
|
@ -1228,7 +1228,7 @@ static void test_api_bbfdm_valid_library_list_operate(void **state)
|
|||
ctx->isinfo = false;
|
||||
|
||||
fault = bbf_entry_method(ctx, BBF_SCHEMA);
|
||||
assert_int_equal(fault, CMD_SUCCESS);
|
||||
assert_int_equal(fault, 0);
|
||||
|
||||
list_for_each_entry(n, &ctx->list_parameter, list) {
|
||||
|
||||
|
|
@ -1284,7 +1284,7 @@ static void test_api_bbfdm_valid_json_operate(void **state)
|
|||
ctx->in_param = "Device.X_IOPSYS_EU_TEST.1.Status()";
|
||||
|
||||
fault = bbf_entry_method(ctx, BBF_OPERATE);
|
||||
assert_int_equal(fault, CMD_SUCCESS);
|
||||
assert_int_equal(fault, 0);
|
||||
|
||||
list_for_each_entry(n, &ctx->list_parameter, list) {
|
||||
assert_string_equal(n->name, "Result");
|
||||
|
|
@ -1307,7 +1307,7 @@ static void test_api_bbfdm_valid_json_list_operate(void **state)
|
|||
ctx->isinfo = false;
|
||||
|
||||
fault = bbf_entry_method(ctx, BBF_SCHEMA);
|
||||
assert_int_equal(fault, CMD_SUCCESS);
|
||||
assert_int_equal(fault, 0);
|
||||
|
||||
list_for_each_entry(n, &ctx->list_parameter, list) {
|
||||
|
||||
|
|
@ -1351,7 +1351,7 @@ static void test_api_bbfdm_valid_json_v1_operate(void **state)
|
|||
ctx->in_param = "Device.UBUS_TEST_V1.Interface.3.Status()";
|
||||
|
||||
fault = bbf_entry_method(ctx, BBF_OPERATE);
|
||||
assert_int_equal(fault, CMD_SUCCESS);
|
||||
assert_int_equal(fault, 0);
|
||||
|
||||
list_for_each_entry(n, &ctx->list_parameter, list) {
|
||||
assert_string_equal(n->name, "Result");
|
||||
|
|
@ -1374,7 +1374,7 @@ static void test_api_bbfdm_valid_json_v1_list_operate(void **state)
|
|||
ctx->isinfo = false;
|
||||
|
||||
fault = bbf_entry_method(ctx, BBF_SCHEMA);
|
||||
assert_int_equal(fault, CMD_SUCCESS);
|
||||
assert_int_equal(fault, 0);
|
||||
|
||||
list_for_each_entry(n, &ctx->list_parameter, list) {
|
||||
|
||||
|
|
|
|||
|
|
@ -455,7 +455,7 @@ static void test_api_bbfdm_valid_operate(void **state)
|
|||
ctx->in_param = "Device.WiFi.AccessPoint.1.Security.Reset()";
|
||||
|
||||
fault = bbf_entry_method(ctx, BBF_OPERATE);
|
||||
assert_int_equal(fault, CMD_SUCCESS);
|
||||
assert_int_equal(fault, 0);
|
||||
}
|
||||
|
||||
static void test_api_bbfdm_wrong_operate(void **state)
|
||||
|
|
@ -466,7 +466,7 @@ static void test_api_bbfdm_wrong_operate(void **state)
|
|||
ctx->in_param = "Device.IP.Diagnostics.IPing()";
|
||||
|
||||
fault = bbf_entry_method(ctx, BBF_OPERATE);
|
||||
assert_int_equal(fault, CMD_NOT_FOUND);
|
||||
assert_int_equal(fault, bbfdm_FAULT_INVALID_PATH);
|
||||
}
|
||||
|
||||
static void test_api_bbfdm_get_list_operate(void **state)
|
||||
|
|
|
|||
|
|
@ -814,7 +814,7 @@ def cprintOperateCommands(getoperateargs, operate, in_args, out_args, struct_nam
|
|||
print("static int %s(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)" % operate, file=fp)
|
||||
print("{", file=fp)
|
||||
print(" //TODO", file=fp)
|
||||
print(" return CMD_SUCCESS;", file=fp)
|
||||
print(" return 0;", file=fp)
|
||||
print("}", file=fp)
|
||||
print("", file=fp)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue