aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2024-11-03 04:17:17 -05:00
Code

Cleanup: Replaced html_success()'s own data sending with client_send_buffer()

Browse Source
This commit is contained in:
Philipp Schafft 2020-10-12 19:55:55 +00:00
parent 55b6378023
commit ff34cd0522
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/admin.c
View File

@ -653,26 +653,16 @@ static void html_success(client_t *client, source_t *source, admin_format_t resp
if (client->mode == OMODE_STRICT || (response != ADMIN_FORMAT_RAW && response != ADMIN_FORMAT_HTML)) { if (client->mode == OMODE_STRICT || (response != ADMIN_FORMAT_RAW && response != ADMIN_FORMAT_HTML)) {
admin_send_response_simple(client, source, response, message, 1); admin_send_response_simple(client, source, response, message, 1);
} else { } else {
ssize_t ret; char buf[256];
int ret;
ret = util_http_build_header(client->refbuf->data, PER_CLIENT_REFBUF_SIZE, ret = snprintf(buf, sizeof(buf), "<html><head><title>Admin request successful</title></head><body><p>%s</p></body></html>", message);
0, 0, 200, NULL, if (ret < 0 || ret >= (ssize_t)sizeof(buf)) {
"text/html", "utf-8",
"", NULL, client);
if (ret == -1 || ret >= PER_CLIENT_REFBUF_SIZE) {
ICECAST_LOG_ERROR("Dropping client as we can not build response headers.");
client_send_error_by_id(client, ICECAST_ERROR_GEN_HEADER_GEN_FAILED); client_send_error_by_id(client, ICECAST_ERROR_GEN_HEADER_GEN_FAILED);
return; return;
} }
snprintf(client->refbuf->data + ret, PER_CLIENT_REFBUF_SIZE - ret, client_send_buffer(client, 200, "text/html", "utf-8", buf, ret, NULL);
"<html><head><title>Admin request successful</title></head>"
"<body><p>%s</p></body></html>", message);
client->respcode = 200;
client->refbuf->len = strlen(client->refbuf->data);
fserve_add_client(client, NULL);
} }
} }