X-Git-Url: https://git.librecmc.org/?p=oweals%2Fprocd.git;a=blobdiff_plain;f=service%2Finstance.h;h=003a8c999d0e66b4c30c9f6c58624bbb0ef9f2f5;hp=f76e79573986c2f9b663681e23fd1bb299edb60f;hb=bcb8655;hpb=4bd633868e3284659668f14aa39ea84aaadc2dec

diff --git a/service/instance.h b/service/instance.h
index f76e795..003a8c9 100644
--- a/service/instance.h
+++ b/service/instance.h
@@ -17,9 +17,24 @@
 
 #include <libubox/vlist.h>
 #include <libubox/uloop.h>
+#include <libubox/ustream.h>
 #include "../utils/utils.h"
 
 #define RESPAWN_ERROR	(5 * 60)
+#define SIGNALLED_OFFSET 128
+
+struct jail {
+	bool procfs;
+	bool sysfs;
+	bool ubus;
+	bool log;
+	bool ronly;
+	bool netns;
+	char *name;
+	char *hostname;
+	struct blobmsg_list mount;
+	int argc;
+};
 
 struct service_instance {
 	struct vlist_node node;
@@ -29,15 +44,30 @@ struct service_instance {
 	int8_t nice;
 	bool valid;
 
+	char *user;
 	uid_t uid;
-	gid_t gid;
+	gid_t pw_gid;
+	char *group;
+	gid_t gr_gid;
 
 	bool halt;
 	bool restart;
 	bool respawn;
 	int respawn_count;
+	int reload_signal;
 	struct timespec start;
 
+	bool trace;
+	bool has_jail;
+	bool require_jail;
+	bool no_new_privs;
+	struct jail jail;
+	char *seccomp;
+	char *pidfile;
+	int syslog_facility;
+	int exit_code;
+
+	uint32_t term_timeout;
 	uint32_t respawn_timeout;
 	uint32_t respawn_threshold;
 	uint32_t respawn_retry;
@@ -45,6 +75,8 @@ struct service_instance {
 	struct blob_attr *config;
 	struct uloop_process proc;
 	struct uloop_timeout timeout;
+	struct ustream_fd _stdout;
+	struct ustream_fd _stderr;
 
 	struct blob_attr *command;
 	struct blob_attr *trigger;
@@ -57,8 +89,8 @@ struct service_instance {
 };
 
 void instance_start(struct service_instance *in);
-void instance_stop(struct service_instance *in);
-bool instance_update(struct service_instance *in, struct service_instance *in_new);
+void instance_stop(struct service_instance *in, bool halt);
+void instance_update(struct service_instance *in, struct service_instance *in_new);
 void instance_init(struct service_instance *in, struct service *s, struct blob_attr *config);
 void instance_free(struct service_instance *in);
 void instance_dump(struct blob_buf *b, struct service_instance *in, int debug);