Browse Source

bus: add .busname unit type to implement kdbus-style bus activation

keep-around/ba91431154ad7bac82ddf0a540ec1b40db62d782
Lennart Poettering 9 years ago
parent
commit
e821075a23
  1. 36
      Makefile.am
  2. 2
      TODO
  3. 600
      src/core/busname.c
  4. 65
      src/core/busname.h
  5. 40
      src/core/dbus-busname.c
  6. 28
      src/core/dbus-busname.h
  7. 3
      src/core/load-fragment-gperf.gperf.m4
  8. 45
      src/core/load-fragment.c
  9. 1
      src/core/load-fragment.h
  10. 36
      src/core/mount.c
  11. 399
      src/core/socket.c
  12. 5
      src/core/unit.c
  13. 12
      src/core/unit.h
  14. 50
      src/libsystemd-bus/bus-kernel.c
  15. 1
      src/libsystemd-bus/bus-kernel.h
  16. 1
      src/shared/special.h
  17. 12
      src/shared/unit-name.c
  18. 5
      src/shared/unit-name.h

36
Makefile.am

@ -880,20 +880,22 @@ libsystemd_core_la_SOURCES = \
src/core/load-fragment.h \
src/core/service.c \
src/core/service.h \
src/core/automount.c \
src/core/automount.h \
src/core/mount.c \
src/core/mount.h \
src/core/swap.c \
src/core/swap.h \
src/core/device.c \
src/core/device.h \
src/core/socket.c \
src/core/socket.h \
src/core/busname.c \
src/core/busname.h \
src/core/target.c \
src/core/target.h \
src/core/snapshot.c \
src/core/snapshot.h \
src/core/socket.c \
src/core/socket.h \
src/core/device.c \
src/core/device.h \
src/core/mount.c \
src/core/mount.h \
src/core/automount.c \
src/core/automount.h \
src/core/swap.c \
src/core/swap.h \
src/core/timer.c \
src/core/timer.h \
src/core/path.c \
@ -920,20 +922,22 @@ libsystemd_core_la_SOURCES = \
src/core/dbus-service.h \
src/core/dbus-socket.c \
src/core/dbus-socket.h \
src/core/dbus-timer.c \
src/core/dbus-timer.h \
src/core/dbus-busname.c \
src/core/dbus-busname.h \
src/core/dbus-target.c \
src/core/dbus-target.h \
src/core/dbus-snapshot.c \
src/core/dbus-snapshot.h \
src/core/dbus-device.c \
src/core/dbus-device.h \
src/core/dbus-mount.c \
src/core/dbus-mount.h \
src/core/dbus-automount.c \
src/core/dbus-automount.h \
src/core/dbus-swap.c \
src/core/dbus-swap.h \
src/core/dbus-snapshot.c \
src/core/dbus-snapshot.h \
src/core/dbus-device.c \
src/core/dbus-device.h \
src/core/dbus-timer.c \
src/core/dbus-timer.h \
src/core/dbus-path.c \
src/core/dbus-path.h \
src/core/dbus-slice.c \

2
TODO

@ -116,10 +116,8 @@ Features:
* libsystemd-bus:
- default policy (allow uid == 0 and our own uid)
- access policy as vtable flag
- enforce alignment of pointers passed in
- when kdbus doesn't take our message without memfds, try again with memfds
- implement translator service
- implement busname unit type in systemd
- move to gvariant
- implement monitor logic
- properly map matches with well-known names against messages with unique names

600
src/core/busname.c

@ -0,0 +1,600 @@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/***
This file is part of systemd.
Copyright 2013 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 <http://www.gnu.org/licenses/>.
***/
#include "special.h"
#include "bus-kernel.h"
#include "bus-internal.h"
#include "bus-util.h"
#include "service.h"
#include "dbus-busname.h"
#include "busname.h"
static const UnitActiveState state_translation_table[_BUSNAME_STATE_MAX] = {
[BUSNAME_DEAD] = UNIT_INACTIVE,
[BUSNAME_LISTENING] = UNIT_ACTIVE,
[BUSNAME_RUNNING] = UNIT_ACTIVE,
[BUSNAME_FAILED] = UNIT_FAILED
};
static int busname_dispatch_io(sd_event_source *source, int fd, uint32_t revents, void *userdata);
static void busname_init(Unit *u) {
BusName *n = BUSNAME(u);
assert(u);
assert(u->load_state == UNIT_STUB);
n->starter_fd = -1;
}
static void busname_done(Unit *u) {
BusName *n = BUSNAME(u);
assert(u);
free(n->name);
n->name = NULL;
unit_ref_unset(&n->service);
n->event_source = sd_event_source_unref(n->event_source);
if (n->starter_fd >= 0) {
close_nointr_nofail(n->starter_fd);
n->starter_fd = -1;
}
}
static int busname_add_default_default_dependencies(BusName *n) {
int r;
assert(n);
r = unit_add_dependency_by_name(UNIT(n), UNIT_BEFORE, SPECIAL_BUSNAMES_TARGET, NULL, true);
if (r < 0)
return r;
if (UNIT(n)->manager->running_as == SYSTEMD_SYSTEM) {
r = unit_add_two_dependencies_by_name(UNIT(n), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SYSINIT_TARGET, NULL, true);
if (r < 0)
return r;
}
return unit_add_two_dependencies_by_name(UNIT(n), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true);
}
static int busname_add_extras(BusName *n) {
Unit *u = UNIT(n);
int r;
assert(n);
if (!n->name) {
n->name = unit_name_to_prefix(u->id);
if (!n->name)
return -ENOMEM;
}
if (!u->description) {
r = unit_set_description(u, n->name);
if (r < 0)
return r;
}
if (!UNIT_DEREF(n->service)) {
Unit *x;
r = unit_load_related_unit(u, ".service", &x);
if (r < 0)
return r;
unit_ref_set(&n->service, x);
}
r = unit_add_two_dependencies(u, UNIT_BEFORE, UNIT_TRIGGERS, UNIT_DEREF(n->service), true);
if (r < 0)
return r;
if (u->default_dependencies) {
r = busname_add_default_default_dependencies(n);
if (r < 0)
return r;
}
return 0;
}
static int busname_verify(BusName *n) {
char *e;
assert(n);
if (UNIT(n)->load_state != UNIT_LOADED)
return 0;
if (!service_name_is_valid(n->name)) {
log_error_unit(UNIT(n)->id, "%s's Name= setting is not a valid service name Refusing.", UNIT(n)->id);
return -EINVAL;
}
e = strappenda(n->name, ".busname");
if (!unit_has_name(UNIT(n), e)) {
log_error_unit(UNIT(n)->id, "%s's Name= setting doesn't match unit name. Refusing.", UNIT(n)->id);
return -EINVAL;
}
return 0;
}
static int busname_load(Unit *u) {
BusName *n = BUSNAME(u);
int r;
assert(u);
assert(u->load_state == UNIT_STUB);
r = unit_load_fragment_and_dropin(u);
if (r < 0)
return r;
if (u->load_state == UNIT_LOADED) {
/* This is a new unit? Then let's add in some extras */
r = busname_add_extras(n);
if (r < 0)
return r;
}
return busname_verify(n);
}
static void busname_dump(Unit *u, FILE *f, const char *prefix) {
BusName *n = BUSNAME(u);
assert(n);
assert(f);
fprintf(f,
"%sBus Name State: %s\n"
"%sResult: %s\n"
"%sName: %s\n",
prefix, busname_state_to_string(n->state),
prefix, busname_result_to_string(n->result),
prefix, n->name);
}
static void busname_unwatch_fd(BusName *n) {
int r;
assert(n);
if (n->event_source) {
r = sd_event_source_set_enabled(n->event_source, SD_EVENT_OFF);
if (r < 0)
log_debug_unit(UNIT(n)->id, "Failed to disable event source.");
}
}
static void busname_close_fd(BusName *n) {
assert(n);
if (n->starter_fd <= 0)
return;
close_nointr_nofail(n->starter_fd);
n->starter_fd = -1;
}
static int busname_watch_fd(BusName *n) {
int r;
assert(n);
if (n->starter_fd < 0)
return 0;
if (n->event_source)
r = sd_event_source_set_enabled(n->event_source, SD_EVENT_ON);
else
r = sd_event_add_io(UNIT(n)->manager->event, n->starter_fd, EPOLLIN, busname_dispatch_io, n, &n->event_source);
if (r < 0) {
log_warning_unit(UNIT(n)->id, "Failed to watch starter fd: %s", strerror(-r));
busname_unwatch_fd(n);
return r;
}
return 0;
}
static int busname_open_fd(BusName *n) {
assert(n);
if (n->starter_fd >= 0)
return 0;
n->starter_fd = bus_kernel_create_starter(UNIT(n)->manager->running_as == SYSTEMD_SYSTEM ? "system" : "user", n->name);
if (n->starter_fd < 0) {
log_warning_unit(UNIT(n)->id, "Failed to create starter fd: %s", strerror(-n->starter_fd));
return n->starter_fd;
}
return 0;
}
static void busname_set_state(BusName *n, BusNameState state) {
BusNameState old_state;
assert(n);
old_state = n->state;
n->state = state;
if (state != BUSNAME_LISTENING)
busname_unwatch_fd(n);
if (!IN_SET(state, BUSNAME_LISTENING, BUSNAME_RUNNING))
busname_close_fd(n);
if (state != old_state)
log_debug_unit(UNIT(n)->id, "%s changed %s -> %s",
UNIT(n)->id, busname_state_to_string(old_state), busname_state_to_string(state));
unit_notify(UNIT(n), state_translation_table[old_state], state_translation_table[state], true);
}
static int busname_coldplug(Unit *u) {
BusName *n = BUSNAME(u);
int r;
assert(n);
assert(n->state == BUSNAME_DEAD);
if (n->deserialized_state == n->state)
return 0;
if (IN_SET(n->deserialized_state, BUSNAME_LISTENING, BUSNAME_RUNNING)) {
r = busname_open_fd(n);
if (r < 0)
return r;
}
if (n->deserialized_state == BUSNAME_LISTENING) {
r = busname_watch_fd(n);
if (r < 0)
return r;
}
busname_set_state(n, n->deserialized_state);
return 0;
}
static void busname_enter_dead(BusName *n, BusNameResult f) {
assert(n);
if (f != BUSNAME_SUCCESS)
n->result = f;
busname_set_state(n, n->result != BUSNAME_SUCCESS ? BUSNAME_FAILED : BUSNAME_DEAD);
}
static void busname_enter_listening(BusName *n) {
int r;
assert(n);
r = busname_open_fd(n);
if (r < 0) {
log_warning_unit(UNIT(n)->id, "%s failed to listen on bus names: %s", UNIT(n)->id, strerror(-r));
goto fail;
}
r = busname_watch_fd(n);
if (r < 0) {
log_warning_unit(UNIT(n)->id, "%s failed to watch names: %s", UNIT(n)->id, strerror(-r));
goto fail;
}
busname_set_state(n, BUSNAME_LISTENING);
return;
fail:
busname_enter_dead(n, BUSNAME_FAILURE_RESOURCES);
}
static void busname_enter_running(BusName *n) {
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
bool pending = false;
Unit *other;
Iterator i;
int r;
assert(n);
/* We don't take conenctions anymore if we are supposed to
* shut down anyway */
if (unit_stop_pending(UNIT(n))) {
log_debug_unit(UNIT(n)->id, "Suppressing activation request on %s since unit stop is scheduled.", UNIT(n)->id);
return;
}
/* If there's already a start pending don't bother to do
* anything */
SET_FOREACH(other, UNIT(n)->dependencies[UNIT_TRIGGERS], i)
if (unit_active_or_pending(other)) {
pending = true;
break;
}
if (!pending) {
r = manager_add_job(UNIT(n)->manager, JOB_START, UNIT_DEREF(n->service), JOB_REPLACE, true, &error, NULL);
if (r < 0)
goto fail;
}
busname_set_state(n, BUSNAME_RUNNING);
return;
fail:
log_warning_unit(UNIT(n)->id, "%s failed to queue service startup job: %s", UNIT(n)->id, bus_error_message(&error, r));
busname_enter_dead(n, BUSNAME_FAILURE_RESOURCES);
}
static int busname_start(Unit *u) {
BusName *n = BUSNAME(u);
assert(n);
if (UNIT_ISSET(n->service)) {
Service *service;
service = SERVICE(UNIT_DEREF(n->service));
if (UNIT(service)->load_state != UNIT_LOADED) {
log_error_unit(u->id, "Bus service %s not loaded, refusing.", UNIT(service)->id);
return -ENOENT;
}
}
assert(IN_SET(n->state, BUSNAME_DEAD, BUSNAME_FAILED));
n->result = BUSNAME_SUCCESS;
busname_enter_listening(n);
return 0;
}
static int busname_stop(Unit *u) {
BusName *n = BUSNAME(u);
assert(n);
assert(n->state == BUSNAME_LISTENING || n->state == BUSNAME_RUNNING);
busname_enter_dead(n, BUSNAME_SUCCESS);
return 0;
}
static int busname_serialize(Unit *u, FILE *f, FDSet *fds) {
BusName *n = BUSNAME(u);
assert(n);
assert(f);
assert(fds);
unit_serialize_item(u, f, "state", busname_state_to_string(n->state));
unit_serialize_item(u, f, "result", busname_result_to_string(n->result));
if (n->starter_fd >= 0) {
int copy;
copy = fdset_put_dup(fds, n->starter_fd);
if (copy < 0)
return copy;
unit_serialize_item_format(u, f, "starter-fd", "%i", copy);
}
return 0;
}
static int busname_deserialize_item(Unit *u, const char *key, const char *value, FDSet *fds) {
BusName *n = BUSNAME(u);
assert(n);
assert(key);
assert(value);
if (streq(key, "state")) {
BusNameState state;
state = busname_state_from_string(value);
if (state < 0)
log_debug_unit(u->id, "Failed to parse state value %s", value);
else
n->deserialized_state = state;
} else if (streq(key, "result")) {
BusNameResult f;
f = busname_result_from_string(value);
if (f < 0)
log_debug_unit(u->id, "Failed to parse result value %s", value);
else if (f != BUSNAME_SUCCESS)
n->result = f;
} else if (streq(key, "starter-fd")) {
int fd;
if (safe_atoi(value, &fd) < 0 || fd < 0 || !fdset_contains(fds, fd))
log_debug_unit(u->id, "Failed to parse starter fd value %s", value);
else {
if (n->starter_fd >= 0)
close_nointr_nofail(n->starter_fd);
n->starter_fd = fdset_remove(fds, fd);
}
} else
log_debug_unit(u->id, "Unknown serialization key '%s'", key);
return 0;
}
_pure_ static UnitActiveState busname_active_state(Unit *u) {
assert(u);
return state_translation_table[BUSNAME(u)->state];
}
_pure_ static const char *busname_sub_state_to_string(Unit *u) {
assert(u);
return busname_state_to_string(BUSNAME(u)->state);
}
static int busname_dispatch_io(sd_event_source *source, int fd, uint32_t revents, void *userdata) {
BusName *n = userdata;
assert(n);
assert(fd >= 0);
if (n->state != BUSNAME_LISTENING)
return 0;
log_debug_unit(UNIT(n)->id, "Activation request on %s", UNIT(n)->id);
if (revents != EPOLLIN) {
log_error_unit(UNIT(n)->id, "%s: Got unexpected poll event (0x%x) on starter fd.",
UNIT(n)->id, revents);
goto fail;
}
busname_enter_running(n);
return 0;
fail:
busname_enter_dead(n, BUSNAME_FAILURE_RESOURCES);
return 0;
}
static void busname_reset_failed(Unit *u) {
BusName *n = BUSNAME(u);
assert(n);
if (n->state == BUSNAME_FAILED)
busname_set_state(n, BUSNAME_DEAD);
n->result = BUSNAME_SUCCESS;
}
static void busname_trigger_notify(Unit *u, Unit *other) {
BusName *n = BUSNAME(u);
Service *s;
assert(n);
assert(other);
if (!IN_SET(n->state, BUSNAME_RUNNING, BUSNAME_LISTENING))
return;
if (other->load_state != UNIT_LOADED || other->type != UNIT_SERVICE)
return;
s = SERVICE(other);
if (s->state == SERVICE_FAILED) {
if (s->result == SERVICE_FAILURE_START_LIMIT)
busname_enter_dead(n, BUSNAME_FAILURE_SERVICE_FAILED_PERMANENT);
else
busname_enter_listening(n);
}
if (IN_SET(n->state,
SERVICE_DEAD,
SERVICE_STOP, SERVICE_STOP_SIGTERM, SERVICE_STOP_SIGKILL,
SERVICE_STOP_POST, SERVICE_FINAL_SIGTERM, SERVICE_FINAL_SIGKILL,
SERVICE_AUTO_RESTART))
busname_enter_listening(n);
}
static const char* const busname_state_table[_BUSNAME_STATE_MAX] = {
[BUSNAME_DEAD] = "dead",
[BUSNAME_LISTENING] = "listening",
[BUSNAME_RUNNING] = "running",
[BUSNAME_FAILED] = "failed"
};
DEFINE_STRING_TABLE_LOOKUP(busname_state, BusNameState);
static const char* const busname_result_table[_BUSNAME_RESULT_MAX] = {
[BUSNAME_SUCCESS] = "success",
[BUSNAME_FAILURE_RESOURCES] = "resources",
};
DEFINE_STRING_TABLE_LOOKUP(busname_result, BusNameResult);
const UnitVTable busname_vtable = {
.object_size = sizeof(BusName),
.sections =
"Unit\0"
"BusName\0"
"Install\0",
.private_section = "BusName",
.init = busname_init,
.done = busname_done,
.load = busname_load,
.coldplug = busname_coldplug,
.dump = busname_dump,
.start = busname_start,
.stop = busname_stop,
.serialize = busname_serialize,
.deserialize_item = busname_deserialize_item,
.active_state = busname_active_state,
.sub_state_to_string = busname_sub_state_to_string,
.trigger_notify = busname_trigger_notify,
.reset_failed = busname_reset_failed,
.bus_interface = "org.freedesktop.systemd1.BusName",
.bus_vtable = bus_busname_vtable,
.bus_changing_properties = bus_busname_changing_properties,
.status_message_formats = {
.finished_start_job = {
[JOB_DONE] = "Listening on %s.",
[JOB_FAILED] = "Failed to listen on %s.",
[JOB_DEPENDENCY] = "Dependency failed for %s.",
[JOB_TIMEOUT] = "Timed out starting %s.",
},
.finished_stop_job = {
[JOB_DONE] = "Closed %s.",
[JOB_FAILED] = "Failed stopping %s.",
[JOB_TIMEOUT] = "Timed out stopping %s.",
},
},
};

65
src/core/busname.h

@ -0,0 +1,65 @@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
#pragma once
/***
This file is part of systemd.
Copyright 2013 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 <http://www.gnu.org/licenses/>.
***/
typedef struct BusName BusName;
#include "unit.h"
typedef enum BusNameState {
BUSNAME_DEAD,
BUSNAME_LISTENING,
BUSNAME_RUNNING,
BUSNAME_FAILED,
_BUSNAME_STATE_MAX,
_BUSNAME_STATE_INVALID = -1
} BusNameState;
typedef enum BusNameResult {
BUSNAME_SUCCESS,
BUSNAME_FAILURE_RESOURCES,
BUSNAME_FAILURE_SERVICE_FAILED_PERMANENT,
_BUSNAME_RESULT_MAX,
_BUSNAME_RESULT_INVALID = -1
} BusNameResult;
struct BusName {
Unit meta;
char *name;
int starter_fd;
UnitRef service;
BusNameState state, deserialized_state;
BusNameResult result;
sd_event_source *event_source;
};
extern const UnitVTable busname_vtable;
const char* busname_state_to_string(BusNameState i) _const_;
BusNameState busname_state_from_string(const char *s) _pure_;
const char* busname_result_to_string(BusNameResult i) _const_;
BusNameResult busname_result_from_string(const char *s) _pure_;

40
src/core/dbus-busname.c

@ -0,0 +1,40 @@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/***
This file is part of systemd.
Copyright 2013 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 <http://www.gnu.org/licenses/>.
***/
#include "unit.h"
#include "busname.h"
#include "dbus-unit.h"
#include "dbus-busname.h"
#include "bus-util.h"
static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, busname_result, BusNameResult);
const sd_bus_vtable bus_busname_vtable[] = {
SD_BUS_VTABLE_START(0),
SD_BUS_PROPERTY("Name", "s", NULL, offsetof(BusName, name), 0),
SD_BUS_PROPERTY("Result", "s", property_get_result, offsetof(BusName, result), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
SD_BUS_VTABLE_END
};
const char* const bus_busname_changing_properties[] = {
"Result",
NULL
};

28
src/core/dbus-busname.h

@ -0,0 +1,28 @@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
#pragma once
/***
This file is part of systemd.
Copyright 2013 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 <http://www.gnu.org/licenses/>.
***/
#include "sd-bus.h"
#include "unit.h"
extern const sd_bus_vtable bus_busname_vtable[];
extern const char* const bus_busname_changing_properties[];

3
src/core/load-fragment-gperf.gperf.m4

@ -223,6 +223,9 @@ EXEC_CONTEXT_CONFIG_ITEMS(Socket)m4_dnl
CGROUP_CONTEXT_CONFIG_ITEMS(Socket)m4_dnl
KILL_CONTEXT_CONFIG_ITEMS(Socket)m4_dnl
m4_dnl
BusName.Name, config_parse_string, 0, offsetof(BusName, name)
BusName.Service, config_parse_busname_service, 0, 0
m4_dnl
Mount.What, config_parse_string, 0, offsetof(Mount, parameters_fragment.what)
Mount.Where, config_parse_path, 0, offsetof(Mount, where)
Mount.Options, config_parse_string, 0, offsetof(Mount, parameters_fragment.options)

45
src/core/load-fragment.c

@ -1457,6 +1457,51 @@ int config_parse_service_timeout(const char *unit,
return 0;
}
int config_parse_busname_service(
const char *unit,
const char *filename,
unsigned line,
const char *section,
unsigned section_line,
const char *lvalue,
int ltype,
const char *rvalue,
void *data,
void *userdata) {
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
BusName *n = data;
int r;
Unit *x;
_cleanup_free_ char *p = NULL;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = unit_name_printf(UNIT(n), rvalue, &p);
if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, -r, "Failed to resolve specifiers, ignoring: %s", rvalue);
return 0;
}
if (!endswith(p, ".service")) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL, "Unit must be of type service, ignoring: %s", rvalue);
return 0;
}
r = manager_load_unit(UNIT(n)->manager, p, NULL, &error, &x);
if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, r, "Failed to load unit %s, ignoring: %s", rvalue, bus_error_message(&error, r));
return 0;
}
unit_ref_set(&n->service, x);
return 0;
}
int config_parse_unit_env_file(const char *unit,
const char *filename,
unsigned line,

1
src/core/load-fragment.h

@ -63,6 +63,7 @@ int config_parse_trigger_unit(const char *unit, const char *filename, unsigned l
int config_parse_path_spec(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
int config_parse_socket_service(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
int config_parse_service_sockets(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
int config_parse_busname_service(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
int config_parse_unit_env_file(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
int config_parse_ip_tos(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
int config_parse_unit_condition_path(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);

36
src/core/mount.c

@ -138,6 +138,8 @@ static void mount_init(Unit *u) {
m->directory_mode = 0755;
exec_context_init(&m->exec_context);
kill_context_init(&m->kill_context);
cgroup_context_init(&m->cgroup_context);
if (unit_has_name(u, "-.mount")) {
/* Don't allow start/stop for root directory */
@ -150,9 +152,6 @@ static void mount_init(Unit *u) {
m->exec_context.std_error = u->manager->default_std_error;
}
kill_context_init(&m->kill_context);
cgroup_context_init(&m->cgroup_context);
/* We need to make sure that /bin/mount is always called in
* the same process group as us, so that the autofs kernel
* side doesn't send us another mount request while we are
@ -503,29 +502,22 @@ static int mount_verify(Mount *m) {
b = unit_has_name(UNIT(m), e);
if (!b) {
log_error_unit(UNIT(m)->id,
"%s's Where setting doesn't match unit name. Refusing.",
UNIT(m)->id);
log_error_unit(UNIT(m)->id, "%s's Where= setting doesn't match unit name. Refusing.", UNIT(m)->id);
return -EINVAL;
}
if (mount_point_is_api(m->where) || mount_point_ignore(m->where)) {
log_error_unit(UNIT(m)->id,
"Cannot create mount unit for API file system %s. Refusing.",
m->where);
log_error_unit(UNIT(m)->id, "Cannot create mount unit for API file system %s. Refusing.", m->where);
return -EINVAL;
}
if (UNIT(m)->fragment_path && !m->parameters_fragment.what) {
log_error_unit(UNIT(m)->id,
"%s's What setting is missing. Refusing.", UNIT(m)->id);
log_error_unit(UNIT(m)->id, "%s's What setting is missing. Refusing.", UNIT(m)->id);
return -EBADMSG;
}
if (m->exec_context.pam_name && m->kill_context.kill_mode != KILL_CONTROL_GROUP) {
log_error_unit(UNIT(m)->id,
"%s has PAM enabled. Kill mode must be set to control-group'. Refusing.",
UNIT(m)->id);
log_error_unit(UNIT(m)->id, "%s has PAM enabled. Kill mode must be set to control-group'. Refusing.",UNIT(m)->id);
return -EINVAL;
}
@ -536,7 +528,9 @@ static int mount_add_extras(Mount *m) {
Unit *u = UNIT(m);
int r;
if (UNIT(m)->fragment_path)
assert(m);
if (u->fragment_path)
m->from_fragment = true;
if (!m->where) {
@ -551,7 +545,7 @@ static int mount_add_extras(Mount *m) {
if (r < 0)
return r;
if (!UNIT(m)->description) {
if (!u->description) {
r = unit_set_description(u, m->where);
if (r < 0)
return r;
@ -569,7 +563,7 @@ static int mount_add_extras(Mount *m) {
if (r < 0)
return r;
if (UNIT(m)->default_dependencies) {
if (u->default_dependencies) {
r = mount_add_default_dependencies(m);
if (r < 0)
return r;
@ -583,6 +577,10 @@ static int mount_add_extras(Mount *m) {
if (r < 0)
return r;
r = unit_exec_context_defaults(u, &m->exec_context);
if (r < 0)
return r;
return 0;
}
@ -606,10 +604,6 @@ static int mount_load(Unit *u) {
r = mount_add_extras(m);
if (r < 0)
return r;
r = unit_exec_context_defaults(u, &m->exec_context);
if (r < 0)
return r;
}
return mount_verify(m);

399
src/core/socket.c

@ -34,8 +34,6 @@
#endif
#include "sd-event.h"
#include "unit.h"
#include "socket.h"
#include "log.h"
#include "load-dropin.h"
#include "load-fragment.h"
@ -44,7 +42,6 @@
#include "path-util.h"
#include "unit-name.h"
#include "unit-printf.h"
#include "dbus-socket.h"
#include "missing.h"
#include "special.h"
#include "label.h"
@ -53,6 +50,9 @@
#include "smack-util.h"
#include "bus-util.h"
#include "bus-error.h"
#include "dbus-socket.h"
#include "unit.h"
#include "socket.h"
static const UnitActiveState state_translation_table[_SOCKET_STATE_MAX] = {
[SOCKET_DEAD] = UNIT_INACTIVE,
@ -243,48 +243,6 @@ static bool have_non_accept_socket(Socket *s) {
return false;
}
static int socket_verify(Socket *s) {
assert(s);
if (UNIT(s)->load_state != UNIT_LOADED)
return 0;
if (!s->ports) {
log_error_unit(UNIT(s)->id,
"%s lacks Listen setting. Refusing.", UNIT(s)->id);
return -EINVAL;
}
if (s->accept && have_non_accept_socket(s)) {
log_error_unit(UNIT(s)->id,
"%s configured for accepting sockets, but sockets are non-accepting. Refusing.",
UNIT(s)->id);
return -EINVAL;
}
if (s->accept && s->max_connections <= 0) {
log_error_unit(UNIT(s)->id,
"%s's MaxConnection setting too small. Refusing.", UNIT(s)->id);
return -EINVAL;
}
if (s->accept && UNIT_DEREF(s->service)) {
log_error_unit(UNIT(s)->id,
"Explicit service configuration for accepting sockets not supported on %s. Refusing.",
UNIT(s)->id);
return -EINVAL;
}
if (s->exec_context.pam_name && s->kill_context.kill_mode != KILL_CONTROL_GROUP) {
log_error_unit(UNIT(s)->id,
"%s has PAM enabled. Kill mode must be set to 'control-group'. Refusing.",
UNIT(s)->id);
return -EINVAL;
}
return 0;
}
static int socket_add_mount_links(Socket *s) {
SocketPort *p;
int r;
@ -312,20 +270,14 @@ static int socket_add_mount_links(Socket *s) {
static int socket_add_device_link(Socket *s) {
char *t;
int r;
assert(s);
if (!s->bind_to_device || streq(s->bind_to_device, "lo"))
return 0;
if (asprintf(&t, "/sys/subsystem/net/devices/%s", s->bind_to_device) < 0)
return -ENOMEM;
r = unit_add_node_link(UNIT(s), t, false);
free(t);
return r;
t = strappenda("/sys/subsystem/net/devices/", s->bind_to_device);
return unit_add_node_link(UNIT(s), t, false);
}
static int socket_add_default_dependencies(Socket *s) {
@ -356,55 +308,109 @@ _pure_ static bool socket_has_exec(Socket *s) {
return false;
}
static int socket_load(Unit *u) {
Socket *s = SOCKET(u);
static int socket_add_extras(Socket *s) {
Unit *u = UNIT(s);
int r;
assert(u);
assert(u->load_state == UNIT_STUB);
if ((r = unit_load_fragment_and_dropin(u)) < 0)
return r;
/* This is a new unit? Then let's add in some extras */
if (u->load_state == UNIT_LOADED) {
if (have_non_accept_socket(s)) {
if (!UNIT_DEREF(s->service)) {
Unit *x;
assert(s);
r = unit_load_related_unit(u, ".service", &x);
if (r < 0)
return r;
if (have_non_accept_socket(s)) {
unit_ref_set(&s->service, x);
}
if (!UNIT_DEREF(s->service)) {
Unit *x;
r = unit_add_two_dependencies(u, UNIT_BEFORE, UNIT_TRIGGERS, UNIT_DEREF(s->service), true);
r = unit_load_related_unit(u, ".service", &x);
if (r < 0)
return r;
unit_ref_set(&s->service, x);
}
if ((r = socket_add_mount_links(s)) < 0)
r = unit_add_two_dependencies(u, UNIT_BEFORE, UNIT_TRIGGERS, UNIT_DEREF(s->service), true);
if (r < 0)
return r;
}
if ((r = socket_add_device_link(s)) < 0)
return r;
r = socket_add_mount_links(s);
if (r < 0)
return r;
if (socket_has_exec(s))
if ((r = unit_add_exec_dependencies(u, &s->exec_context)) < 0)
return r;
r = socket_add_device_link(s);
if (r < 0)
return r;
r = unit_exec_context_defaults(u, &s->exec_context);
if (r < 0)
return r;
if (socket_has_exec(s)) {
r = unit_add_exec_dependencies(u, &s->exec_context);
if (r < 0)
return r;
r = unit_add_default_slice(u);
if (r < 0)
return r;
}
if (UNIT(s)->default_dependencies)
if ((r = socket_add_default_dependencies(s)) < 0)
return r;
if (u->default_dependencies) {
r = socket_add_default_dependencies(s);
if (r < 0)
return r;
}
return 0;
}
static int socket_verify(Socket *s) {
assert(s);
if (UNIT(s)->load_state != UNIT_LOADED)
return 0;
if (!s->ports) {
log_error_unit(UNIT(s)->id, "%s lacks Listen setting. Refusing.", UNIT(s)->id);
return -EINVAL;
}
if (s->accept && have_non_accept_socket(s)) {
log_error_unit(UNIT(s)->id, "%s configured for accepting sockets, but sockets are non-accepting. Refusing.",
UNIT(s)->id);
return -EINVAL;
}
if (s->accept && s->max_connections <= 0) {
log_error_unit(UNIT(s)->id, "%s's MaxConnection setting too small. Refusing.", UNIT(s)->id);
return -EINVAL;
}
r = unit_exec_context_defaults(u, &s->exec_context);
if (s->accept && UNIT_DEREF(s->service)) {
log_error_unit(UNIT(s)->id, "Explicit service configuration for accepting sockets not supported on %s. Refusing.", UNIT(s)->id);
return -EINVAL;
}
if (s->exec_context.pam_name && s->kill_context.kill_mode != KILL_CONTROL_GROUP) {
log_error_unit(UNIT(s)->id, "%s has PAM enabled. Kill mode must be set to 'control-group'. Refusing.", UNIT(s)->id);
return -EINVAL;
}
return 0;
}
static int socket_load(Unit *u) {
Socket *s = SOCKET(u);
int r;
assert(u);
assert(u->load_state == UNIT_STUB);
r = unit_load_fragment_and_dropin(u);
if (r < 0)
return r;
if (u->load_state == UNIT_LOADED) {
/* This is a new unit? Then let's add in some extras */
r = socket_add_extras(s);
if (r < 0)
return r;
}
@ -429,18 +435,15 @@ _const_ static const char* listen_lookup(int family, int type) {
}
static void socket_dump(Unit *u, FILE *f, const char *prefix) {
SocketExecCommand c;
Socket *s = SOCKET(u);
SocketPort *p;
const char *prefix2;
char *p2;
assert(s);
assert(f);
p2 = strappend(prefix, "\t");
prefix2 = p2 ? p2 : prefix;
prefix2 = strappenda(prefix, "\t");
fprintf(f,
"%sSocket State: %s\n"
@ -588,8 +591,6 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) {
exec_command_dump_list(s->exec_command[c], f, prefix2);
}
free(p2);
}
static int instance_from_socket(int fd, unsigned nr, char **instance) {
@ -1160,10 +1161,8 @@ static void socket_set_state(Socket *s, SocketState state) {
socket_close_fds(s);
if (state != old_state)
log_debug_unit(UNIT(s)->id,
"%s changed %s -> %s", UNIT(s)->id,
socket_state_to_string(old_state),
socket_state_to_string(state));
log_debug_unit(UNIT(s)->id, "%s changed %s -> %s",
UNIT(s)->id, socket_state_to_string(old_state), socket_state_to_string(state));
unit_notify(UNIT(s), state_translation_table[old_state], state_translation_table[state], true);
}
@ -1175,49 +1174,48 @@ static int socket_coldplug(Unit *u) {
assert(s);
assert(s->state == SOCKET_DEAD);
if (s->deserialized_state != s->state) {
if (s->deserialized_state == SOCKET_START_PRE ||
s->deserialized_state == SOCKET_START_POST ||
s->deserialized_state == SOCKET_STOP_PRE ||
s->deserialized_state == SOCKET_STOP_PRE_SIGTERM ||
s->deserialized_state == SOCKET_STOP_PRE_SIGKILL ||
s->deserialized_state == SOCKET_STOP_POST ||
s->deserialized_state == SOCKET_FINAL_SIGTERM ||
s->deserialized_state == SOCKET_FINAL_SIGKILL) {
if (s->deserialized_state == s->state)
return 0;
if (s->control_pid <= 0)
return -EBADMSG;
if (s->deserialized_state == SOCKET_START_PRE ||
s->deserialized_state == SOCKET_START_POST ||
s->deserialized_state == SOCKET_STOP_PRE ||
s->deserialized_state == SOCKET_STOP_PRE_SIGTERM ||
s->deserialized_state == SOCKET_STOP_PRE_SIGKILL ||
s->deserialized_state == SOCKET_STOP_POST ||
s->deserialized_state == SOCKET_FINAL_SIGTERM ||
s->deserialized_state == SOCKET_FINAL_SIGKILL) {
r = unit_watch_pid(UNIT(s), s->control_pid);
if (r < 0)
return r;
if (s->control_pid <= 0)
return -EBADMSG;
r = socket_arm_timer(s);
if (r < 0)
return r;
}
r = unit_watch_pid(UNIT(s), s->control_pid);
if (r < 0)
return r;
if (s->deserialized_state == SOCKET_START_POST ||
s->deserialized_state == SOCKET_LISTENING ||
s->deserialized_state == SOCKET_RUNNING ||
s->deserialized_state == SOCKET_STOP_PRE ||
s->deserialized_state == SOCKET_STOP_PRE_SIGTERM ||
s->deserialized_state == SOCKET_STOP_PRE_SIGKILL) {
r = socket_open_fds(s);
if (r < 0)
return r;
}
r = socket_arm_timer(s);
if (r < 0)
return r;
}
if (s->deserialized_state == SOCKET_LISTENING) {
r = socket_watch_fds(s);
if (r < 0)
return r;
}
if (s->deserialized_state == SOCKET_START_POST ||
s->deserialized_state == SOCKET_LISTENING ||
s->deserialized_state == SOCKET_RUNNING ||
s->deserialized_state == SOCKET_STOP_PRE ||
s->deserialized_state == SOCKET_STOP_PRE_SIGTERM ||
s->deserialized_state == SOCKET_STOP_PRE_SIGKILL) {
r = socket_open_fds(s);
if (r < 0)
return r;
}
socket_set_state(s, s->deserialized_state);
if (s->deserialized_state == SOCKET_LISTENING) {
r = socket_watch_fds(s);
if (r < 0)
return r;
}
socket_set_state(s, s->deserialized_state);
return 0;
}
@ -1353,9 +1351,7 @@ static void socket_enter_signal(Socket *s, SocketState state, SocketResult f) {
return;
fail:
log_warning_unit(UNIT(s)->id,
"%s failed to kill processes: %s",
UNIT(s)->id, strerror(-r));
log_warning_unit(UNIT(s)->id, "%s failed to kill processes: %s", UNIT(s)->id, strerror(-r));
if (state == SOCKET_STOP_PRE_SIGTERM || state == SOCKET_STOP_PRE_SIGKILL)
socket_enter_stop_post(s, SOCKET_FAILURE_RESOURCES);
@ -1385,9 +1381,7 @@ static void socket_enter_stop_pre(Socket *s, SocketResult f) {
return;
fail:
log_warning_unit(UNIT(s)->id,
"%s failed to run 'stop-pre' task: %s",
UNIT(s)->id, strerror(-r));
log_warning_unit(UNIT(s)->id, "%s failed to run 'stop-pre' task: %s", UNIT(s)->id, strerror(-r));
socket_enter_stop_post(s, SOCKET_FAILURE_RESOURCES);
}
@ -1397,9 +1391,7 @@ static void socket_enter_listening(Socket *s) {
r = socket_watch_fds(s);
if (r < 0) {
log_warning_unit(UNIT(s)->id,
"%s failed to watch sockets: %s",
UNIT(s)->id, strerror(-r));
log_warning_unit(UNIT(s)->id, "%s failed to watch sockets: %s", UNIT(s)->id, strerror(-r));
goto fail;
}
@ -1416,9 +1408,7 @@ static void socket_enter_start_post(Socket *s) {
r = socket_open_fds(s);
if (r < 0) {
log_warning_unit(UNIT(s)->id,
"%s failed to listen on sockets: %s",
UNIT(s)->id, strerror(-r));
log_warning_unit(UNIT(s)->id, "%s failed to listen on sockets: %s", UNIT(s)->id, strerror(-r));
goto fail;
}
@ -1429,9 +1419,7 @@ static void socket_enter_start_post(Socket *s) {
if ((s->control_command = s->exec_command[SOCKET_EXEC_START_POST])) {
r = socket_spawn(s, s->control_command, &s->control_pid);
if (r < 0) {
log_warning_unit(UNIT(s)->id,
"%s failed to run 'start-post' task: %s",
UNIT(s)->id, strerror(-r));
log_warning_unit(UNIT(s)->id, "%s failed to run 'start-post' task: %s", UNIT(s)->id, strerror(-r));
goto fail;
}
@ -1454,7 +1442,8 @@ static void socket_enter_start_pre(Socket *s) {
s->control_command_id = SOCKET_EXEC_START_PRE;
if ((s->control_command = s->exec_command[SOCKET_EXEC_START_PRE])) {
if ((r = socket_spawn(s, s->control_command, &s->control_pid)) < 0)
r = socket_spawn(s, s->control_command, &s->control_pid);
if (r < 0)
goto fail;
socket_set_state(s, SOCKET_START_PRE);
@ -1464,9 +1453,7 @@ static void socket_enter_start_pre(Socket *s) {
return;
fail:
log_warning_unit(UNIT(s)->id,
"%s failed to run 'start-pre' task: %s",
UNIT(s)->id, strerror(-r));
log_warning_unit(UNIT(s)->id, "%s failed to run 'start-pre' task: %s", UNIT(s)->id, strerror(-r));
socket_enter_dead(s, SOCKET_FAILURE_RESOURCES);
}
@ -1479,9 +1466,8 @@ static void socket_enter_running(Socket *s, int cfd) {
/* We don't take connections anymore if we are supposed to
* shut down anyway */
if (unit_stop_pending(UNIT(s))) {
log_debug_unit(UNIT(s)->id,
"Suppressing connection request on %s since unit stop is scheduled.",
UNIT(s)->id);
log_debug_unit(UNIT(s)->id, "Suppressing connection request on %s since unit stop is scheduled.", UNIT(s)->id);
if (cfd >= 0)
close_nointr_nofail(cfd);
@ -1491,9 +1477,7 @@ static void socket_enter_running(Socket *s, int cfd) {
r = socket_watch_fds(s);
if (r < 0) {
log_warning_unit(UNIT(s)->id,
"%s failed to watch sockets: %s",
UNIT(s)->id, strerror(-r));
log_warning_unit(UNIT(s)->id, "%s failed to watch sockets: %s", UNIT(s)->id, strerror(-r));
socket_enter_stop_pre(s, SOCKET_FAILURE_RESOURCES);
}
}
@ -1503,13 +1487,13 @@ static void socket_enter_running(Socket *s, int cfd) {
if (cfd < 0) {
Iterator i;
Unit *u;
Unit *other;
bool pending = false;
/* If there's already a start pending don't bother to
* do anything */
SET_FOREACH(u, UNIT(s)->dependencies[UNIT_TRIGGERS], i)
if (unit_active_or_pending(u)) {
SET_FOREACH(other, UNIT(s)->dependencies[UNIT_TRIGGERS], i)
if (unit_active_or_pending(other)) {
pending = true;