X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fexecute.h;h=4f05c9fa4b29f9ef4385a3c1ab0e2f4941e60dc2;hp=4b3449e2652222179ecb47f42b638ccb6d473b21;hb=54fe0cdbe313558a712a15dc3bc516a46c1f7b6e;hpb=b708e7cea941538bfd5e20ce0a723c19b7da7d1d diff --git a/src/execute.h b/src/execute.h index 4b3449e26..4f05c9fa4 100644 --- a/src/execute.h +++ b/src/execute.h @@ -1,4 +1,4 @@ -/*-*- Mode: C; c-basic-offset: 8 -*-*/ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ #ifndef fooexecutehfoo #define fooexecutehfoo @@ -26,6 +26,7 @@ typedef struct ExecStatus ExecStatus; typedef struct ExecCommand ExecCommand; typedef struct ExecContext ExecContext; +#include #include #include #include @@ -34,26 +35,27 @@ typedef struct ExecContext ExecContext; #include struct CGroupBonding; +struct CGroupAttribute; #include "list.h" #include "util.h" -/* Abstract namespace! */ -#define LOGGER_SOCKET "/org/freedesktop/systemd1/logger" - -/* This doesn't really belong here, but I couldn't find a better place to put this. */ -#define SIGNALS_CRASH_HANDLER SIGSEGV,SIGILL,SIGFPE,SIGBUS,SIGQUIT,SIGABRT -#define SIGNALS_IGNORE SIGKILL,SIGPIPE - typedef enum KillMode { KILL_CONTROL_GROUP = 0, - KILL_PROCESS_GROUP, KILL_PROCESS, KILL_NONE, _KILL_MODE_MAX, _KILL_MODE_INVALID = -1 } KillMode; +typedef enum KillWho { + KILL_MAIN, + KILL_CONTROL, + KILL_ALL, + _KILL_WHO_MAX, + _KILL_WHO_INVALID = -1 +} KillWho; + typedef enum ExecInput { EXEC_INPUT_NULL, EXEC_INPUT_TTY, @@ -69,7 +71,9 @@ typedef enum ExecOutput { EXEC_OUTPUT_NULL, EXEC_OUTPUT_TTY, EXEC_OUTPUT_SYSLOG, + EXEC_OUTPUT_SYSLOG_AND_CONSOLE, EXEC_OUTPUT_KMSG, + EXEC_OUTPUT_KMSG_AND_CONSOLE, EXEC_OUTPUT_SOCKET, _EXEC_OUTPUT_MAX, _EXEC_OUTPUT_INVALID = -1 @@ -87,17 +91,19 @@ struct ExecCommand { char *path; char **argv; ExecStatus exec_status; - bool ignore; LIST_FIELDS(ExecCommand, command); /* useful for chaining commands */ + bool ignore; }; struct ExecContext { char **environment; + char **environment_files; + struct rlimit *rlimit[RLIMIT_NLIMITS]; char *working_directory, *root_directory; mode_t umask; - int oom_adjust; + int oom_score_adjust; int nice; int ioprio; int cpu_sched_policy; @@ -105,20 +111,21 @@ struct ExecContext { cpu_set_t *cpuset; unsigned cpuset_ncpus; - unsigned long timer_slack_nsec; ExecInput std_input; ExecOutput std_output; ExecOutput std_error; - int syslog_priority; - char *syslog_identifier; - bool syslog_level_prefix; + unsigned long timer_slack_nsec; char *tcpwrap_name; char *tty_path; + bool tty_reset; + bool tty_vhangup; + bool tty_vt_disallocate; + /* Since resolving these names might might involve socket * connections and we don't want to deadlock ourselves these * names are resolved on execution only and in the child @@ -129,23 +136,31 @@ struct ExecContext { char *pam_name; + char *utmp_id; + char **read_write_dirs, **read_only_dirs, **inaccessible_dirs; unsigned long mount_flags; uint64_t capability_bounding_set_drop; + /* Not relevant for spawning processes, just for killing */ + KillMode kill_mode; + int kill_signal; + bool send_sigkill; + cap_t capabilities; int secure_bits; + int syslog_priority; + char *syslog_identifier; + bool syslog_level_prefix; + bool cpu_sched_reset_on_fork; bool non_blocking; bool private_tmp; + bool private_network; - bool oom_adjust_set:1; - bool nice_set:1; - bool ioprio_set:1; - bool cpu_sched_set:1; - bool timer_slack_nsec_set:1; + bool control_group_modify; /* This is not exposed to the user but available * internally. We need it to make sure that whenever we spawn @@ -154,55 +169,13 @@ struct ExecContext { * don't enter a trigger loop. */ bool same_pgrp; - /* Not relevant for spawning processes, just for killing */ - KillMode kill_mode; - int kill_signal; + bool oom_score_adjust_set:1; + bool nice_set:1; + bool ioprio_set:1; + bool cpu_sched_set:1; + bool timer_slack_nsec_set:1; }; -typedef enum ExitStatus { - /* EXIT_SUCCESS defined by libc */ - /* EXIT_FAILURE defined by libc */ - EXIT_INVALIDARGUMENT = 2, - EXIT_NOTIMPLEMENTED = 3, - EXIT_NOPERMISSION = 4, - EXIT_NOTINSTALLED = 5, - EXIT_NOTCONFIGURED = 6, - EXIT_NOTRUNNING = 7, - - /* The LSB suggests that error codes >= 200 are "reserved". We - * use them here under the assumption that they hence are - * unused by init scripts. - * - * http://refspecs.freestandards.org/LSB_3.1.0/LSB-Core-generic/LSB-Core-generic/iniscrptact.html */ - - EXIT_CHDIR = 200, - EXIT_NICE, - EXIT_FDS, - EXIT_EXEC, - EXIT_MEMORY, - EXIT_LIMITS, - EXIT_OOM_ADJUST, - EXIT_SIGNAL_MASK, - EXIT_STDIN, - EXIT_STDOUT, - EXIT_CHROOT, /* 210 */ - EXIT_IOPRIO, - EXIT_TIMERSLACK, - EXIT_SECUREBITS, - EXIT_SETSCHEDULER, - EXIT_CPUAFFINITY, - EXIT_GROUP, - EXIT_USER, - EXIT_CAPABILITIES, - EXIT_CGROUP, - EXIT_SETSID, /* 220 */ - EXIT_CONFIRM, - EXIT_STDERR, - EXIT_TCPWRAP, - EXIT_PAM - -} ExitStatus; - int exec_spawn(ExecCommand *command, char **argv, const ExecContext *context, @@ -213,6 +186,7 @@ int exec_spawn(ExecCommand *command, bool apply_tty_stdin, bool confirm_spawn, struct CGroupBonding *cgroup_bondings, + struct CGroupAttribute *cgroup_attributes, pid_t *ret); void exec_command_done(ExecCommand *c); @@ -231,17 +205,24 @@ int exec_command_set(ExecCommand *c, const char *path, ...); void exec_context_init(ExecContext *c); void exec_context_done(ExecContext *c); void exec_context_dump(ExecContext *c, FILE* f, const char *prefix); +void exec_context_tty_reset(const ExecContext *context); + +int exec_context_load_environment(const ExecContext *c, char ***l); void exec_status_start(ExecStatus *s, pid_t pid); -void exec_status_exit(ExecStatus *s, pid_t pid, int code, int status); +void exec_status_exit(ExecStatus *s, ExecContext *context, pid_t pid, int code, int status); void exec_status_dump(ExecStatus *s, FILE *f, const char *prefix); const char* exec_output_to_string(ExecOutput i); -int exec_output_from_string(const char *s); +ExecOutput exec_output_from_string(const char *s); const char* exec_input_to_string(ExecInput i); -int exec_input_from_string(const char *s); +ExecInput exec_input_from_string(const char *s); + +const char *kill_mode_to_string(KillMode k); +KillMode kill_mode_from_string(const char *s); -const char* exit_status_to_string(ExitStatus status); +const char *kill_who_to_string(KillWho k); +KillWho kill_who_from_string(const char *s); #endif