build-sys: support non-git versions of libcgroup

[elogind.git] / socket.h

diff --git a/socket.h b/socket.h
index 4e053c0a449a8b1525ac4270a71ea1e96dc2fb2e..7076be7ef471eae1bc653c9249b9ce179a9748ef 100644 (file)
--- a/socket.h
+++ b/socket.h
@@ -38,8 +38,8 @@ 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_INVALID = -1
@@ -65,11 +65,11 @@ typedef struct SocketPort SocketPort;
 
 struct SocketPort {
         SocketType type;
+        int fd;
 
         SocketAddress address;
         char *path;
 
-        int fd;
         Watch fd_watch;
 
         LIST_FIELDS(SocketPort, port);
@@ -91,17 +91,21 @@ struct Socket {
 
         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;
 };
@@ -114,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