Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

added api_buffer_{send, append} to fix some compiler warnings

Browse source
This commit is contained in:
Steffen Vogel 2017-03-06 12:17:52 -04:00
parent 29990b974d
commit d7e8731d98
2 changed files with 49 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/villas/api.h
View file

@ -99,5 +99,11 @@ int api_session_destroy(struct api_session *s);
int api_session_run_command(struct api_session *s, json_t *req, json_t **resp);
/** Send contents of buffer over libwebsockets connection */
int api_buffer_send(struct api_buffer *b, struct lws *w);
/** Append received data to buffer. */
int api_buffer_append(struct api_buffer *b, const char *in, size_t len);
/** Libwebsockets callback for "api" endpoint */
int api_protocol_cb(struct lws *wsi, enum lws_callback_reasons reason, void *user, void *in, size_t len);

73
lib/api.c
View file

@ -133,12 +133,12 @@ int api_protocol_cb(struct lws *wsi, enum lws_callback_reasons reason, void *use
api_session_init(s, w->api, API_MODE_HTTP);
/* Prepare HTTP response header */
s->response.headers.len = 1 + asprintf(&s->response.headers.buf,
"HTTP/1.1 200 OK\r\n"
"Content-type: application/json\r\n"
"User-agent: " USER_AGENT
"\r\n"
);
const char headers[] = "HTTP/1.1 200 OK\r\n"
"Content-type: application/json\r\n"
"User-agent: " USER_AGENT
"\r\n";
api_buffer_append(&s->response.headers, headers, sizeof(headers));
/* book us a LWS_CALLBACK_HTTP_WRITEABLE callback */
lws_callback_on_writable(wsi);
@ -148,13 +148,8 @@ int api_protocol_cb(struct lws *wsi, enum lws_callback_reasons reason, void *use
case LWS_CALLBACK_CLIENT_RECEIVE:
case LWS_CALLBACK_RECEIVE:
case LWS_CALLBACK_HTTP_BODY: {
char *newbuf;
newbuf = realloc(s->request.body.buf, s->request.body.len + len);
s->request.body.buf = memcpy(newbuf + s->request.body.len, in, len);
s->request.body.len += len;
case LWS_CALLBACK_HTTP_BODY: {
api_buffer_append(&s->request.body, in, len);
json_t *req, *resp;
while (parse_request(&s->request.body, &req) == 1) {
@ -176,28 +171,17 @@ int api_protocol_cb(struct lws *wsi, enum lws_callback_reasons reason, void *use
break;
case LWS_CALLBACK_SERVER_WRITEABLE:
case LWS_CALLBACK_HTTP_WRITEABLE: {
int sent;
if (s->mode == API_MODE_HTTP && s->response.headers.len > 0) {
sent = lws_write(wsi, s->response.headers.buf, s->response.headers.len, LWS_WRITE_HTTP_HEADERS);
if (sent > 0) {
memmove(s->response.headers.buf, s->response.headers.buf + sent, sent);
s->response.headers.len -= sent;
}
}
else if (s->response.body.len > 0) {
sent = lws_write(wsi, s->response.body.buf, s->response.body.len, LWS_WRITE_HTTP);
if (sent > 0) {
memmove(s->response.body.buf, s->response.body.buf + sent, sent);
s->response.body.len -= sent;
}
}
case LWS_CALLBACK_HTTP_WRITEABLE:
/* We send headers only in HTTP mode */
if (s->mode == API_MODE_HTTP)
api_buffer_send(&s->response.headers, wsi);
api_buffer_send(&s->response.body, wsi);
if (s->completed && s->response.body.len == 0)
return -1;
break;
}
default:
return 0;
@ -206,6 +190,35 @@ int api_protocol_cb(struct lws *wsi, enum lws_callback_reasons reason, void *use
return 0;
}
int api_buffer_send(struct api_buffer *b, struct lws *w)
{
int sent;
if (b->len <= 0)
return 0;
sent = lws_write(w, (unsigned char *) b->buf, b->len, LWS_WRITE_HTTP_HEADERS);
if (sent > 0) {
memmove(b->buf, b->buf + sent, sent);
b->len -= sent;
}
return sent;
}
int api_buffer_append(struct api_buffer *b, const char *in, size_t len)
{
b->buf = realloc(b->buf, b->len + len);
if (!b->buf)
return -1;
memcpy(b->buf + b->len, in, len);
b->len += len;
return 0;
}
int api_init(struct api *a, struct cfg *cfg)
{
list_init(&a->sessions);