X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fsocket.h;h=076a1836983aef109dc414dd423443a7437b1ecb;hp=f099520dcef1015164dc9b4067c4d40752a0f4a7;hb=454f7158c6cecd18555c5e7dd556e3d544301b52;hpb=e4f44e734c4f397ee5e7ba3270e014a8ae0043dd

diff --git a/src/core/socket.h b/src/core/socket.h
index f099520dc..076a18369 100644
--- a/src/core/socket.h
+++ b/src/core/socket.h
@@ -77,12 +77,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;
@@ -102,6 +104,8 @@ struct Socket {
         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
@@ -110,7 +114,7 @@ struct Socket {
 
         SocketState state, deserialized_state;
 
-        Watch timer_watch;
+        sd_event_source *timer_event_source;
 
         ExecCommand* control_command;
         SocketExecCommand control_command_id;
@@ -130,6 +134,10 @@ struct Socket {
         bool broadcast;
         bool pass_cred;
         bool pass_sec;
+
+        /* Only for INET6 sockets: issue IPV6_V6ONLY sockopt */
+        SocketAddressBindIPv6Only bind_ipv6_only;
+
         int priority;
         int mark;
         size_t receive_buffer;
@@ -139,12 +147,10 @@ struct Socket {
         size_t pipe_size;
         char *bind_to_device;
         char *tcp_congestion;
+        bool reuse_port;
         long mq_maxmsg;
         long mq_msgsize;
 
-        /* Only for INET6 sockets: issue IPV6_V6ONLY sockopt */
-        SocketAddressBindIPv6Only bind_ipv6_only;
-
         char *smack;
         char *smack_ip_in;
         char *smack_ip_out;
@@ -153,23 +159,20 @@ struct Socket {
 /* 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);
 
+void socket_free_ports(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_state_to_string(SocketState i) _const_;
+SocketState socket_state_from_string(const char *s) _pure_;
+
+const char* socket_exec_command_to_string(SocketExecCommand i) _const_;
+SocketExecCommand socket_exec_command_from_string(const char *s) _pure_;
 
-const char* socket_exec_command_to_string(SocketExecCommand i);
-SocketExecCommand socket_exec_command_from_string(const char *s);
+const char* socket_result_to_string(SocketResult i) _const_;
+SocketResult socket_result_from_string(const char *s) _pure_;
 
-const char* socket_result_to_string(SocketResult i);
-SocketResult socket_result_from_string(const char *s);
+const char* socket_port_type_to_string(SocketPort *p) _pure_;