chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nspawn: change filesystem type from "bind" to NULL in mount() syscalls
[elogind.git]
/
src
/
core
/
socket.c
diff --git
a/src/core/socket.c
b/src/core/socket.c
index 2ee002459067386f4e6d354e7de6582ba133874b..f67370b4cb921d0d041b7d5e7b4ed991af6a2db9 100644
(file)
--- a/
src/core/socket.c
+++ b/
src/core/socket.c
@@
-19,7
+19,6
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <errno.h>
#include <sys/stat.h>
#include <unistd.h>
#include <errno.h>
@@
-29,12
+28,9
@@
#include <arpa/inet.h>
#include <netinet/tcp.h>
#include <mqueue.h>
#include <arpa/inet.h>
#include <netinet/tcp.h>
#include <mqueue.h>
-#include <sys/xattr.h>
#include "sd-event.h"
#include "log.h"
#include "sd-event.h"
#include "log.h"
-#include "load-dropin.h"
-#include "load-fragment.h"
#include "strv.h"
#include "mkdir.h"
#include "path-util.h"
#include "strv.h"
#include "mkdir.h"
#include "path-util.h"
@@
-48,6
+44,7
@@
#include "smack-util.h"
#include "bus-util.h"
#include "bus-error.h"
#include "smack-util.h"
#include "bus-util.h"
#include "bus-error.h"
+#include "selinux-util.h"
#include "dbus-socket.h"
#include "unit.h"
#include "socket.h"
#include "dbus-socket.h"
#include "unit.h"
#include "socket.h"
@@
-265,7
+262,7
@@
static int socket_add_device_link(Socket *s) {
if (!s->bind_to_device || streq(s->bind_to_device, "lo"))
return 0;
if (!s->bind_to_device || streq(s->bind_to_device, "lo"))
return 0;
- t = str
append
a("/sys/subsystem/net/devices/", s->bind_to_device);
+ t = str
join
a("/sys/subsystem/net/devices/", s->bind_to_device);
return unit_add_node_link(UNIT(s), t, false);
}
return unit_add_node_link(UNIT(s), t, false);
}
@@
-472,7
+469,7
@@
static void socket_dump(Unit *u, FILE *f, const char *prefix) {
assert(f);
prefix = strempty(prefix);
assert(f);
prefix = strempty(prefix);
- prefix2 = str
append
a(prefix, "\t");
+ prefix2 = str
join
a(prefix, "\t");
fprintf(f,
"%sSocket State: %s\n"
fprintf(f,
"%sSocket State: %s\n"
@@
-925,13
+922,13
@@
static void socket_apply_socket_options(Socket *s, int fd) {
if (s->smack_ip_in) {
r = mac_smack_apply_ip_in_fd(fd, s->smack_ip_in);
if (r < 0)
if (s->smack_ip_in) {
r = mac_smack_apply_ip_in_fd(fd, s->smack_ip_in);
if (r < 0)
- log_unit_error
(UNIT(s)->id, "mac_smack_apply_ip_in_fd: %s", strerror(-r)
);
+ log_unit_error
_errno(UNIT(s)->id, r, "mac_smack_apply_ip_in_fd: %m"
);
}
if (s->smack_ip_out) {
r = mac_smack_apply_ip_out_fd(fd, s->smack_ip_out);
if (r < 0)
}
if (s->smack_ip_out) {
r = mac_smack_apply_ip_out_fd(fd, s->smack_ip_out);
if (r < 0)
- log_unit_error
(UNIT(s)->id, "mac_smack_apply_ip_out_fd: %s", strerror(-r)
);
+ log_unit_error
_errno(UNIT(s)->id, r, "mac_smack_apply_ip_out_fd: %m"
);
}
}
}
}
@@
-948,7
+945,7
@@
static void socket_apply_fifo_options(Socket *s, int fd) {
if (s->smack) {
r = mac_smack_apply_fd(fd, s->smack);
if (r < 0)
if (s->smack) {
r = mac_smack_apply_fd(fd, s->smack);
if (r < 0)
- log_unit_error
(UNIT(s)->id, "mac_smack_apply_fd: %s", strerror(-r)
);
+ log_unit_error
_errno(UNIT(s)->id, r, "mac_smack_apply_fd: %m"
);
}
}
}
}
@@
-1269,7
+1266,7
@@
static int socket_watch_fds(Socket *s) {
r = sd_event_add_io(UNIT(s)->manager->event, &p->event_source, p->fd, EPOLLIN, socket_dispatch_io, p);
if (r < 0) {
r = sd_event_add_io(UNIT(s)->manager->event, &p->event_source, p->fd, EPOLLIN, socket_dispatch_io, p);
if (r < 0) {
- log_unit_warning
(UNIT(s)->id, "Failed to watch listening fds: %s", strerror(-r)
);
+ log_unit_warning
_errno(UNIT(s)->id, r, "Failed to watch listening fds: %m"
);
goto fail;
}
}
goto fail;
}
}
@@
-1325,7
+1322,7
@@
static void socket_set_state(Socket *s, SocketState state) {
unit_notify(UNIT(s), state_translation_table[old_state], state_translation_table[state], true);
}
unit_notify(UNIT(s), state_translation_table[old_state], state_translation_table[state], true);
}
-static int socket_coldplug(Unit *u) {
+static int socket_coldplug(Unit *u
, Hashmap *deferred_work
) {
Socket *s = SOCKET(u);
int r;
Socket *s = SOCKET(u);
int r;
@@
-1395,7
+1392,11
@@
static int socket_spawn(Socket *s, ExecCommand *c, pid_t *_pid) {
assert(c);
assert(_pid);
assert(c);
assert(_pid);
- unit_realize_cgroup(UNIT(s));
+ (void) unit_realize_cgroup(UNIT(s));
+ if (s->reset_cpu_usage) {
+ (void) unit_reset_cpu_usage(UNIT(s));
+ s->reset_cpu_usage = false;
+ }
r = unit_setup_exec_runtime(UNIT(s));
if (r < 0)
r = unit_setup_exec_runtime(UNIT(s));
if (r < 0)
@@
-1456,8
+1457,8
@@
static int socket_chown(Socket *s, pid_t *_pid) {
if (pid == 0) {
SocketPort *p;
if (pid == 0) {
SocketPort *p;
- uid_t uid =
(uid_t) -1
;
- gid_t gid =
(gid_t) -1
;
+ uid_t uid =
UID_INVALID
;
+ gid_t gid =
GID_INVALID
;
int ret;
default_signals(SIGNALS_CRASH_HANDLER, SIGNALS_IGNORE, -1);
int ret;
default_signals(SIGNALS_CRASH_HANDLER, SIGNALS_IGNORE, -1);
@@
-1506,7
+1507,7
@@
static int socket_chown(Socket *s, pid_t *_pid) {
fail_child:
log_open();
fail_child:
log_open();
- log_error_errno(
-
r, "Failed to chown socket at step %s: %m", exit_status_to_string(ret, EXIT_STATUS_SYSTEMD));
+ log_error_errno(r, "Failed to chown socket at step %s: %m", exit_status_to_string(ret, EXIT_STATUS_SYSTEMD));
_exit(ret);
}
_exit(ret);
}
@@
-1605,7
+1606,7
@@
static void socket_enter_signal(Socket *s, SocketState state, SocketResult f) {
return;
fail:
return;
fail:
- log_unit_warning
(UNIT(s)->id, "%s failed to kill processes: %s", UNIT(s)->id, strerror(-r)
);
+ log_unit_warning
_errno(UNIT(s)->id, r, "%s failed to kill processes: %m", UNIT(s)->id
);
if (state == SOCKET_STOP_PRE_SIGTERM || state == SOCKET_STOP_PRE_SIGKILL)
socket_enter_stop_post(s, SOCKET_FAILURE_RESOURCES);
if (state == SOCKET_STOP_PRE_SIGTERM || state == SOCKET_STOP_PRE_SIGKILL)
socket_enter_stop_post(s, SOCKET_FAILURE_RESOURCES);
@@
-1636,7
+1637,7
@@
static void socket_enter_stop_pre(Socket *s, SocketResult f) {
return;
fail:
return;
fail:
- log_unit_warning
(UNIT(s)->id, "%s failed to run 'stop-pre' task: %s", UNIT(s)->id, strerror(-r)
);
+ log_unit_warning
_errno(UNIT(s)->id, r, "%s failed to run 'stop-pre' task: %m", UNIT(s)->id
);
socket_enter_stop_post(s, SOCKET_FAILURE_RESOURCES);
}
socket_enter_stop_post(s, SOCKET_FAILURE_RESOURCES);
}
@@
-1646,7
+1647,7
@@
static void socket_enter_listening(Socket *s) {
r = socket_watch_fds(s);
if (r < 0) {
r = socket_watch_fds(s);
if (r < 0) {
- log_unit_warning
(UNIT(s)->id, "%s failed to watch sockets: %s", UNIT(s)->id, strerror(-r)
);
+ log_unit_warning
_errno(UNIT(s)->id, r, "%s failed to watch sockets: %m", UNIT(s)->id
);
goto fail;
}
goto fail;
}
@@
-1668,7
+1669,7
@@
static void socket_enter_start_post(Socket *s) {
if (s->control_command) {
r = socket_spawn(s, s->control_command, &s->control_pid);
if (r < 0) {
if (s->control_command) {
r = socket_spawn(s, s->control_command, &s->control_pid);
if (r < 0) {
- log_unit_warning
(UNIT(s)->id, "%s failed to run 'start-post' task: %s", UNIT(s)->id, strerror(-r)
);
+ log_unit_warning
_errno(UNIT(s)->id, r, "%s failed to run 'start-post' task: %m", UNIT(s)->id
);
goto fail;
}
goto fail;
}
@@
-1689,7
+1690,7
@@
static void socket_enter_start_chown(Socket *s) {
r = socket_open_fds(s);
if (r < 0) {
r = socket_open_fds(s);
if (r < 0) {
- log_unit_warning
(UNIT(s)->id, "%s failed to listen on sockets: %s", UNIT(s)->id, strerror(-r)
);
+ log_unit_warning
_errno(UNIT(s)->id, r, "%s failed to listen on sockets: %m", UNIT(s)->id
);
goto fail;
}
goto fail;
}
@@
-1701,7
+1702,7
@@
static void socket_enter_start_chown(Socket *s) {
r = socket_chown(s, &s->control_pid);
if (r < 0) {
r = socket_chown(s, &s->control_pid);
if (r < 0) {
- log_unit_warning
(UNIT(s)->id, "%s failed to fork 'start-chown' task: %s", UNIT(s)->id, strerror(-r)
);
+ log_unit_warning
_errno(UNIT(s)->id, r, "%s failed to fork 'start-chown' task: %m", UNIT(s)->id
);
goto fail;
}
goto fail;
}
@@
-1726,7
+1727,7
@@
static void socket_enter_start_pre(Socket *s) {
if (s->control_command) {
r = socket_spawn(s, s->control_command, &s->control_pid);
if (r < 0) {
if (s->control_command) {
r = socket_spawn(s, s->control_command, &s->control_pid);
if (r < 0) {
- log_unit_warning
(UNIT(s)->id, "%s failed to run 'start-pre' task: %s", UNIT(s)->id, strerror(-r)
);
+ log_unit_warning
_errno(UNIT(s)->id, r, "%s failed to run 'start-pre' task: %m", UNIT(s)->id
);
goto fail;
}
goto fail;
}
@@
-1760,14
+1761,14
@@
static void socket_enter_running(Socket *s, int cfd) {
r = socket_open_fds(s);
if (r < 0) {
r = socket_open_fds(s);
if (r < 0) {
- log_unit_warning
(UNIT(s)->id, "%s failed to listen on sockets: %s", UNIT(s)->id, strerror(-r)
);
+ log_unit_warning
_errno(UNIT(s)->id, r, "%s failed to listen on sockets: %m", UNIT(s)->id
);
socket_enter_stop_pre(s, SOCKET_FAILURE_RESOURCES);
return;
}
r = socket_watch_fds(s);
if (r < 0) {
socket_enter_stop_pre(s, SOCKET_FAILURE_RESOURCES);
return;
}
r = socket_watch_fds(s);
if (r < 0) {
- log_unit_warning
(UNIT(s)->id, "%s failed to watch sockets: %s", UNIT(s)->id, strerror(-r)
);
+ log_unit_warning
_errno(UNIT(s)->id, r, "%s failed to watch sockets: %m", UNIT(s)->id
);
socket_enter_stop_pre(s, SOCKET_FAILURE_RESOURCES);
}
}
socket_enter_stop_pre(s, SOCKET_FAILURE_RESOURCES);
}
}
@@
-1894,7
+1895,7
@@
static void socket_run_next(Socket *s) {
return;
fail:
return;
fail:
- log_unit_warning
(UNIT(s)->id, "%s failed to run next task: %s", UNIT(s)->id, strerror(-r)
);
+ log_unit_warning
_errno(UNIT(s)->id, r, "%s failed to run next task: %m", UNIT(s)->id
);
if (s->state == SOCKET_START_POST)
socket_enter_stop_pre(s, SOCKET_FAILURE_RESOURCES);
if (s->state == SOCKET_START_POST)
socket_enter_stop_pre(s, SOCKET_FAILURE_RESOURCES);
@@
-1951,9
+1952,11
@@
static int socket_start(Unit *u) {
assert(s->state == SOCKET_DEAD || s->state == SOCKET_FAILED);
s->result = SOCKET_SUCCESS;
assert(s->state == SOCKET_DEAD || s->state == SOCKET_FAILED);
s->result = SOCKET_SUCCESS;
+ s->reset_cpu_usage = true;
+
socket_enter_start_pre(s);
socket_enter_start_pre(s);
- return
0
;
+ return
1
;
}
static int socket_stop(Unit *u) {
}
static int socket_stop(Unit *u) {
@@
-1984,7
+1987,7
@@
static int socket_stop(Unit *u) {
assert(s->state == SOCKET_LISTENING || s->state == SOCKET_RUNNING);
socket_enter_stop_pre(s, SOCKET_SUCCESS);
assert(s->state == SOCKET_LISTENING || s->state == SOCKET_RUNNING);
socket_enter_stop_pre(s, SOCKET_SUCCESS);
- return
0
;
+ return
1
;
}
static int socket_serialize(Unit *u, FILE *f, FDSet *fds) {
}
static int socket_serialize(Unit *u, FILE *f, FDSet *fds) {
@@
-2099,7
+2102,7
@@
static int socket_deserialize_item(Unit *u, const char *key, const char *value,
LIST_FOREACH(port, p, s->ports)
if (p->type == SOCKET_FIFO &&
LIST_FOREACH(port, p, s->ports)
if (p->type == SOCKET_FIFO &&
-
streq_ptr
(p->path, value+skip))
+
path_equal_or_files_same
(p->path, value+skip))
break;
if (p) {
break;
if (p) {
@@
-2118,7
+2121,7
@@
static int socket_deserialize_item(Unit *u, const char *key, const char *value,
LIST_FOREACH(port, p, s->ports)
if (p->type == SOCKET_SPECIAL &&
LIST_FOREACH(port, p, s->ports)
if (p->type == SOCKET_SPECIAL &&
-
streq_ptr
(p->path, value+skip))
+
path_equal_or_files_same
(p->path, value+skip))
break;
if (p) {
break;
if (p) {
@@
-2137,7
+2140,7
@@
static int socket_deserialize_item(Unit *u, const char *key, const char *value,
LIST_FOREACH(port, p, s->ports)
if (p->type == SOCKET_MQUEUE &&
LIST_FOREACH(port, p, s->ports)
if (p->type == SOCKET_MQUEUE &&
- streq
_ptr
(p->path, value+skip))
+ streq(p->path, value+skip))
break;
if (p) {
break;
if (p) {
@@
-2602,10
+2605,6
@@
static void socket_trigger_notify(Unit *u, Unit *other) {
socket_notify_service_dead(s, se->result == SERVICE_FAILURE_START_LIMIT);
if (se->state == SERVICE_DEAD ||
socket_notify_service_dead(s, se->result == SERVICE_FAILURE_START_LIMIT);
if (se->state == SERVICE_DEAD ||
- se->state == SERVICE_STOP ||
- se->state == SERVICE_STOP_SIGTERM ||
- se->state == SERVICE_STOP_SIGKILL ||
- se->state == SERVICE_STOP_POST ||
se->state == SERVICE_FINAL_SIGTERM ||
se->state == SERVICE_FINAL_SIGKILL ||
se->state == SERVICE_AUTO_RESTART)
se->state == SERVICE_FINAL_SIGTERM ||
se->state == SERVICE_FINAL_SIGKILL ||
se->state == SERVICE_AUTO_RESTART)