X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fsocket.h;h=eede70564a4f4808a29cb590cf6c0351b72ff42c;hp=8f9dfdbfb0f8c58300a3b7713320d834e207d59d;hb=3bb07b7680c543c982077ac075abe8badeb46ca1;hpb=f7db7a691c3f532cf60886312459f2baea755283

diff --git a/src/core/socket.h b/src/core/socket.h
index 8f9dfdbfb..eede70564 100644
--- a/src/core/socket.h
+++ b/src/core/socket.h
@@ -32,6 +32,7 @@ typedef struct Socket Socket;
 typedef enum SocketState {
         SOCKET_DEAD,
         SOCKET_START_PRE,
+        SOCKET_START_CHOWN,
         SOCKET_START_POST,
         SOCKET_LISTENING,
         SOCKET_RUNNING,
@@ -48,6 +49,7 @@ typedef enum SocketState {
 
 typedef enum SocketExecCommand {
         SOCKET_EXEC_START_PRE,
+        SOCKET_EXEC_START_CHOWN,
         SOCKET_EXEC_START_POST,
         SOCKET_EXEC_STOP_PRE,
         SOCKET_EXEC_STOP_POST,
@@ -77,12 +79,14 @@ typedef enum SocketResult {
 } SocketResult;
 
 typedef struct SocketPort {
+        Socket *socket;
+
         SocketType type;
         int fd;
 
         SocketAddress address;
         char *path;
-        Watch fd_watch;
+        sd_event_source *event_source;
 
         LIST_FIELDS(struct SocketPort, port);
 } SocketPort;
@@ -97,12 +101,17 @@ struct Socket {
         unsigned max_connections;
 
         unsigned backlog;
+        unsigned keep_alive_cnt;
         usec_t timeout_usec;
+        usec_t keep_alive_time;
+        usec_t keep_alive_interval;
+        usec_t defer_accept;
 
         ExecCommand* exec_command[_SOCKET_EXEC_COMMAND_MAX];
         ExecContext exec_context;
         KillContext kill_context;
         CGroupContext cgroup_context;
+        ExecRuntime *exec_runtime;
 
         /* For Accept=no sockets refers to the one service we'll
         activate. For Accept=yes sockets is either NULL, or filled
@@ -111,7 +120,7 @@ struct Socket {
 
         SocketState state, deserialized_state;
 
-        Watch timer_watch;
+        sd_event_source *timer_event_source;
 
         ExecCommand* control_command;
         SocketExecCommand control_command_id;
@@ -122,10 +131,14 @@ struct Socket {
 
         SocketResult result;
 
+        char **symlinks;
+
         bool accept;
+        bool remove_on_stop;
 
         /* Socket options */
         bool keep_alive;
+        bool no_delay;
         bool free_bind;
         bool transparent;
         bool broadcast;
@@ -144,25 +157,20 @@ struct Socket {
         size_t pipe_size;
         char *bind_to_device;
         char *tcp_congestion;
-        bool reuseport;
+        bool reuse_port;
         long mq_maxmsg;
         long mq_msgsize;
 
         char *smack;
         char *smack_ip_in;
         char *smack_ip_out;
+
+        char *user, *group;
 };
 
 /* 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, bool failed_permanent);
-
-/* Called from the mount code figure out if a mount is a dependency of
- * 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);
 
@@ -180,3 +188,5 @@ const char* socket_result_to_string(SocketResult i) _const_;
 SocketResult socket_result_from_string(const char *s) _pure_;
 
 const char* socket_port_type_to_string(SocketPort *p) _pure_;
+
+int socket_instantiate_service(Socket *s);