Merge branch 'main' into testing
This commit is contained in:
commit
ea6b653121
6 changed files with 13 additions and 4 deletions
1
.envrc
Normal file
1
.envrc
Normal file
|
@ -0,0 +1 @@
|
||||||
|
use nix
|
8
shell.nix
Normal file
8
shell.nix
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
with import <nixpkgs> {};
|
||||||
|
mkShell {
|
||||||
|
nativeBuildInputs = [
|
||||||
|
cmake
|
||||||
|
sqlite
|
||||||
|
util-linux
|
||||||
|
];
|
||||||
|
}
|
|
@ -80,4 +80,4 @@ CREATE TABLE junction_relay_schedule
|
||||||
);
|
);
|
||||||
|
|
||||||
INSERT INTO schedules (uid, name, periods) VALUES (x'6f666600000000000000000000000000', 'off', x'00');
|
INSERT INTO schedules (uid, name, periods) VALUES (x'6f666600000000000000000000000000', 'off', x'00');
|
||||||
INSERT INTO schedules (uid, name, periods) VALUES (x'6f6e0000000000000000000000000000', 'on', x'010000009F05');
|
INSERT INTO schedules (uid, name, periods) VALUES (x'6f6e0000000000000000000000000000', 'on', x'010000000000');
|
||||||
|
|
|
@ -22,7 +22,7 @@ static struct mg_mgr mgr;
|
||||||
static void
|
static void
|
||||||
terminate(int signum)
|
terminate(int signum)
|
||||||
{
|
{
|
||||||
LOGGER_INFO("terminating controller (%d)\n", signum);
|
LOGGER_INFO("terminating core (%d)\n", signum);
|
||||||
|
|
||||||
mg_mgr_free(&mgr);
|
mg_mgr_free(&mgr);
|
||||||
|
|
||||||
|
|
|
@ -154,7 +154,7 @@ router_register_endpoint(const char *route, int method, endpoint_func_f func)
|
||||||
// +1 for NULL terminator
|
// +1 for NULL terminator
|
||||||
endpoint->route = malloc(sizeof(char*) * (route_parts_count + 1));
|
endpoint->route = malloc(sizeof(char*) * (route_parts_count + 1));
|
||||||
endpoint->route_keeper = malloc(sizeof(char) * (route_len + 1));
|
endpoint->route_keeper = malloc(sizeof(char) * (route_len + 1));
|
||||||
strncpy(endpoint->route_keeper, route, route_len);
|
strncpy(endpoint->route_keeper, route, route_len + 1);
|
||||||
endpoint->route_keeper[route_len] = '\0';
|
endpoint->route_keeper[route_len] = '\0';
|
||||||
|
|
||||||
int route_part = 0;
|
int route_part = 0;
|
||||||
|
|
2
vendor/mongoose.h
vendored
2
vendor/mongoose.h
vendored
|
@ -1867,7 +1867,7 @@ typedef struct {
|
||||||
|
|
||||||
void cs_md5_init(cs_md5_ctx *c);
|
void cs_md5_init(cs_md5_ctx *c);
|
||||||
void cs_md5_update(cs_md5_ctx *c, const unsigned char *data, size_t len);
|
void cs_md5_update(cs_md5_ctx *c, const unsigned char *data, size_t len);
|
||||||
void cs_md5_final(unsigned char *md, cs_md5_ctx *c);
|
void cs_md5_final(unsigned char digest[16], cs_md5_ctx *c);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue