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

rest: adapt cache/fetch to support repository with multiple IP adddress 

take repository_id as json attributo, then infer repository IP from client.
master
OpenGnSys Support Team 2024-08-30 12:59:31 +02:00
parent d8af32cbcb
commit 8c37aa3688
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/rest.c
View File

@ -4377,7 +4377,10 @@ static int og_cmd_cache_delete(json_t *element, struct og_msg_params *params,
static int og_cmd_cache_fetch(json_t *element, struct og_msg_params *params, static int og_cmd_cache_fetch(json_t *element, struct og_msg_params *params,
char *buffer_reply) char *buffer_reply)
{ {
json_t *value, *body, *image, *repository = NULL; char repository_ip[OG_DB_IP_MAXLEN + 1] = {};
json_t *value, *body;
struct og_dbi *dbi;
const char *key; const char *key;
int err = 0; int err = 0;
@ -4388,29 +4391,39 @@ static int og_cmd_cache_fetch(json_t *element, struct og_msg_params *params,
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, "image")) { } else if (!strcmp(key, "image")) {
if (json_typeof(value) != JSON_STRING) { err = og_json_parse_string(value, &params->name);
err = -1; params->flags |= OG_REST_PARAM_NAME;
} } else if (!strcmp(key, "repository_id")) {
image = value; err = og_json_parse_uint64(value, &params->image.repo_id);
} else if (!strcmp(key, "repository")) { params->flags |= OG_REST_PARAM_REPO;
if (json_typeof(value) != JSON_STRING) {
err = -1;
}
repository = value;
} }
if (err < 0) if (err < 0)
return err; return err;
} }
if (!og_msg_params_validate(params, OG_REST_PARAM_ADDR)) if (!og_msg_params_validate(params, OG_REST_PARAM_NAME |
OG_REST_PARAM_ADDR |
OG_REST_PARAM_REPO))
return -1; return -1;
if (!image || !repository) dbi = og_dbi_open(&ogconfig.db);
if (!dbi) {
syslog(LOG_ERR,
"cannot open connection database (%s:%d)\n",
__func__, __LINE__);
return -1; return -1;
}
err = og_dbi_get_repository_ip(dbi, params->image.repo_id,
params->ips_array[0], repository_ip);
og_dbi_close(dbi);
if (err < 0)
return err;
body = json_copy(element); body = json_copy(element);
json_object_del(body, "clients"); json_object_del(body, "clients");
json_object_set_new(body, "repository", json_string(repository_ip));
return og_send_request(OG_METHOD_POST, OG_CMD_CACHE_FETCH, params, body); return og_send_request(OG_METHOD_POST, OG_CMD_CACHE_FETCH, params, body);
} }