manager: both rescue and emergency should be started in isolate mode

[elogind.git] / src / socket.h

diff --git a/src/socket.h b/src/socket.h
index 43d28d7e04d3a207873c41ece3c33977e410deaf..31b3870ef66fc7b8e002e3baf17be239eef2a934 100644 (file)
--- a/src/socket.h
+++ b/src/socket.h
@@ -41,7 +41,7 @@ typedef enum SocketState {
         SOCKET_STOP_POST,
         SOCKET_FINAL_SIGTERM,
         SOCKET_FINAL_SIGKILL,
-        SOCKET_MAINTAINANCE,
+        SOCKET_MAINTENANCE,
         _SOCKET_STATE_MAX,
         _SOCKET_STATE_INVALID = -1
 } SocketState;
@@ -62,19 +62,16 @@ typedef enum SocketType {
         _SOCKET_FIFO_INVALID = -1
 } SocketType;
 
-typedef struct SocketPort SocketPort;
-
-struct SocketPort {
+typedef struct SocketPort {
         SocketType type;
         int fd;
 
         SocketAddress address;
         char *path;
-
         Watch fd_watch;
 
-        LIST_FIELDS(SocketPort, port);
-};
+        LIST_FIELDS(struct SocketPort, port);
+} SocketPort;
 
 struct Socket {
         Meta meta;
@@ -82,7 +79,7 @@ struct Socket {
         LIST_HEAD(SocketPort, ports);
 
         /* Only for INET6 sockets: issue IPV6_V6ONLY sockopt */
-        bool bind_ipv6_only;
+        SocketAddressBindIPv6Only bind_ipv6_only;
         unsigned backlog;
 
         usec_t timeout_usec;
@@ -106,6 +103,8 @@ struct Socket {
 
         bool accept;
         unsigned n_accepted;
+        unsigned n_connections;
+        unsigned max_connections;
 
         bool failure;
         Watch timer_watch;
@@ -121,6 +120,9 @@ void socket_notify_service_dead(Socket *s);
  * any of the sockets of this socket */
 int socket_add_one_mount_link(Socket *s, Mount *m);
 
+/* Called from the service code when a per-connection service ended */
+void socket_connection_unref(Socket *s);
+
 extern const UnitVTable socket_vtable;
 
 const char* socket_state_to_string(SocketState i);