X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=execute.h;h=5099a82435595a6769d924dbcb2d7a725e9f7cfc;hp=e9bd686876d44900ec0bf0514671d79b3b160389;hb=ee2b489421ce8b47c08fb42c598c5af47043a9f9;hpb=034c6ed7da5e44bfdde5a5d0da75f7b7a59953b8

diff --git a/execute.h b/execute.h
index e9bd68687..5099a8243 100644
--- a/execute.h
+++ b/execute.h
@@ -3,6 +3,25 @@
 #ifndef fooexecutehfoo
 #define fooexecutehfoo
 
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
 typedef struct ExecStatus ExecStatus;
 typedef struct ExecCommand ExecCommand;
 typedef struct ExecContext ExecContext;
@@ -12,10 +31,32 @@ typedef struct ExecContext ExecContext;
 #include <sys/capability.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <sched.h>
+
+struct CGroupBonding;
 
 #include "list.h"
 #include "util.h"
 
+/* Abstract namespace! */
+#define LOGGER_SOCKET "/org/freedesktop/systemd1/logger"
+
+typedef enum ExecOutput {
+        EXEC_OUTPUT_CONSOLE,
+        EXEC_OUTPUT_NULL,
+        EXEC_OUTPUT_SYSLOG,
+        EXEC_OUTPUT_KERNEL,
+        _EXEC_OUTPUT_MAX,
+        _EXEC_OUTPUT_INVALID = -1
+} ExecOutput;
+
+typedef enum ExecInput {
+        EXEC_INPUT_NULL,
+        EXEC_INPUT_CONSOLE,
+        _EXEC_INPUT_MAX,
+        _EXEC_INPUT_INVALID = -1
+} ExecInput;
+
 struct ExecStatus {
         pid_t pid;
         usec_t timestamp;
@@ -34,16 +75,39 @@ struct ExecContext {
         char **environment;
         mode_t umask;
         struct rlimit *rlimit[RLIMIT_NLIMITS];
+        char *working_directory, *root_directory;
         int oom_adjust;
         int nice;
-        char *directory;
+        int ioprio;
+        int cpu_sched_policy;
+        int cpu_sched_priority;
+        cpu_set_t cpu_affinity;
+        unsigned long timer_slack_ns;
+
+        bool oom_adjust_set:1;
+        bool nice_set:1;
+        bool ioprio_set:1;
+        bool cpu_sched_set:1;
+        bool cpu_affinity_set:1;
+        bool timer_slack_ns_set:1;
+
+        bool cpu_sched_reset_on_fork;
+        bool non_blocking;
+        bool new_session;
+
+        ExecInput input;
+        ExecOutput output;
+        int syslog_priority;
+        char *syslog_identifier;
 
         cap_t capabilities;
-        bool capabilities_set:1;
+        int secure_bits;
+        uint64_t capability_bounding_set_drop;
 
-        /* since resolving these names might might involve socket
+        /* Since resolving these names might might involve socket
          * connections and we don't want to deadlock ourselves these
-         * names are resolved on execution only. */
+         * names are resolved on execution only and in the child
+         * process. */
         char *user;
         char *group;
         char **supplementary_groups;
@@ -71,18 +135,50 @@ typedef enum ExitStatus {
         EXIT_EXEC,
         EXIT_MEMORY,
         EXIT_LIMITS,
-        EXIT_OOM_ADJUST
+        EXIT_OOM_ADJUST,
+        EXIT_SIGNAL_MASK,
+        EXIT_INPUT,
+        EXIT_OUTPUT,
+        EXIT_CHROOT,   /* 210 */
+        EXIT_PGID,
+        EXIT_IOPRIO,
+        EXIT_TIMERSLACK,
+        EXIT_SECUREBITS,
+        EXIT_SETSCHEDULER,
+        EXIT_CPUAFFINITY,
+        EXIT_GROUP,
+        EXIT_USER,
+        EXIT_CAPABILITIES,
+        EXIT_CGROUP,   /* 220 */
+        EXIT_SETSID
 } ExitStatus;
 
-int exec_spawn(const ExecCommand *command, const ExecContext *context, int *fds, unsigned n_fds, pid_t *ret);
+int exec_spawn(const ExecCommand *command,
+               const ExecContext *context,
+               int *fds, unsigned n_fds,
+               bool apply_permissions,
+               bool apply_chroot,
+               struct CGroupBonding *cgroup_bondings,
+               pid_t *ret);
 
 void exec_command_free_list(ExecCommand *c);
 void exec_command_free_array(ExecCommand **c, unsigned n);
 
+char *exec_command_line(ExecCommand *c);
+void exec_command_dump(ExecCommand *c, FILE *f, const char *prefix);
+void exec_command_dump_list(ExecCommand *c, FILE *f, const char *prefix);
+void exec_command_append_list(ExecCommand **l, ExecCommand *e);
+
 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_status_fill(ExecStatus *s, pid_t pid, int code, int status);
 
+const char* exec_output_to_string(ExecOutput i);
+int exec_output_from_string(const char *s);
+
+const char* exec_input_to_string(ExecInput i);
+int exec_input_from_string(const char *s);
+
 #endif