fix(event_loop): fix some wrong allocs
parent
29f4edc059
commit
f97de2fe83
13
landerctl
13
landerctl
|
@ -10,11 +10,11 @@ fi
|
||||||
|
|
||||||
|
|
||||||
if [ "$1" = g ]; then
|
if [ "$1" = g ]; then
|
||||||
curl -is "$URL/$2" |
|
exec curl -is "$URL/$2" |
|
||||||
sed -En 's/^[lL]ocation: (.*)/\1/p'
|
sed -En 's/^[lL]ocation: (.*)/\1/p'
|
||||||
|
|
||||||
elif [ "$1" = s ] || [ "$1" = sl ]; then
|
elif [ "$1" = s ] || [ "$1" = sl ]; then
|
||||||
curl \
|
exec curl \
|
||||||
--fail \
|
--fail \
|
||||||
-w "${URL}%header{location}" \
|
-w "${URL}%header{location}" \
|
||||||
-XPOST \
|
-XPOST \
|
||||||
|
@ -23,7 +23,7 @@ elif [ "$1" = s ] || [ "$1" = sl ]; then
|
||||||
"$URL/$1/$3"
|
"$URL/$1/$3"
|
||||||
|
|
||||||
elif [ "$1" = p ] || [ "$1" = pl ]; then
|
elif [ "$1" = p ] || [ "$1" = pl ]; then
|
||||||
curl \
|
exec curl \
|
||||||
--fail \
|
--fail \
|
||||||
-w "${URL}%header{location}" \
|
-w "${URL}%header{location}" \
|
||||||
-XPOST \
|
-XPOST \
|
||||||
|
@ -33,18 +33,19 @@ elif [ "$1" = p ] || [ "$1" = pl ]; then
|
||||||
"$URL/$1/$3"
|
"$URL/$1/$3"
|
||||||
|
|
||||||
elif [ "$1" = f ] || [ "$1" = fl ]; then
|
elif [ "$1" = f ] || [ "$1" = fl ]; then
|
||||||
curl \
|
exec curl \
|
||||||
--fail \
|
--fail \
|
||||||
|
-v \
|
||||||
-w "${URL}%header{location}" \
|
-w "${URL}%header{location}" \
|
||||||
-XPOST \
|
-XPOST \
|
||||||
-H "X-Api-Key: $API_KEY" \
|
-H "X-Api-Key: $API_KEY" \
|
||||||
-H "X-Lander-Content-Type: ${content_type}" \
|
-H "X-Lander-Content-Type: ${content_type}" \
|
||||||
-H "X-Lander-Filename: ${filename}" \
|
-H "X-Lander-Filename: ${filename}" \
|
||||||
--data-binary @"$2" \
|
-T "$2" \
|
||||||
"$URL/$1/$3"
|
"$URL/$1/$3"
|
||||||
|
|
||||||
elif [ "$1" = d ]; then
|
elif [ "$1" = d ]; then
|
||||||
curl \
|
exec curl \
|
||||||
--fail \
|
--fail \
|
||||||
-XDELETE \
|
-XDELETE \
|
||||||
-H "X-Api-Key: $API_KEY" \
|
-H "X-Api-Key: $API_KEY" \
|
||||||
|
|
|
@ -30,7 +30,9 @@ lsm_error lsm_store_init(lsm_store **ptr) {
|
||||||
return lsm_error_ok;
|
return lsm_error_ok;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint64_t lsm_store_size(const lsm_store *store) { return lsm_trie_size(store->trie); }
|
uint64_t lsm_store_size(const lsm_store *store) {
|
||||||
|
return lsm_trie_size(store->trie);
|
||||||
|
}
|
||||||
|
|
||||||
lsm_error lsm_store_open_read(lsm_entry_handle **out, lsm_store *store,
|
lsm_error lsm_store_open_read(lsm_entry_handle **out, lsm_store *store,
|
||||||
lsm_str *key) {
|
lsm_str *key) {
|
||||||
|
|
|
@ -25,7 +25,7 @@ event_loop *event_loop_init() {
|
||||||
event_loop *el = calloc(sizeof(event_loop), 1);
|
event_loop *el = calloc(sizeof(event_loop), 1);
|
||||||
|
|
||||||
// No idea if this is a good starter value
|
// No idea if this is a good starter value
|
||||||
el->connections = calloc(sizeof(event_loop_conn), 16);
|
el->connections = calloc(sizeof(event_loop_conn *), 16);
|
||||||
el->connection_count = 16;
|
el->connection_count = 16;
|
||||||
|
|
||||||
return el;
|
return el;
|
||||||
|
@ -34,7 +34,7 @@ event_loop *event_loop_init() {
|
||||||
int event_loop_put(event_loop *el, event_loop_conn *conn) {
|
int event_loop_put(event_loop *el, event_loop_conn *conn) {
|
||||||
if ((size_t)conn->fd >= el->connection_count) {
|
if ((size_t)conn->fd >= el->connection_count) {
|
||||||
event_loop_conn **resized =
|
event_loop_conn **resized =
|
||||||
realloc(el->connections, sizeof(event_loop_conn) * (conn->fd + 1));
|
realloc(el->connections, sizeof(event_loop_conn *) * (conn->fd + 1));
|
||||||
|
|
||||||
if (resized == NULL) {
|
if (resized == NULL) {
|
||||||
return -1;
|
return -1;
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
#include "http_loop.h"
|
#include "http_loop.h"
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
|
|
||||||
|
// cppcheck-suppress syntaxError
|
||||||
static const char *http_response_format = "HTTP/1.1 %i %s\n"
|
static const char *http_response_format = "HTTP/1.1 %i %s\n"
|
||||||
"Server: lander/" LANDER_VERSION "\n"
|
"Server: lander/" LANDER_VERSION "\n"
|
||||||
"Content-Length: %lu\n";
|
"Content-Length: %lu\n";
|
||||||
|
|
|
@ -104,7 +104,7 @@ bool http_loop_step_body_to_buf(event_loop_conn *conn) {
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx->req.body.type = http_body_buf;
|
ctx->req.body.type = http_body_buf;
|
||||||
ctx->req.body.buf = malloc(ctx->req.body.expected_len * sizeof(uint8_t));
|
ctx->req.body.buf = malloc(ctx->req.body.expected_len * sizeof(char));
|
||||||
ctx->req.body.len = 0;
|
ctx->req.body.len = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue