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

rest: Support adding clients inside folder 

Add support for adding clients that are inside a folder.

Add new folder_id field, if zero it means computer is not in a folder.
master
Javier Hernandez 2024-01-11 11:53:41 +01:00 committed by OpenGnSys Support Team
parent bc787a9a68
commit 529d83b19e
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/dbi.h
View File

@ -82,6 +82,7 @@ struct og_computer {
unsigned int repo_id;
unsigned int center;
unsigned int room;
unsigned int folder_id;
unsigned int id;
bool maintenance;
bool remote;

17
src/rest.c
View File

@ -2130,6 +2130,11 @@ static int og_cmd_post_client_add(json_t *element,
sizeof(computer.serial_number));
} else if (!strcmp(key, "hardware_id")) {
err = og_json_parse_uint(value, &computer.hardware_id);
} else if (!strcmp(key, "folder_id")) {
err = og_json_parse_uint(value, &computer.folder_id);
if (!err)
computer.folder_id = computer.folder_id & 0x0000ffff;
} else if (!strcmp(key, "netdriver")) {
err = og_json_parse_string_copy(value,
computer.netdriver,
@ -2221,16 +2226,16 @@ static int og_cmd_post_client_add(json_t *element,
" oglivedir,"
" inremotepc,"
" maintenance"
") VALUES ('%s', '%s', '%s', '%s', %u, 0, %u,"
") VALUES ('%s', '%s', '%s', '%s', %u, %u, %u,"
" %u, '%s', '%s', '%s', '%s',"
" '%s', %u, %u)",
computer.name, computer.serial_number,
computer.ip, computer.mac, computer.room,
computer.hardware_id, computer.repo_id,
computer.netmask, computer.boot,
computer.netiface, computer.netdriver,
computer.livedir, computer.remote,
computer.maintenance);
computer.folder_id, computer.hardware_id,
computer.repo_id, computer.netmask,
computer.boot, computer.netiface,
computer.netdriver, computer.livedir,
computer.remote, computer.maintenance);
if (!result) {
dbi_conn_error(dbi->conn, &msglog);