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

diff --git a/socket.h b/socket.h
index f821186ec..7076be7ef 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,23 +50,26 @@ 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;
 
 struct SocketPort {
         SocketType type;
+        int fd;
 
         SocketAddress address;
         char *path;
 
-        int fd;
         Watch fd_watch;
 
         LIST_FIELDS(SocketPort, port);
@@ -82,22 +86,26 @@ 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;
+        SocketState state, deserialized_state;
 
         KillMode kill_mode;
 
         ExecCommand* control_command;
+        SocketExecCommand control_command_id;
         pid_t control_pid;
 
         char *bind_to_device;
         mode_t directory_mode;
         mode_t socket_mode;
 
+        bool accept;
+        unsigned n_accepted;
+
         bool failure;
         Watch timer_watch;
 };
@@ -110,4 +118,10 @@ void socket_notify_service_dead(Socket *s);
 
 extern const UnitVTable socket_vtable;
 
+const char* socket_state_to_string(SocketState i);
+SocketState socket_state_from_string(const char *s);
+
+const char* socket_exec_command_to_string(SocketExecCommand i);
+SocketExecCommand socket_exec_command_from_string(const char *s);
+
 #endif