mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2025-01-03 07:31:54 +00:00
Code Releases Activity

Flock: seems like machines being actually created

Browse Source
This commit is contained in:
Maria Matejka 2024-09-22 22:02:25 +02:00
parent 37eda0276c
commit 9b892f3f6a
2 changed files with 48 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
flock/container.c
View File

@ -1,10 +1,13 @@
#include "flock/flock.h"
#include "lib/birdlib.h" #include "lib/birdlib.h"
#include "lib/cbor.h" #include "lib/cbor.h"
#include "lib/io-loop.h" #include "lib/io-loop.h"
#include "flock/flock.h" #include <sched.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/wait.h>
#include <unistd.h>
static struct container_config { static struct container_config {
const char *hostname; const char *hostname;
@ -18,7 +21,7 @@ static void
container_mainloop(int fd) container_mainloop(int fd)
{ {
log(L_INFO "container mainloop with fd %d", fd); log(L_INFO "container mainloop with fd %d", fd);
/* TODO cleanup the loops from the forked process */ /* TODO unshare, fork and send info */
while (1) while (1)
{ {
pause(); pause();
@ -42,7 +45,40 @@ container_start(void)
pid_t pid = fork(); pid_t pid = fork();
if (pid < 0) if (pid < 0)
die("Failed to fork container: %m"); die("Failed to fork container (parent): %m");
if (pid)
{
log(L_INFO "Forked container parent pid %d", pid);
container_counter++;
int status;
pid_t pp = waitpid(pid, &status, 0);
if (pp < 0)
die("Failed to waitpid %d: %m");
if (pp != pid)
die("Waited pid %d instead of %d, wtf", pp, pid);
const char *coreinfo = WCOREDUMP(status) ? " (core dumped)" : "";
if (WIFEXITED(status))
log(L_INFO "Process %d ended with status %d%s", pp, WEXITSTATUS(status), coreinfo);
else if (WIFSIGNALED(status))
log(L_INFO "Process %d exited by signal %d (%s)%s", pp, WTERMSIG(status), strsignal(WTERMSIG(status)), coreinfo);
else
log(L_ERR "Process %d exited with a strange status %d", pp, status);
return;
}
e = unshare(CLONE_NEWPID | CLONE_NEWNS | CLONE_NEWUSER | CLONE_NEWTIME | CLONE_NEWNET);
if (e < 0)
die("Failed to unshare container: %m");
pid = fork();
if (pid < 0)
die("Failed to fork container (child): %m");
if (!pid) if (!pid)
{ {
@ -53,8 +89,6 @@ container_start(void)
bug("container_mainloop has returned"); bug("container_mainloop has returned");
} }
container_counter -= 2;
close(fds[1]); close(fds[1]);
byte outbuf[128]; byte outbuf[128];
@ -84,8 +118,7 @@ container_start(void)
if (e < 0) if (e < 0)
log(L_ERR "Failed to send socket: %m"); log(L_ERR "Failed to send socket: %m");
close(fds[0]); exit(0);
rfree(lp);
} }
/* The Parent */ /* The Parent */
@ -440,8 +473,12 @@ hcf_parse(byte *buf, int size)
{ {
/* Code to run at the end of the mapping */ /* Code to run at the end of the mapping */
case 0: /* toplevel item ended */ case 0: /* toplevel item ended */
ctx->major_state = ~0ULL; /* Reinit the parser */
ctx->type = 0xff;
ctx->major_state = 0;
ctx->stack_countdown[0] = 1;
ctx->bytes_consumed = 0; ctx->bytes_consumed = 0;
if (size > pos + 1) if (size > pos + 1)
hcf_parse(buf + pos + 1, size - pos - 1); hcf_parse(buf + pos + 1, size - pos - 1);
return; return;

2
flock/flock.h
View File

@ -1,4 +1,6 @@
#ifndef _GNU_SOURCE
#define _GNU_SOURCE #define _GNU_SOURCE
#endif
#ifndef INCLUDE_FLOCK_H #ifndef INCLUDE_FLOCK_H
#define INCLUDE_FLOCK_H #define INCLUDE_FLOCK_H