#include "unit.h"
#include "socket.h"
+#include "netinet/tcp.h"
#include "log.h"
#include "load-dropin.h"
#include "load-fragment.h"
#include "missing.h"
#include "special.h"
#include "bus-errors.h"
+#include "label.h"
static const UnitActiveState state_translation_table[_SOCKET_STATE_MAX] = {
[SOCKET_DEAD] = UNIT_INACTIVE,
s->service = NULL;
+ free(s->tcp_congestion);
+ s->tcp_congestion = NULL;
+
free(s->bind_to_device);
s->bind_to_device = NULL;
if (r < 0)
return r;
+ u->meta.no_gc = true;
s->service = SERVICE(u);
return 0;
}
if ((r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SYSINIT_TARGET, NULL, true)) < 0)
return r;
- return unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true);
+ return unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTED_BY, SPECIAL_SHUTDOWN_TARGET, NULL, true);
}
static int socket_load(Unit *u) {
"%sSocketMode: %04o\n"
"%sDirectoryMode: %04o\n"
"%sKeepAlive: %s\n"
- "%sFreeBind: %s\n",
+ "%sFreeBind: %s\n"
+ "%sTCPCongestion: %s\n",
prefix, socket_state_to_string(s->state),
prefix, socket_address_bind_ipv6_only_to_string(s->bind_ipv6_only),
prefix, s->backlog,
prefix, s->socket_mode,
prefix, s->directory_mode,
prefix, yes_no(s->keep_alive),
- prefix, yes_no(s->free_bind));
+ prefix, yes_no(s->free_bind),
+ prefix, s->tcp_congestion);
if (s->control_pid > 0)
fprintf(f,
if (p->type == SOCKET_SOCKET) {
const char *t;
int r;
- char *k;
+ char *k = NULL;
if ((r = socket_address_print(&p->address, &k)) < 0)
t = strerror(-r);
else
t = k;
- fprintf(f, "%s%s: %s\n", prefix, listen_lookup(p->address.type), k);
+ fprintf(f, "%s%s: %s\n", prefix, listen_lookup(p->address.type), t);
free(k);
} else
fprintf(f, "%sListenFIFO: %s\n", prefix, p->path);
if (r < 0 && x < 0)
log_warning("IP_TTL/IPV6_UNICAST_HOPS failed: %m");
}
+
+ if (s->tcp_congestion)
+ if (setsockopt(fd, SOL_TCP, TCP_CONGESTION, s->tcp_congestion, strlen(s->tcp_congestion)+1) < 0)
+ log_warning("TCP_CONGESTION failed: %m");
}
static void socket_apply_fifo_options(Socket *s, int fd) {
log_warning("F_SETPIPE_SZ: %m");
}
+
static int fifo_address_create(
const char *path,
mode_t directory_mode,
mode_t socket_mode,
- /* FIXME SELINUX: pass SELinux context object here */
+ const char *label,
int *_fd) {
- int fd = -1, r;
+ int fd = -1, r = 0;
struct stat st;
mode_t old_mask;
mkdir_parents(path, directory_mode);
- /* FIXME SELINUX: The mkfifo here should be done with
- * the right SELinux context set */
+ if ((r = label_fifofile_set(label, path)) < 0)
+ goto fail;
/* Enforce the right access mode for the fifo */
old_mask = umask(~ socket_mode);
goto fail;
}
+ label_file_clear();
+
if (fstat(fd, &st) < 0) {
r = -errno;
goto fail;
}
if (!S_ISFIFO(st.st_mode) ||
- st.st_mode != (socket_mode & ~old_mask) ||
+ (st.st_mode & 0777) != (socket_mode & ~old_mask) ||
st.st_uid != getuid() ||
st.st_gid != getgid()) {
return 0;
fail:
+ label_file_clear();
+
if (fd >= 0)
close_nointr_nofail(fd);
static int socket_open_fds(Socket *s) {
SocketPort *p;
int r;
+ char *label = NULL;
assert(s);
- /* FIXME SELINUX: Somewhere here we must set the the SELinux
- context for the created sockets and FIFOs. To figure out
- the executable name for this, use
- socket_instantiate_service() and then access the executable
- path name via
- s->service->exec_command[SERVICE_EXEC_START]->path. Example:
-
if ((r = socket_instantiate_service(s)) < 0)
return r;
- log_debug("Socket unit %s will spawn service unit %s with executable path %s.",
- s->meta.id,
- s->service->meta.id,
- s->service->exec_command[SERVICE_EXEC_START]->path);
- */
+ if ((r = label_get_socket_label_from_exe(s->service->exec_command[SERVICE_EXEC_START]->path, &label)) < 0)
+ return r;
LIST_FOREACH(port, p, s->ports) {
s->free_bind,
s->directory_mode,
s->socket_mode,
- /* FIXME SELINUX: Pass the SELinux context object here */
+ label,
&p->fd)) < 0)
goto rollback;
p->path,
s->directory_mode,
s->socket_mode,
- /* FIXME SELINUX: Pass the SELinux context object here */
+ label,
&p->fd)) < 0)
goto rollback;
assert_not_reached("Unknown port type");
}
+ label_free(label);
return 0;
rollback:
socket_close_fds(s);
+ label_free(label);
return r;
}
s->service = NULL;
s->n_accepted ++;
+ service->meta.no_gc = false;
+
unit_choose_id(UNIT(service), name);
free(name);
static int socket_deserialize_item(Unit *u, const char *key, const char *value, FDSet *fds) {
Socket *s = SOCKET(u);
- int r;
assert(u);
assert(key);
} else if (streq(key, "n-accepted")) {
unsigned k;
- if ((r = safe_atou(value, &k)) < 0)
+ if (safe_atou(value, &k) < 0)
log_debug("Failed to parse n-accepted value %s", value);
else
s->n_accepted += k;
} else if (streq(key, "control-pid")) {
pid_t pid;
- if ((r = parse_pid(value, &pid)) < 0)
+ if (parse_pid(value, &pid) < 0)
log_debug("Failed to parse control-pid value %s", value);
else
s->control_pid = pid;
success = true;
}
- log_debug("%s control process exited, code=%s status=%i", u->meta.id, sigchld_code_to_string(code), status);
+ log_full(success ? LOG_DEBUG : LOG_NOTICE,
+ "%s control process exited, code=%s status=%i", u->meta.id, sigchld_code_to_string(code), status);
s->failure = s->failure || !success;
if (s->control_command && s->control_command->command_next && success) {
if (p->fd >= 0)
rn_fds++;
- if (!(rfds = new(int, rn_fds)) < 0)
+ if (!(rfds = new(int, rn_fds)))
return -ENOMEM;
k = 0;
log_debug("%s: One connection closed, %u left.", s->meta.id, s->n_connections);
}
+static void socket_reset_maintenance(Unit *u) {
+ Socket *s = SOCKET(u);
+
+ assert(s);
+
+ if (s->state == SOCKET_MAINTENANCE)
+ socket_set_state(s, SOCKET_DEAD);
+
+ s->failure = false;
+}
+
static const char* const socket_state_table[_SOCKET_STATE_MAX] = {
[SOCKET_DEAD] = "dead",
[SOCKET_START_PRE] = "start-pre",
.sigchld_event = socket_sigchld_event,
.timer_event = socket_timer_event,
+ .reset_maintenance = socket_reset_maintenance,
+
.bus_message_handler = bus_socket_message_handler
};
~ianmdlvl / elogind.git / blobdiff