shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-06-06 23:17:07 +03:00
Code

bus: properly react to Disconnected messages in bus-proxyd

Browse Source
This commit is contained in:
Lennart Poettering 2013-12-21 04:03:12 +01:00
parent ba7689164c
commit 0358b3f95d
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/bus-proxyd/bus-proxyd.c
View File

@ -209,11 +209,22 @@ int main(int argc, char *argv[]) {
r = sd_bus_process(a, &m); r = sd_bus_process(a, &m);
if (r < 0) { if (r < 0) {
/* treat 'connection reset by peer' as clean exit condition */
if (r == -ECONNRESET)
r = 0;
else
log_error("Failed to process bus a: %s", strerror(-r)); log_error("Failed to process bus a: %s", strerror(-r));
goto finish; goto finish;
} }
if (m) { if (m) {
/* We officially got EOF, let's quit */
if (sd_bus_message_is_signal(m, "org.freedesktop.DBus.Local", "Disconnected")) {
r = 0;
goto finish;
}
r = sd_bus_send(b, m, NULL); r = sd_bus_send(b, m, NULL);
if (r < 0) { if (r < 0) {
log_error("Failed to send message: %s", strerror(-r)); log_error("Failed to send message: %s", strerror(-r));
@ -229,11 +240,19 @@ int main(int argc, char *argv[]) {
/* treat 'connection reset by peer' as clean exit condition */ /* treat 'connection reset by peer' as clean exit condition */
if (r == -ECONNRESET) if (r == -ECONNRESET)
r = 0; r = 0;
else
log_error("Failed to process bus b: %s", strerror(-r));
goto finish; goto finish;
} }
if (m) { if (m) {
/* We officially got EOF, let's quit */
if (sd_bus_message_is_signal(m, "org.freedesktop.DBus.Local", "Disconnected")) {
r = 0;
goto finish;
}
r = sd_bus_send(a, m, NULL); r = sd_bus_send(a, m, NULL);
if (r < 0) { if (r < 0) {
log_error("Failed to send message: %s", strerror(-r)); log_error("Failed to send message: %s", strerror(-r));
@ -309,5 +328,8 @@ int main(int argc, char *argv[]) {
r = 0; r = 0;
finish: finish:
sd_bus_flush(a);
sd_bus_flush(b);
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
} }