X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=socket.h;h=43d28d7e04d3a207873c41ece3c33977e410deaf;hb=a9b5b03212f9c854938483b8901e433c2ba6619b;hp=6f2a7e811b02ae148e059be78b09242808951c19;hpb=80876c20f64f87765242bc35895977ab6a855729;p=elogind.git

diff --git a/socket.h b/socket.h
index 6f2a7e811..43d28d7e0 100644
--- a/socket.h
+++ b/socket.h
@@ -27,6 +27,7 @@ typedef struct Socket Socket;
 #include "manager.h"
 #include "unit.h"
 #include "socket-util.h"
+#include "mount.h"
 
 typedef enum SocketState {
         SOCKET_DEAD,
@@ -65,11 +66,11 @@ typedef struct SocketPort SocketPort;
 
 struct SocketPort {
         SocketType type;
+        int fd;
 
         SocketAddress address;
         char *path;
 
-        int fd;
         Watch fd_watch;
 
         LIST_FIELDS(SocketPort, port);
@@ -91,17 +92,21 @@ struct Socket {
 
         Service *service;
 
-        SocketState state;
+        SocketState state, deserialized_state;
 
         KillMode kill_mode;
 
         ExecCommand* control_command;
+        SocketExecCommand control_command_id;
         pid_t control_pid;
 
         char *bind_to_device;
         mode_t directory_mode;
         mode_t socket_mode;
 
+        bool accept;
+        unsigned n_accepted;
+
         bool failure;
         Watch timer_watch;
 };
@@ -112,6 +117,16 @@ 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);
 
+/* 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);
+
 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