diff options
author | Lennart Poettering <lennart@poettering.net> | 2013-11-19 21:12:59 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2013-11-20 20:52:36 +0100 |
commit | 718db96199eb307751264e4163555662c9a389fa (patch) | |
tree | 9ec8467596ba1acba76bb6273c7797baf68c1a00 /src/core/socket.h | |
parent | 3febea3a0b0a968ea281e7959c1654cbaf95c9bf (diff) |
core: convert PID 1 to libsystemd-bus
This patch converts PID 1 to libsystemd-bus and thus drops the
dependency on libdbus. The only remaining code using libdbus is a test
case that validates our bus marshalling against libdbus' marshalling,
and this dependency can be turned off.
This patch also adds a couple of things to libsystem-bus, that are
necessary to make the port work:
- Synthesizing of "Disconnected" messages when bus connections are
severed.
- Support for attaching multiple vtables for the same interface on the
same path.
This patch also fixes the SetDefaultTarget() and GetDefaultTarget() bus
calls which used an inappropriate signature.
As a side effect we will now generate PropertiesChanged messages which
carry property contents, rather than just invalidation information.
Diffstat (limited to 'src/core/socket.h')
-rw-r--r-- | src/core/socket.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/core/socket.h b/src/core/socket.h index 3d7eadc9fe..db0796c4a3 100644 --- a/src/core/socket.h +++ b/src/core/socket.h @@ -77,12 +77,14 @@ typedef enum SocketResult { } SocketResult; typedef struct SocketPort { + Socket *socket; + SocketType type; int fd; SocketAddress address; char *path; - Watch fd_watch; + sd_event_source *event_source; LIST_FIELDS(struct SocketPort, port); } SocketPort; @@ -111,7 +113,7 @@ struct Socket { SocketState state, deserialized_state; - Watch timer_watch; + sd_event_source *timer_event_source; ExecCommand* control_command; SocketExecCommand control_command_id; @@ -144,7 +146,7 @@ struct Socket { size_t pipe_size; char *bind_to_device; char *tcp_congestion; - bool reuseport; + bool reuse_port; long mq_maxmsg; long mq_msgsize; |