X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=socket.h;h=5105adfb84762c82393423ef329727dabb9c31c3;hb=c3087ddb5805af3822d5005b8e014b5acf8ecd29;hp=f821186ec9bcca41ca563dba12abaf96965120bb;hpb=50159e6a776143be076f8ebe73a8a59447050698;p=elogind.git

diff --git a/socket.h b/socket.h
index f821186ec..5105adfb8 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,7 +86,7 @@ struct Socket {
 
         usec_t timeout_usec;
 
-        ExecCommand* exec_command[_SOCKET_EXEC_MAX];
+        ExecCommand* exec_command[_SOCKET_EXEC_COMMAND_MAX];
         ExecContext exec_context;
 
         Service *service;
@@ -98,6 +102,9 @@ struct Socket {
         mode_t directory_mode;
         mode_t socket_mode;
 
+        bool accept;
+        unsigned n_accepted;
+
         bool failure;
         Watch timer_watch;
 };