X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=socket.h;h=6f2a7e811b02ae148e059be78b09242808951c19;hb=10a94420172b33a7472a16b2e829689dbc570cad;hp=356341f2a6f1f67794306d7c03b567a2a9471293;hpb=b5a0699f0bb8b1d1ae55bb0d86f51dfe2783821b;p=elogind.git

diff --git a/socket.h b/socket.h
index 356341f2a..6f2a7e811 100644
--- a/socket.h
+++ b/socket.h
@@ -38,10 +38,11 @@ typedef enum SocketState {
         SOCKET_STOP_PRE_SIGTERM,
         SOCKET_STOP_PRE_SIGKILL,
         SOCKET_STOP_POST,
-        SOCKET_STOP_POST_SIGTERM,
-        SOCKET_STOP_POST_SIGKILL,
+        SOCKET_FINAL_SIGTERM,
+        SOCKET_FINAL_SIGKILL,
         SOCKET_MAINTAINANCE,
-        _SOCKET_STATE_MAX
+        _SOCKET_STATE_MAX,
+        _SOCKET_STATE_INVALID = -1
 } SocketState;
 
 typedef enum SocketExecCommand {
@@ -49,12 +50,15 @@ typedef enum SocketExecCommand {
         SOCKET_EXEC_START_POST,
         SOCKET_EXEC_STOP_PRE,
         SOCKET_EXEC_STOP_POST,
-        _SOCKET_EXEC_MAX
+        _SOCKET_EXEC_COMMAND_MAX,
+        _SOCKET_EXEC_COMMAND_INVALID = -1
 } SocketExecCommand;
 
 typedef enum SocketType {
         SOCKET_SOCKET,
-        SOCKET_FIFO
+        SOCKET_FIFO,
+        _SOCKET_FIFO_MAX,
+        _SOCKET_FIFO_INVALID = -1
 } SocketType;
 
 typedef struct SocketPort SocketPort;
@@ -82,13 +86,15 @@ struct Socket {
 
         usec_t timeout_usec;
 
-        ExecCommand* exec_command[_SOCKET_EXEC_MAX];
+        ExecCommand* exec_command[_SOCKET_EXEC_COMMAND_MAX];
         ExecContext exec_context;
 
         Service *service;
 
         SocketState state;
 
+        KillMode kill_mode;
+
         ExecCommand* control_command;
         pid_t control_pid;