mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2025-03-23 14:57:02 +00:00
Code Releases Activity

fixup! fixup! fixup! Flock: now linker errors

Browse Source
This commit is contained in:
Maria Matejka 2024-10-21 21:22:26 +02:00
parent e5bd1218d6
commit 604b6f3939
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
flock/container.c
View File

@ -655,6 +655,14 @@ struct container_ctl_msg {
int down_signal; int down_signal;
}; };
static void
container_ctl_cancel(struct cbor_stream *stream)
{
SKIP_BACK_DECLARE(struct container_runtime, crt, stream, stream);
HASH_REMOVE(hcf.hash, CRT, crt);
mb_free(crt);
}
static enum cbor_parse_result static enum cbor_parse_result
container_ctl_parse(struct cbor_channel *cch, enum cbor_parse_result res) container_ctl_parse(struct cbor_channel *cch, enum cbor_parse_result res)
{ {
@ -765,6 +773,10 @@ container_fork_request_reply(struct cbor_channel *cch, enum cbor_parse_result re
switch (cfr->reply_state) { switch (cfr->reply_state) {
case 3: case 3:
cfr->reply_state = 4; cfr->reply_state = 4;
return CPR_MORE;
case 4:
cfr->reply_state = 5;
break; break;
default: default:
@ -854,6 +866,8 @@ hypervisor_container_start(struct cbor_channel *cch, struct flock_machine_contai
cfr->cch.parse = container_fork_request_reply; cfr->cch.parse = container_fork_request_reply;
crt->stream.parse = container_ctl_parse; crt->stream.parse = container_ctl_parse;
crt->stream.cancel = container_ctl_cancel;
CBOR_STREAM_INIT(crt, stream, cch, hcf.p, struct container_ctl_msg); CBOR_STREAM_INIT(crt, stream, cch, hcf.p, struct container_ctl_msg);
CBOR_REPLY(&cfr->cch, cw) CBOR_REPLY(&cfr->cch, cw)
@ -1083,6 +1097,9 @@ hcf_parse(struct cbor_channel *cch, enum cbor_parse_result res)
case CPR_BLOCK_END: case CPR_BLOCK_END:
switch (ccx->major_state) switch (ccx->major_state)
{ {
case 0:
return CPR_BLOCK_END;
case 1: /* the mapping ended */ case 1: /* the mapping ended */
if (!ccf->cf.name) if (!ccf->cf.name)
CBOR_PARSER_ERROR("Missing hostname"); CBOR_PARSER_ERROR("Missing hostname");
@ -1096,7 +1113,7 @@ hcf_parse(struct cbor_channel *cch, enum cbor_parse_result res)
container_start(ccx); container_start(ccx);
ccx->major_state = 0; ccx->major_state = 0;
return CPR_BLOCK_END; break;
default: default:
bug("Unexpected state to end a mapping in"); bug("Unexpected state to end a mapping in");
@ -1109,7 +1126,7 @@ hcf_parse(struct cbor_channel *cch, enum cbor_parse_result res)
static void static void
hcf_cancel(struct cbor_stream *stream UNUSED) hcf_cancel(struct cbor_stream *stream UNUSED)
{ {
die("Forker child stream cancelled"); bug("Forker child stream cancelled");
} }
void void
@ -1135,6 +1152,7 @@ hypervisor_container_fork(void)
hcf.p = rp_new(birdloop_pool(hcf.loop), birdloop_domain(hcf.loop), "Container forker pool"); hcf.p = rp_new(birdloop_pool(hcf.loop), birdloop_domain(hcf.loop), "Container forker pool");
hcf.s = sk_new(hcf.p); hcf.s = sk_new(hcf.p);
hcf.s->type = SK_MAGIC; hcf.s->type = SK_MAGIC;
hcf.s->flags |= SKF_FD_RX;
/* Set the hooks and fds according to the side we are at */ /* Set the hooks and fds according to the side we are at */
sk_set_tbsize(hcf.s, 16384); sk_set_tbsize(hcf.s, 16384);
sk_set_rbsize(hcf.s, 128); sk_set_rbsize(hcf.s, 128);
@ -1163,6 +1181,8 @@ hypervisor_container_fork(void)
/* initialize the forker */ /* initialize the forker */
sock *sk = sk_new(&root_pool); sock *sk = sk_new(&root_pool);
sk->type = SK_UNIX_MSG; sk->type = SK_UNIX_MSG;
sk->fd = fds[1];
sk->flags |= SKF_FD_TX;
sk->rbuf = sk->rpos = alloca(sk->rbsize = 4096); sk->rbuf = sk->rpos = alloca(sk->rbsize = 4096);
sk->tbuf = sk->tpos = alloca(sk->tbsize = 64); sk->tbuf = sk->tpos = alloca(sk->tbsize = 64);