when shortcutting states do not skip state transitions

[elogind.git] / socket.h

diff --git a/socket.h b/socket.h
index db5cd2143c1d74bdec12dd06e6c7859cbf789f7a..5495e3c5b9a9ccbd3b6353dc9a3491e310ff91cb 100644 (file)
--- a/socket.h
+++ b/socket.h
@@ -5,7 +5,8 @@
 
 typedef struct Socket Socket;
 
-#include "name.h"
+#include "manager.h"
+#include "unit.h"
 #include "socket-util.h"
 
 typedef enum SocketState {
@@ -15,7 +16,11 @@ typedef enum SocketState {
         SOCKET_LISTENING,
         SOCKET_RUNNING,
         SOCKET_STOP_PRE,
+        SOCKET_STOP_PRE_SIGTERM,
+        SOCKET_STOP_PRE_SIGKILL,
         SOCKET_STOP_POST,
+        SOCKET_STOP_POST_SIGTERM,
+        SOCKET_STOP_POST_SIGKILL,
         SOCKET_MAINTAINANCE,
         _SOCKET_STATE_MAX
 } SocketState;
@@ -42,29 +47,44 @@ struct SocketPort {
         char *path;
 
         int fd;
+        Watch fd_watch;
 
-        LIST_FIELDS(SocketPort);
+        LIST_FIELDS(SocketPort, port);
 };
 
 struct Socket {
         Meta meta;
 
-        SocketState state;
-
         LIST_HEAD(SocketPort, ports);
 
         /* Only for INET6 sockets: issue IPV6_V6ONLY sockopt */
         bool bind_ipv6_only;
         unsigned backlog;
 
+        usec_t timeout_usec;
+
         ExecCommand* exec_command[_SOCKET_EXEC_MAX];
         ExecContext exec_context;
 
+        Service *service;
+
+        SocketState state;
+
+        ExecCommand* control_command;
         pid_t control_pid;
 
-        Service *service;
+        char *bind_to_device;
+
+        bool failure;
+        Watch timer_watch;
 };
 
-extern const NameVTable socket_vtable;
+/* Called from the service code when collecting fds */
+int socket_collect_fds(Socket *s, int **fds, unsigned *n_fds);
+
+/* Called from the service when it shut down */
+void socket_notify_service_dead(Socket *s);
+
+extern const UnitVTable socket_vtable;
 
 #endif