X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=socket.h;h=557512d12b456fdf3ccba1e1bdf96dbe2690c1d7;hp=fcf09dd0df7dad2b8c61d0ac87ce1e8e9606f2b3;hb=a7334b0952ab66c17ee787e36e6d2c5ceb387de6;hpb=5cb5a6ffc33667c93e9bc3572534dcaa684046e3

diff --git a/socket.h b/socket.h
index fcf09dd0d..557512d12 100644
--- a/socket.h
+++ b/socket.h
@@ -3,9 +3,30 @@
 #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 {
         SOCKET_DEAD,
@@ -14,7 +35,11 @@ typedef enum SocketState {
         SOCKET_LISTENING,
         SOCKET_RUNNING,
         SOCKET_STOP_PRE,
+        SOCKET_STOP_PRE_SIGTERM,
+        SOCKET_STOP_PRE_SIGKILL,
         SOCKET_STOP_POST,
+        SOCKET_STOP_POST_SIGTERM,
+        SOCKET_STOP_POST_SIGKILL,
         SOCKET_MAINTAINANCE,
         _SOCKET_STATE_MAX
 } SocketState;
@@ -27,23 +52,58 @@ typedef enum SocketExecCommand {
         _SOCKET_EXEC_MAX
 } SocketExecCommand;
 
+typedef enum SocketType {
+        SOCKET_SOCKET,
+        SOCKET_FIFO
+} SocketType;
+
+typedef struct SocketPort SocketPort;
+
+struct SocketPort {
+        SocketType type;
+
+        SocketAddress address;
+        char *path;
+
+        int fd;
+        Watch fd_watch;
+
+        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;
 
-        Address address;
-        int *fds;
-        unsigned n_fds;
+        usec_t timeout_usec;
 
         ExecCommand* exec_command[_SOCKET_EXEC_MAX];
         ExecContext exec_context;
 
+        Service *service;
+
+        SocketState state;
+
+        ExecCommand* control_command;
         pid_t control_pid;
 
-        Service *service;
+        char *bind_to_device;
+
+        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;
 
 #endif