48k.eu-mirror
/
ogserver
mirror of https://git.48k.eu/ogserver
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#915 Fix POST "software" cmd in ogAdmServer and web 

This patch adds the parameters "disk" and "partition" to
POST "software" command. This way the client can create a software
profile without failure.

New request:
	POST /software
	{
	   "clients":[
	      "192.168.56.12"
	   ],
	   "disk":"1",
	   "partition":"1"
	}
Reply:
	200 OK
master
Javier Sánchez Parra 2019-10-11 13:24:57 +02:00 committed by OpenGnSys Support Team
parent 90672e4a25
commit 61bbcd9251
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sources/ogAdmServer.cpp
View File

@ -3894,9 +3894,11 @@ static int og_cmd_hardware(json_t *element, struct og_msg_params *params)
static int og_cmd_software(json_t *element, struct og_msg_params *params) static int og_cmd_software(json_t *element, struct og_msg_params *params)
{ {
char buf[4096] = {};
int err = 0, len;
const char *key; const char *key;
json_t *value; json_t *value;
int err = 0; TRAMA *msg;
if (json_typeof(element) != JSON_OBJECT) if (json_typeof(element) != JSON_OBJECT)
return -1; return -1;
@ -3904,13 +3906,29 @@ static int og_cmd_software(json_t *element, struct og_msg_params *params)
json_object_foreach(element, key, value) { json_object_foreach(element, key, value) {
if (!strcmp(key, "clients")) if (!strcmp(key, "clients"))
err = og_json_parse_clients(value, params); err = og_json_parse_clients(value, params);
else if (!strcmp(key, "disk"))
err = og_json_parse_string(value, &params->disk);
else if (!strcmp(key, "partition"))
err = og_json_parse_string(value, &params->partition);
if (err < 0) if (err < 0)
break; break;
} }
return og_cmd_legacy_send(params, "InventarioSoftware", len = snprintf(buf, sizeof(buf),
CLIENTE_OCUPADO); "nfn=InventarioSoftware\rdsk=%s\rpar=%s\r",
params->disk, params->partition);
msg = og_msg_alloc(buf, len);
if (!msg)
return -1;
og_send_cmd((char **)params->ips_array, params->ips_array_len,
CLIENTE_OCUPADO, msg);
og_msg_free(msg);
return 0;
} }
static int og_cmd_create_image(json_t *element, struct og_msg_params *params) static int og_cmd_create_image(json_t *element, struct og_msg_params *params)