X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsocket.h;h=6f2af7cd613b43b48501b0ed00df3c7665d7dc38;hb=85eda5721f8d2a20482ef228d341fbbd134c6799;hp=230dd200d5e423ebef41f869ec3f6555d5b0c0c1;hpb=cebf8b209237db381a504c50eeba76c4c28fb677;p=elogind.git

diff --git a/src/socket.h b/src/socket.h
index 230dd200d..6f2af7cd6 100644
--- a/src/socket.h
+++ b/src/socket.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foosockethfoo
 #define foosockethfoo
@@ -28,6 +28,7 @@ typedef struct Socket Socket;
 #include "unit.h"
 #include "socket-util.h"
 #include "mount.h"
+#include "service.h"
 
 typedef enum SocketState {
         SOCKET_DEAD,
@@ -41,7 +42,7 @@ typedef enum SocketState {
         SOCKET_STOP_POST,
         SOCKET_FINAL_SIGTERM,
         SOCKET_FINAL_SIGKILL,
-        SOCKET_MAINTENANCE,
+        SOCKET_FAILED,
         _SOCKET_STATE_MAX,
         _SOCKET_STATE_INVALID = -1
 } SocketState;
@@ -58,10 +59,24 @@ typedef enum SocketExecCommand {
 typedef enum SocketType {
         SOCKET_SOCKET,
         SOCKET_FIFO,
+        SOCKET_SPECIAL,
+        SOCKET_MQUEUE,
         _SOCKET_FIFO_MAX,
         _SOCKET_FIFO_INVALID = -1
 } SocketType;
 
+typedef enum SocketResult {
+        SOCKET_SUCCESS,
+        SOCKET_FAILURE_RESOURCES,
+        SOCKET_FAILURE_TIMEOUT,
+        SOCKET_FAILURE_EXIT_CODE,
+        SOCKET_FAILURE_SIGNAL,
+        SOCKET_FAILURE_CORE_DUMP,
+        SOCKET_FAILURE_SERVICE_FAILED_PERMANENT,
+        _SOCKET_RESULT_MAX,
+        _SOCKET_RESULT_INVALID = -1
+} SocketResult;
+
 typedef struct SocketPort {
         SocketType type;
         int fd;
@@ -74,10 +89,14 @@ typedef struct SocketPort {
 } SocketPort;
 
 struct Socket {
-        Meta meta;
+        Unit meta;
 
         LIST_HEAD(SocketPort, ports);
 
+        unsigned n_accepted;
+        unsigned n_connections;
+        unsigned max_connections;
+
         unsigned backlog;
         usec_t timeout_usec;
 
@@ -87,47 +106,50 @@ struct Socket {
         /* For Accept=no sockets refers to the one service we'll
         activate. For Accept=yes sockets is either NULL, or filled
         when the next service we spawn. */
-        Service *service;
+        UnitRef service;
 
         SocketState state, deserialized_state;
 
+        Watch timer_watch;
+
         ExecCommand* control_command;
         SocketExecCommand control_command_id;
         pid_t control_pid;
 
-        bool accept;
-        unsigned n_accepted;
-        unsigned n_connections;
-        unsigned max_connections;
+        mode_t directory_mode;
+        mode_t socket_mode;
 
-        bool failure;
-        Watch timer_watch;
+        SocketResult result;
+
+        bool accept;
 
         /* Socket options */
         bool keep_alive;
+        bool free_bind;
+        bool transparent;
+        bool broadcast;
+        bool pass_cred;
         int priority;
+        int mark;
         size_t receive_buffer;
         size_t send_buffer;
         int ip_tos;
         int ip_ttl;
         size_t pipe_size;
-        int mark;
-        bool free_bind;
         char *bind_to_device;
         char *tcp_congestion;
+        long mq_maxmsg;
+        long mq_msgsize;
 
         /* Only for INET6 sockets: issue IPV6_V6ONLY sockopt */
         SocketAddressBindIPv6Only bind_ipv6_only;
-
-        mode_t directory_mode;
-        mode_t socket_mode;
 };
 
 /* 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);
+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 */
@@ -144,4 +166,7 @@ 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);
 
+const char* socket_result_to_string(SocketResult i);
+SocketResult socket_result_from_string(const char *s);
+
 #endif