diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-11-30 01:49:40 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-11-30 01:49:40 +0100 |
| commit | 32f464809e8e487739fde53a2feb0afba70c8db7 (patch) | |
| tree | ff5d6ccbd016c4f8860d8b7fead0f305abb07a47 /src | |
| parent | bus: synthesize local error reply when we cannot deliver a message to kdbus b... (diff) | |
| download | systemd-32f464809e8e487739fde53a2feb0afba70c8db7.tar.xz systemd-32f464809e8e487739fde53a2feb0afba70c8db7.zip | |
bus: whenever we notice the connection is terminated enter CLOSING state
Diffstat (limited to '')
| -rw-r--r-- | src/libsystemd-bus/sd-bus.c | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/src/libsystemd-bus/sd-bus.c b/src/libsystemd-bus/sd-bus.c index 05c5d8d1bc..8ffc9a9eff 100644 --- a/src/libsystemd-bus/sd-bus.c +++ b/src/libsystemd-bus/sd-bus.c @@ -1411,9 +1411,12 @@ _public_ int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) { size_t idx = 0; r = bus_write_message(bus, m, &idx); - if (r < 0) + if (r < 0) { + if (r == -EPIPE || r == -ENOTCONN || r == -ESHUTDOWN) + bus_enter_closing(bus); + return r; - else if (!bus->is_kernel && idx < BUS_MESSAGE_SIZE(m)) { + } else if (!bus->is_kernel && idx < BUS_MESSAGE_SIZE(m)) { /* Wasn't fully written. So let's remember how * much was written. Note that the first entry * of the wqueue array is always allocated so @@ -1687,8 +1690,12 @@ _public_ int sd_bus_call( } r = bus_read_message(bus); - if (r < 0) + if (r < 0) { + if (r == -EPIPE || r == -ENOTCONN || r == -ESHUTDOWN) + bus_enter_closing(bus); + return r; + } if (r > 0) continue; @@ -1708,8 +1715,12 @@ _public_ int sd_bus_call( return r; r = dispatch_wqueue(bus); - if (r < 0) + if (r < 0) { + if (r == -EPIPE || r == -ENOTCONN || r == -ESHUTDOWN) + bus_enter_closing(bus); + return r; + } } } @@ -2188,7 +2199,7 @@ _public_ int sd_bus_process(sd_bus *bus, sd_bus_message **ret) { case BUS_OPENING: r = bus_socket_process_opening(bus); - if (r == -ECONNRESET || r == -EPIPE) { + if (r == -ECONNRESET || r == -EPIPE || r == -ESHUTDOWN) { bus_enter_closing(bus); r = 1; } else if (r < 0) @@ -2199,7 +2210,7 @@ _public_ int sd_bus_process(sd_bus *bus, sd_bus_message **ret) { case BUS_AUTHENTICATING: r = bus_socket_process_authenticating(bus); - if (r == -ECONNRESET || r == -EPIPE) { + if (r == -ECONNRESET || r == -EPIPE || r == -ESHUTDOWN) { bus_enter_closing(bus); r = 1; } else if (r < 0) @@ -2213,7 +2224,7 @@ _public_ int sd_bus_process(sd_bus *bus, sd_bus_message **ret) { case BUS_RUNNING: case BUS_HELLO: r = process_running(bus, ret); - if (r == -ECONNRESET || r == -EPIPE) { + if (r == -ECONNRESET || r == -EPIPE || r == -ESHUTDOWN) { bus_enter_closing(bus); r = 1; @@ -2324,8 +2335,12 @@ _public_ int sd_bus_flush(sd_bus *bus) { for (;;) { r = dispatch_wqueue(bus); - if (r < 0) + if (r < 0) { + if (r == -EPIPE || r == -ENOTCONN || r == -ESHUTDOWN) + bus_enter_closing(bus); + return r; + } if (bus->wqueue_size <= 0) return 0; |