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

#980 Add 'ip' field in GET /scopes request 

The 'ip' field is added to the json for scopes that have an IP (i.e.
computers).
master
Roberto Hueso Gómez 2020-08-12 15:14:50 +02:00 committed by OpenGnSys Support Team
parent 4ae9903dc3
commit 91c3a285ba
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/rest.c
View File

@ -2192,7 +2192,7 @@ static int og_cmd_task_post(json_t *element, struct og_msg_params *params)
static int og_dbi_scope_get_computer(struct og_dbi *dbi, json_t *array, static int og_dbi_scope_get_computer(struct og_dbi *dbi, json_t *array,
uint32_t room_id) uint32_t room_id)
{ {
char computer_name[OG_DB_COMPUTER_NAME_MAXLEN + 1] = {}; const char *computer_name, *computer_ip;
uint32_t computer_id; uint32_t computer_id;
const char *msglog; const char *msglog;
dbi_result result; dbi_result result;
@ -2211,9 +2211,8 @@ static int og_dbi_scope_get_computer(struct og_dbi *dbi, json_t *array,
while (dbi_result_next_row(result)) { while (dbi_result_next_row(result)) {
computer_id = dbi_result_get_uint(result, "idordenador"); computer_id = dbi_result_get_uint(result, "idordenador");
strncpy(computer_name, computer_name = dbi_result_get_string(result, "nombreordenador");
dbi_result_get_string(result, "nombreordenador"), computer_ip = dbi_result_get_string(result, "ip");
OG_DB_CENTER_NAME_MAXLEN);
computer = json_object(); computer = json_object();
if (!computer) { if (!computer) {
@ -2225,6 +2224,7 @@ static int og_dbi_scope_get_computer(struct og_dbi *dbi, json_t *array,
json_object_set_new(computer, "type", json_string("computer")); json_object_set_new(computer, "type", json_string("computer"));
json_object_set_new(computer, "id", json_integer(computer_id)); json_object_set_new(computer, "id", json_integer(computer_id));
json_object_set_new(computer, "scope", json_array()); json_object_set_new(computer, "scope", json_array());
json_object_set_new(computer, "ip", json_string(computer_ip));
json_array_append(array, computer); json_array_append(array, computer);
json_decref(computer); json_decref(computer);
} }