From f252ff1742947afaf035ae133876a4e767ddeb7c Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Fri, 29 Nov 2013 21:54:44 +0100 Subject: rename stdio-bridge to bus-proxyd --- .gitignore | 2 +- Makefile.am | 16 ++- src/bus-proxyd/Makefile | 1 + src/bus-proxyd/bus-proxyd.c | 310 ++++++++++++++++++++++++++++++++++++++++ src/stdio-bridge/Makefile | 1 - src/stdio-bridge/stdio-bridge.c | 310 ---------------------------------------- 6 files changed, 324 insertions(+), 316 deletions(-) create mode 120000 src/bus-proxyd/Makefile create mode 100644 src/bus-proxyd/bus-proxyd.c delete mode 120000 src/stdio-bridge/Makefile delete mode 100644 src/stdio-bridge/stdio-bridge.c diff --git a/.gitignore b/.gitignore index 84c83a556c..19bbceb434 100644 --- a/.gitignore +++ b/.gitignore @@ -76,7 +76,7 @@ /systemd-shutdown /systemd-shutdownd /systemd-sleep -/systemd-stdio-bridge +/systemd-bus-proxyd /systemd-sysctl /systemd-system-update-generator /systemd-timedated diff --git a/Makefile.am b/Makefile.am index 3598edd262..adf92c03d3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -302,7 +302,6 @@ rootbin_PROGRAMS = \ bin_PROGRAMS = \ systemd-cgls \ systemd-cgtop \ - systemd-stdio-bridge \ systemd-nspawn \ systemd-detect-virt \ systemd-delta \ @@ -329,6 +328,7 @@ rootlibexec_PROGRAMS = \ systemd-ac-power \ systemd-sysctl \ systemd-sleep \ + systemd-bus-proxyd \ systemd-socket-proxyd systemgenerator_PROGRAMS = \ @@ -1859,15 +1859,23 @@ systemd_run_LDADD = \ libsystemd-shared.la # ------------------------------------------------------------------------------ -systemd_stdio_bridge_SOURCES = \ - src/stdio-bridge/stdio-bridge.c +systemd_bus_proxyd_SOURCES = \ + src/bus-proxyd/bus-proxyd.c -systemd_stdio_bridge_LDADD = \ +systemd_bus_proxyd_LDADD = \ libsystemd-bus-internal.la \ libsystemd-daemon-internal.la \ libsystemd-id128-internal.la \ libsystemd-shared.la +bus-proxyd-install-hook: + $(AM_V_LN)$(LN_S) -f ../../lib/systemd/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge + +bus-proxyd-uninstall-hook: + rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge + +INSTALL_EXEC_HOOKS += bus-proxyd-install-hook +UNINSTALL_EXEC_HOOKS += bus-proxyd-uninstall-hook # ------------------------------------------------------------------------------ systemd_tty_ask_password_agent_SOURCES = \ src/tty-ask-password-agent/tty-ask-password-agent.c diff --git a/src/bus-proxyd/Makefile b/src/bus-proxyd/Makefile new file mode 120000 index 0000000000..d0b0e8e008 --- /dev/null +++ b/src/bus-proxyd/Makefile @@ -0,0 +1 @@ +../Makefile \ No newline at end of file diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c new file mode 100644 index 0000000000..9c49e0ee8d --- /dev/null +++ b/src/bus-proxyd/bus-proxyd.c @@ -0,0 +1,310 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +/*** + This file is part of systemd. + + Copyright 2010 Lennart Poettering + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see . +***/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "log.h" +#include "util.h" +#include "socket-util.h" +#include "sd-daemon.h" +#include "sd-bus.h" +#include "bus-internal.h" +#include "bus-message.h" +#include "bus-util.h" +#include "build.h" + +#define DEFAULT_BUS_PATH "unix:path=/run/dbus/system_bus_socket" + +const char *arg_bus_path = DEFAULT_BUS_PATH; + +static int help(void) { + + printf("%s [OPTIONS...]\n\n" + "STDIO or socket-activatable proxy to a given DBus endpoint.\n\n" + " -h --help Show this help\n" + " --version Show package version\n" + " --bus-path=PATH Path to the kernel bus (default: %s)\n", + program_invocation_short_name, DEFAULT_BUS_PATH); + + return 0; +} + +static int parse_argv(int argc, char *argv[]) { + + enum { + ARG_VERSION = 0x100, + }; + + static const struct option options[] = { + { "help", no_argument, NULL, 'h' }, + { "bus-path", required_argument, NULL, 'p' }, + { NULL, 0, NULL, 0 } + }; + + int c; + + assert(argc >= 0); + assert(argv); + + while ((c = getopt_long(argc, argv, "hsup:", options, NULL)) >= 0) { + + switch (c) { + + case 'h': + help(); + return 0; + + case ARG_VERSION: + puts(PACKAGE_STRING); + puts(SYSTEMD_FEATURES); + return 0; + + case '?': + return -EINVAL; + + case 'p': + arg_bus_path = optarg; + break; + + default: + log_error("Unknown option code %c", c); + return -EINVAL; + } + } + + return 1; +} + +int main(int argc, char *argv[]) { + _cleanup_bus_unref_ sd_bus *a = NULL, *b = NULL; + sd_id128_t server_id; + bool is_unix; + int r, in_fd, out_fd; + + log_set_target(LOG_TARGET_JOURNAL_OR_KMSG); + log_parse_environment(); + log_open(); + + r = parse_argv(argc, argv); + if (r <= 0) + goto finish; + + r = sd_listen_fds(0); + if (r == 0) { + in_fd = STDIN_FILENO; + out_fd = STDOUT_FILENO; + } else if (r == 1) { + in_fd = SD_LISTEN_FDS_START; + out_fd = SD_LISTEN_FDS_START; + } else { + log_error("Illegal number of file descriptors passed\n"); + goto finish; + } + + is_unix = + sd_is_socket(in_fd, AF_UNIX, 0, 0) > 0 && + sd_is_socket(out_fd, AF_UNIX, 0, 0) > 0; + + r = sd_bus_new(&a); + if (r < 0) { + log_error("Failed to allocate bus: %s", strerror(-r)); + goto finish; + } + + r = sd_bus_set_address(a, arg_bus_path); + if (r < 0) { + log_error("Failed to set address to connect to: %s", strerror(-r)); + goto finish; + } + + r = sd_bus_negotiate_fds(a, is_unix); + if (r < 0) { + log_error("Failed to set FD negotiation: %s", strerror(-r)); + goto finish; + } + + r = sd_bus_start(a); + if (r < 0) { + log_error("Failed to start bus client: %s", strerror(-r)); + goto finish; + } + + r = sd_bus_get_server_id(a, &server_id); + if (r < 0) { + log_error("Failed to get server ID: %s", strerror(-r)); + goto finish; + } + + r = sd_bus_new(&b); + if (r < 0) { + log_error("Failed to allocate bus: %s", strerror(-r)); + goto finish; + } + + r = sd_bus_set_fd(b, in_fd, out_fd); + if (r < 0) { + log_error("Failed to set fds: %s", strerror(-r)); + goto finish; + } + + r = sd_bus_set_server(b, 1, server_id); + if (r < 0) { + log_error("Failed to set server mode: %s", strerror(-r)); + goto finish; + } + + r = sd_bus_negotiate_fds(b, is_unix); + if (r < 0) { + log_error("Failed to set FD negotiation: %s", strerror(-r)); + goto finish; + } + + r = sd_bus_set_anonymous(b, true); + if (r < 0) { + log_error("Failed to set anonymous authentication: %s", strerror(-r)); + goto finish; + } + + r = sd_bus_start(b); + if (r < 0) { + log_error("Failed to start bus client: %s", strerror(-r)); + goto finish; + } + + for (;;) { + _cleanup_bus_message_unref_ sd_bus_message *m = NULL; + int events_a, events_b, fd; + uint64_t timeout_a, timeout_b, t; + struct timespec _ts, *ts; + + r = sd_bus_process(a, &m); + if (r < 0) { + log_error("Failed to process bus a: %s", strerror(-r)); + goto finish; + } + + if (m) { + r = sd_bus_send(b, m, NULL); + if (r < 0) { + log_error("Failed to send message: %s", strerror(-r)); + goto finish; + } + } + + if (r > 0) + continue; + + r = sd_bus_process(b, &m); + if (r < 0) { + /* treat 'connection reset by peer' as clean exit condition */ + if (r == -ECONNRESET) + r = 0; + + goto finish; + } + + if (m) { + r = sd_bus_send(a, m, NULL); + if (r < 0) { + log_error("Failed to send message: %s", strerror(-r)); + goto finish; + } + } + + if (r > 0) + continue; + + fd = sd_bus_get_fd(a); + if (fd < 0) { + log_error("Failed to get fd: %s", strerror(-r)); + goto finish; + } + + events_a = sd_bus_get_events(a); + if (events_a < 0) { + log_error("Failed to get events mask: %s", strerror(-r)); + goto finish; + } + + r = sd_bus_get_timeout(a, &timeout_a); + if (r < 0) { + log_error("Failed to get timeout: %s", strerror(-r)); + goto finish; + } + + events_b = sd_bus_get_events(b); + if (events_b < 0) { + log_error("Failed to get events mask: %s", strerror(-r)); + goto finish; + } + + r = sd_bus_get_timeout(b, &timeout_b); + if (r < 0) { + log_error("Failed to get timeout: %s", strerror(-r)); + goto finish; + } + + t = timeout_a; + if (t == (uint64_t) -1 || (timeout_b != (uint64_t) -1 && timeout_b < timeout_a)) + t = timeout_b; + + if (t == (uint64_t) -1) + ts = NULL; + else { + usec_t nw; + + nw = now(CLOCK_MONOTONIC); + if (t > nw) + t -= nw; + else + t = 0; + + ts = timespec_store(&_ts, t); + } + + { + struct pollfd p[3] = { + {.fd = fd, .events = events_a, }, + {.fd = STDIN_FILENO, .events = events_b & POLLIN, }, + {.fd = STDOUT_FILENO, .events = events_b & POLLOUT, }}; + + r = ppoll(p, ELEMENTSOF(p), ts, NULL); + } + if (r < 0) { + log_error("ppoll() failed: %m"); + goto finish; + } + } + + r = 0; + +finish: + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; +} diff --git a/src/stdio-bridge/Makefile b/src/stdio-bridge/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/stdio-bridge/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile \ No newline at end of file diff --git a/src/stdio-bridge/stdio-bridge.c b/src/stdio-bridge/stdio-bridge.c deleted file mode 100644 index 9c49e0ee8d..0000000000 --- a/src/stdio-bridge/stdio-bridge.c +++ /dev/null @@ -1,310 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -/*** - This file is part of systemd. - - Copyright 2010 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "log.h" -#include "util.h" -#include "socket-util.h" -#include "sd-daemon.h" -#include "sd-bus.h" -#include "bus-internal.h" -#include "bus-message.h" -#include "bus-util.h" -#include "build.h" - -#define DEFAULT_BUS_PATH "unix:path=/run/dbus/system_bus_socket" - -const char *arg_bus_path = DEFAULT_BUS_PATH; - -static int help(void) { - - printf("%s [OPTIONS...]\n\n" - "STDIO or socket-activatable proxy to a given DBus endpoint.\n\n" - " -h --help Show this help\n" - " --version Show package version\n" - " --bus-path=PATH Path to the kernel bus (default: %s)\n", - program_invocation_short_name, DEFAULT_BUS_PATH); - - return 0; -} - -static int parse_argv(int argc, char *argv[]) { - - enum { - ARG_VERSION = 0x100, - }; - - static const struct option options[] = { - { "help", no_argument, NULL, 'h' }, - { "bus-path", required_argument, NULL, 'p' }, - { NULL, 0, NULL, 0 } - }; - - int c; - - assert(argc >= 0); - assert(argv); - - while ((c = getopt_long(argc, argv, "hsup:", options, NULL)) >= 0) { - - switch (c) { - - case 'h': - help(); - return 0; - - case ARG_VERSION: - puts(PACKAGE_STRING); - puts(SYSTEMD_FEATURES); - return 0; - - case '?': - return -EINVAL; - - case 'p': - arg_bus_path = optarg; - break; - - default: - log_error("Unknown option code %c", c); - return -EINVAL; - } - } - - return 1; -} - -int main(int argc, char *argv[]) { - _cleanup_bus_unref_ sd_bus *a = NULL, *b = NULL; - sd_id128_t server_id; - bool is_unix; - int r, in_fd, out_fd; - - log_set_target(LOG_TARGET_JOURNAL_OR_KMSG); - log_parse_environment(); - log_open(); - - r = parse_argv(argc, argv); - if (r <= 0) - goto finish; - - r = sd_listen_fds(0); - if (r == 0) { - in_fd = STDIN_FILENO; - out_fd = STDOUT_FILENO; - } else if (r == 1) { - in_fd = SD_LISTEN_FDS_START; - out_fd = SD_LISTEN_FDS_START; - } else { - log_error("Illegal number of file descriptors passed\n"); - goto finish; - } - - is_unix = - sd_is_socket(in_fd, AF_UNIX, 0, 0) > 0 && - sd_is_socket(out_fd, AF_UNIX, 0, 0) > 0; - - r = sd_bus_new(&a); - if (r < 0) { - log_error("Failed to allocate bus: %s", strerror(-r)); - goto finish; - } - - r = sd_bus_set_address(a, arg_bus_path); - if (r < 0) { - log_error("Failed to set address to connect to: %s", strerror(-r)); - goto finish; - } - - r = sd_bus_negotiate_fds(a, is_unix); - if (r < 0) { - log_error("Failed to set FD negotiation: %s", strerror(-r)); - goto finish; - } - - r = sd_bus_start(a); - if (r < 0) { - log_error("Failed to start bus client: %s", strerror(-r)); - goto finish; - } - - r = sd_bus_get_server_id(a, &server_id); - if (r < 0) { - log_error("Failed to get server ID: %s", strerror(-r)); - goto finish; - } - - r = sd_bus_new(&b); - if (r < 0) { - log_error("Failed to allocate bus: %s", strerror(-r)); - goto finish; - } - - r = sd_bus_set_fd(b, in_fd, out_fd); - if (r < 0) { - log_error("Failed to set fds: %s", strerror(-r)); - goto finish; - } - - r = sd_bus_set_server(b, 1, server_id); - if (r < 0) { - log_error("Failed to set server mode: %s", strerror(-r)); - goto finish; - } - - r = sd_bus_negotiate_fds(b, is_unix); - if (r < 0) { - log_error("Failed to set FD negotiation: %s", strerror(-r)); - goto finish; - } - - r = sd_bus_set_anonymous(b, true); - if (r < 0) { - log_error("Failed to set anonymous authentication: %s", strerror(-r)); - goto finish; - } - - r = sd_bus_start(b); - if (r < 0) { - log_error("Failed to start bus client: %s", strerror(-r)); - goto finish; - } - - for (;;) { - _cleanup_bus_message_unref_ sd_bus_message *m = NULL; - int events_a, events_b, fd; - uint64_t timeout_a, timeout_b, t; - struct timespec _ts, *ts; - - r = sd_bus_process(a, &m); - if (r < 0) { - log_error("Failed to process bus a: %s", strerror(-r)); - goto finish; - } - - if (m) { - r = sd_bus_send(b, m, NULL); - if (r < 0) { - log_error("Failed to send message: %s", strerror(-r)); - goto finish; - } - } - - if (r > 0) - continue; - - r = sd_bus_process(b, &m); - if (r < 0) { - /* treat 'connection reset by peer' as clean exit condition */ - if (r == -ECONNRESET) - r = 0; - - goto finish; - } - - if (m) { - r = sd_bus_send(a, m, NULL); - if (r < 0) { - log_error("Failed to send message: %s", strerror(-r)); - goto finish; - } - } - - if (r > 0) - continue; - - fd = sd_bus_get_fd(a); - if (fd < 0) { - log_error("Failed to get fd: %s", strerror(-r)); - goto finish; - } - - events_a = sd_bus_get_events(a); - if (events_a < 0) { - log_error("Failed to get events mask: %s", strerror(-r)); - goto finish; - } - - r = sd_bus_get_timeout(a, &timeout_a); - if (r < 0) { - log_error("Failed to get timeout: %s", strerror(-r)); - goto finish; - } - - events_b = sd_bus_get_events(b); - if (events_b < 0) { - log_error("Failed to get events mask: %s", strerror(-r)); - goto finish; - } - - r = sd_bus_get_timeout(b, &timeout_b); - if (r < 0) { - log_error("Failed to get timeout: %s", strerror(-r)); - goto finish; - } - - t = timeout_a; - if (t == (uint64_t) -1 || (timeout_b != (uint64_t) -1 && timeout_b < timeout_a)) - t = timeout_b; - - if (t == (uint64_t) -1) - ts = NULL; - else { - usec_t nw; - - nw = now(CLOCK_MONOTONIC); - if (t > nw) - t -= nw; - else - t = 0; - - ts = timespec_store(&_ts, t); - } - - { - struct pollfd p[3] = { - {.fd = fd, .events = events_a, }, - {.fd = STDIN_FILENO, .events = events_b & POLLIN, }, - {.fd = STDOUT_FILENO, .events = events_b & POLLOUT, }}; - - r = ppoll(p, ELEMENTSOF(p), ts, NULL); - } - if (r < 0) { - log_error("ppoll() failed: %m"); - goto finish; - } - } - - r = 0; - -finish: - return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; -} -- cgit v1.2.3-54-g00ecf