X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=socket.h;h=7076be7ef471eae1bc653c9249b9ce179a9748ef;hb=41160f3dbf0cb61e23a02338da1f289a2ff00066;hp=db5cd2143c1d74bdec12dd06e6c7859cbf789f7a;hpb=542563babda739f7aee468c3eaaab6315ffa4224;p=elogind.git

diff --git a/socket.h b/socket.h
index db5cd2143..7076be7ef 100644
--- a/socket.h
+++ b/socket.h
@@ -3,9 +3,29 @@
 #ifndef foosockethfoo
 #define foosockethfoo
 
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
 typedef struct Socket Socket;
 
-#include "name.h"
+#include "manager.h"
+#include "unit.h"
 #include "socket-util.h"
 
 typedef enum SocketState {
@@ -15,9 +35,14 @@ typedef enum SocketState {
         SOCKET_LISTENING,
         SOCKET_RUNNING,
         SOCKET_STOP_PRE,
+        SOCKET_STOP_PRE_SIGTERM,
+        SOCKET_STOP_PRE_SIGKILL,
         SOCKET_STOP_POST,
+        SOCKET_FINAL_SIGTERM,
+        SOCKET_FINAL_SIGKILL,
         SOCKET_MAINTAINANCE,
-        _SOCKET_STATE_MAX
+        _SOCKET_STATE_MAX,
+        _SOCKET_STATE_INVALID = -1
 } SocketState;
 
 typedef enum SocketExecCommand {
@@ -25,46 +50,78 @@ typedef enum SocketExecCommand {
         SOCKET_EXEC_START_POST,
         SOCKET_EXEC_STOP_PRE,
         SOCKET_EXEC_STOP_POST,
-        _SOCKET_EXEC_MAX
+        _SOCKET_EXEC_COMMAND_MAX,
+        _SOCKET_EXEC_COMMAND_INVALID = -1
 } SocketExecCommand;
 
 typedef enum SocketType {
         SOCKET_SOCKET,
-        SOCKET_FIFO
+        SOCKET_FIFO,
+        _SOCKET_FIFO_MAX,
+        _SOCKET_FIFO_INVALID = -1
 } SocketType;
 
 typedef struct SocketPort SocketPort;
 
 struct SocketPort {
         SocketType type;
+        int fd;
 
         SocketAddress address;
         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;
 
-        ExecCommand* exec_command[_SOCKET_EXEC_MAX];
+        usec_t timeout_usec;
+
+        ExecCommand* exec_command[_SOCKET_EXEC_COMMAND_MAX];
         ExecContext exec_context;
 
+        Service *service;
+
+        SocketState state, deserialized_state;
+
+        KillMode kill_mode;
+
+        ExecCommand* control_command;
+        SocketExecCommand control_command_id;
         pid_t control_pid;
 
-        Service *service;
+        char *bind_to_device;
+        mode_t directory_mode;
+        mode_t socket_mode;
+
+        bool accept;
+        unsigned n_accepted;
+
+        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;
+
+const char* socket_state_to_string(SocketState i);
+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);
 
 #endif