chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: when an already abandoned unit gets abandoned again generate a clean error
[elogind.git]
/
src
/
core
/
socket.h
diff --git
a/src/core/socket.h
b/src/core/socket.h
index 57333226f5f2565cae0a29800b8c3a09f1d6b279..076a1836983aef109dc414dd423443a7437b1ecb 100644
(file)
--- a/
src/core/socket.h
+++ b/
src/core/socket.h
@@
-77,12
+77,14
@@
typedef enum SocketResult {
} SocketResult;
typedef struct SocketPort {
} SocketResult;
typedef struct SocketPort {
+ Socket *socket;
+
SocketType type;
int fd;
SocketAddress address;
char *path;
SocketType type;
int fd;
SocketAddress address;
char *path;
-
Watch fd_watch
;
+
sd_event_source *event_source
;
LIST_FIELDS(struct SocketPort, port);
} SocketPort;
LIST_FIELDS(struct SocketPort, port);
} SocketPort;
@@
-103,6
+105,7
@@
struct Socket {
ExecContext exec_context;
KillContext kill_context;
CGroupContext cgroup_context;
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
/* For Accept=no sockets refers to the one service we'll
activate. For Accept=yes sockets is either NULL, or filled
@@
-111,7
+114,7
@@
struct Socket {
SocketState state, deserialized_state;
SocketState state, deserialized_state;
-
Watch timer_watch
;
+
sd_event_source *timer_event_source
;
ExecCommand* control_command;
SocketExecCommand control_command_id;
ExecCommand* control_command;
SocketExecCommand control_command_id;
@@
-144,7
+147,7
@@
struct Socket {
size_t pipe_size;
char *bind_to_device;
char *tcp_congestion;
size_t pipe_size;
char *bind_to_device;
char *tcp_congestion;
- bool reuseport;
+ bool reuse
_
port;
long mq_maxmsg;
long mq_msgsize;
long mq_maxmsg;
long mq_msgsize;
@@
-156,10
+159,6
@@
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 code when collecting fds */
int socket_collect_fds(Socket *s, int **fds, unsigned *n_fds);
-/* 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);
/* Called from the service code when a per-connection service ended */
void socket_connection_unref(Socket *s);