[systemd-commits] 5 commits - fixme src/execute.c src/initctl.c src/job.c src/logger.c src/sd-daemon.c src/sd-daemon.h src/service.c src/unit.c
Lennart Poettering
lennart at kemper.freedesktop.org
Wed May 19 16:21:46 PDT 2010
fixme | 11 ---
src/execute.c | 17 ++---
src/initctl.c | 16 ++++-
src/job.c | 5 -
src/logger.c | 18 +++++
src/sd-daemon.c | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
src/sd-daemon.h | 42 +++++++++++++
src/service.c | 7 --
src/unit.c | 12 ++-
9 files changed, 270 insertions(+), 33 deletions(-)
New commits:
commit ecc6e2b84976d0930c4340e202d1de5542092d7c
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu May 20 01:21:38 2010 +0200
logger: add an after dependency on the syslog dependency
diff --git a/src/unit.c b/src/unit.c
index bcb95b2..012edd4 100644
--- a/src/unit.c
+++ b/src/unit.c
@@ -534,7 +534,10 @@ int unit_add_exec_dependencies(Unit *u, ExecContext *c) {
assert(u);
assert(c);
- if (c->std_output != EXEC_OUTPUT_KMSG && c->std_output != EXEC_OUTPUT_SYSLOG)
+ if (c->std_output != EXEC_OUTPUT_KMSG &&
+ c->std_output != EXEC_OUTPUT_SYSLOG &&
+ c->std_error != EXEC_OUTPUT_KMSG &&
+ c->std_error != EXEC_OUTPUT_SYSLOG)
return 0;
/* If syslog or kernel logging is requested, make sure our own
commit d5159713c13859a7d472625ddaa9f9cc4c546236
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu May 20 01:14:43 2010 +0200
service: when we cannot start due to rate limÃt consider that a real failure
diff --git a/src/service.c b/src/service.c
index 3e2a499..ac83862 100644
--- a/src/service.c
+++ b/src/service.c
@@ -1708,7 +1708,7 @@ static int service_start(Unit *u) {
/* Make sure we don't enter a busy loop of some kind. */
if (!ratelimit_test(&s->ratelimit)) {
log_warning("%s start request repeated too quickly, refusing to start.", u->meta.id);
- return -EAGAIN;
+ return -ECANCELED;
}
s->failure = false;
diff --git a/src/unit.c b/src/unit.c
index 8f0b077..bcb95b2 100644
--- a/src/unit.c
+++ b/src/unit.c
@@ -735,9 +735,10 @@ fail:
}
/* Errors:
- * -EBADR: This unit type does not support starting.
- * -EALREADY: Unit is already started.
- * -EAGAIN: An operation is already in progress. Retry later.
+ * -EBADR: This unit type does not support starting.
+ * -EALREADY: Unit is already started.
+ * -EAGAIN: An operation is already in progress. Retry later.
+ * -ECANCELED: Too many requests for now.
*/
int unit_start(Unit *u) {
UnitActiveState state;
commit 9eb63b3cb4a41707b6c01d81cef15acf1a757613
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu May 20 01:14:09 2010 +0200
job: don't show (null) prefix in dump
diff --git a/src/job.c b/src/job.c
index 887de92..9937ed7 100644
--- a/src/job.c
+++ b/src/job.c
@@ -144,11 +144,12 @@ void job_dependency_delete(Job *subject, Job *object, bool *matters) {
}
void job_dump(Job *j, FILE*f, const char *prefix) {
-
-
assert(j);
assert(f);
+ if (!prefix)
+ prefix = "";
+
fprintf(f,
"%s-> Job %u:\n"
"%s\tAction: %s -> %s\n"
commit 7c394faa38de389638e19b19212ed50aca870e3c
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu May 20 01:13:43 2010 +0200
sd-daemon: add API to verify socket types
diff --git a/src/initctl.c b/src/initctl.c
index 9d8ecee..407d32d 100644
--- a/src/initctl.c
+++ b/src/initctl.c
@@ -280,6 +280,20 @@ static int server_init(Server *s, unsigned n_sockets) {
for (i = 0; i < n_sockets; i++) {
struct epoll_event ev;
Fifo *f;
+ int fd;
+
+ fd = SD_LISTEN_FDS_START+i;
+
+ if ((r = sd_is_fifo(fd, NULL)) < 0) {
+ log_error("Failed to determine file descriptor type: %s", strerror(-r));
+ goto fail;
+ }
+
+ if (!r) {
+ log_error("Wrong file descriptor type.");
+ r = -EINVAL;
+ goto fail;
+ }
if (!(f = new0(Fifo, 1))) {
r = -ENOMEM;
@@ -292,7 +306,7 @@ static int server_init(Server *s, unsigned n_sockets) {
zero(ev);
ev.events = EPOLLIN;
ev.data.ptr = f;
- if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, SD_LISTEN_FDS_START+i, &ev) < 0) {
+ if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, fd, &ev) < 0) {
r = -errno;
fifo_free(f);
log_error("Failed to add fifo fd to epoll object: %s", strerror(errno));
diff --git a/src/logger.c b/src/logger.c
index e7c2be0..c486a8a 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -424,11 +424,25 @@ static int server_init(Server *s, unsigned n_sockets) {
for (i = 0; i < n_sockets; i++) {
struct epoll_event ev;
+ int fd;
+
+ fd = SD_LISTEN_FDS_START+i;
+
+ if ((r = sd_is_socket(fd, SOCK_STREAM, 1)) < 0) {
+ log_error("Failed to determine file descriptor type: %s", strerror(-r));
+ goto fail;
+ }
+
+ if (!r) {
+ log_error("Wrong file descriptor type.");
+ r = -EINVAL;
+ goto fail;
+ }
zero(ev);
ev.events = EPOLLIN;
- ev.data.ptr = UINT_TO_PTR(SD_LISTEN_FDS_START+i);
- if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, SD_LISTEN_FDS_START+i, &ev) < 0) {
+ ev.data.ptr = UINT_TO_PTR(fd);
+ if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, fd, &ev) < 0) {
r = -errno;
log_error("Failed to add server fd to epoll object: %s", strerror(errno));
goto fail;
diff --git a/src/sd-daemon.c b/src/sd-daemon.c
index cc972da..8a7c9e8 100644
--- a/src/sd-daemon.c
+++ b/src/sd-daemon.c
@@ -24,10 +24,15 @@
SOFTWARE.
***/
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <netinet/in.h>
#include <stdlib.h>
#include <errno.h>
-#include <sys/types.h>
#include <unistd.h>
+#include <string.h>
#include "sd-daemon.h"
@@ -94,3 +99,171 @@ finish:
return r;
#endif
}
+
+int sd_is_fifo(int fd, const char *path) {
+ struct stat st_fd;
+
+ if (fd < 0)
+ return -EINVAL;
+
+ memset(&st_fd, 0, sizeof(st_fd));
+ if (fstat(fd, &st_fd) < 0)
+ return -errno;
+
+ if (!S_ISFIFO(st_fd.st_mode))
+ return 0;
+
+ if (path) {
+ struct stat st_path;
+
+ memset(&st_path, 0, sizeof(st_path));
+ if (fstat(fd, &st_path) < 0) {
+
+ if (errno == ENOENT || errno == ENOTDIR)
+ return 0;
+
+ return -errno;
+ }
+
+ return
+ st_path.st_dev == st_fd.st_dev &&
+ st_path.st_ino == st_fd.st_ino;
+ }
+
+ return 1;
+}
+
+int sd_is_socket(int fd, int type, int listening) {
+ struct stat st_fd;
+
+ if (fd < 0 || type < 0)
+ return -EINVAL;
+
+ if (fstat(fd, &st_fd) < 0)
+ return -errno;
+
+ if (!S_ISSOCK(st_fd.st_mode))
+ return 0;
+
+ if (type != 0) {
+ int other_type = 0;
+ socklen_t l = sizeof(other_type);
+
+ if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &other_type, &l) < 0)
+ return -errno;
+
+ if (l != sizeof(other_type))
+ return -EINVAL;
+
+ if (other_type != type)
+ return 0;
+ }
+
+ if (listening >= 0) {
+ int accepting = 0;
+ socklen_t l = sizeof(accepting);
+
+ if (getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, &accepting, &l) < 0)
+ return -errno;
+
+ if (l != sizeof(accepting))
+ return -EINVAL;
+
+ if (!accepting == !listening)
+ return 0;
+ }
+
+ return 1;
+}
+
+int sd_is_socket_inet(int fd, int type, int listening, uint16_t port) {
+ union {
+ struct sockaddr sa;
+ struct sockaddr_in in4;
+ struct sockaddr_in6 in6;
+ struct sockaddr_un un;
+ struct sockaddr_storage storage;
+ } sockaddr;
+ socklen_t l;
+ int r;
+
+ if ((r = sd_is_socket(fd, type, listening)) <= 0)
+ return r;
+
+ memset(&sockaddr, 0, sizeof(sockaddr));
+ l = sizeof(sockaddr);
+
+ if (getsockname(fd, &sockaddr.sa, &l) < 0)
+ return -errno;
+
+ if (l < sizeof(struct sockaddr))
+ return -EINVAL;
+
+ if (sockaddr.sa.sa_family != AF_INET &&
+ sockaddr.sa.sa_family != AF_INET6)
+ return 0;
+
+ if (port > 0) {
+ if (sockaddr.sa.sa_family == AF_INET) {
+ if (l < sizeof(struct sockaddr_in))
+ return -EINVAL;
+
+ return htons(port) == sockaddr.in4.sin_port;
+ } else {
+ if (l < sizeof(struct sockaddr_in6))
+ return -EINVAL;
+
+ return htons(port) == sockaddr.in6.sin6_port;
+ }
+ }
+
+ return 1;
+}
+
+int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length) {
+ union {
+ struct sockaddr sa;
+ struct sockaddr_in in4;
+ struct sockaddr_in6 in6;
+ struct sockaddr_un un;
+ struct sockaddr_storage storage;
+ } sockaddr;
+ socklen_t l;
+ int r;
+
+ if ((r = sd_is_socket(fd, type, listening)) <= 0)
+ return r;
+
+ memset(&sockaddr, 0, sizeof(sockaddr));
+ l = sizeof(sockaddr);
+
+ if (getsockname(fd, &sockaddr.sa, &l) < 0)
+ return -errno;
+
+ if (l < sizeof(sa_family_t))
+ return -EINVAL;
+
+ if (sockaddr.sa.sa_family != AF_UNIX)
+ return 0;
+
+ if (path) {
+ if (length <= 0)
+ length = strlen(path);
+
+ if (length <= 0)
+ /* Unnamed socket */
+ return l == sizeof(sa_family_t);
+
+ if (l < sizeof(sa_family_t) + length + 1)
+ return 0;
+
+ if (path[0])
+ /* Normal path socket */
+ return memcmp(path, sockaddr.un.sun_path, length+1) == 0;
+ else
+ /* Abstract namespace socket */
+ return memcmp(path, sockaddr.un.sun_path+1, length) == 0;
+ }
+
+ return 1;
+}
diff --git a/src/sd-daemon.h b/src/sd-daemon.h
index c7f5c1d..b7100bc 100644
--- a/src/sd-daemon.h
+++ b/src/sd-daemon.h
@@ -27,6 +27,8 @@
SOFTWARE.
***/
+#include <inttypes.h>
+
/* Reference implementation of a few systemd related interfaces for
* writing daemons. These interfaces are trivial to implement, however
* to simplify porting we provide this reference
@@ -55,7 +57,45 @@
/* Returns how many file descriptors have been passed, or a negative
* errno code on failure. Optionally removes the $LISTEN_FDS and
- * $LISTEN_PID file descriptors from the environment (recommended). */
+ * $LISTEN_PID file descriptors from the environment
+ * (recommended). You'll find the file descriptors passed as fds
+ * SD_LISTEN_FDS_START to SD_LISTEN_FDS_START+r-1 if r is the return
+ * value of this functioin. Returns a negative errno style error code
+ * on failure. */
int sd_listen_fds(int unset_environment);
+/* Helper call for identifying a passed file descriptor. Returns 1 if
+ * the file descriptor is a FIFO in the file system stored under the
+ * specified path, 0 otherwise. If path is NULL a path name check will
+ * not be done and the call only verifies if the file descriptor
+ * refers to a FIFO. Returns a negative errno style error code on
+ * failure. */
+int sd_is_fifo(int fd, const char *path);
+
+/* Helper call for identifying a passed file descriptor. Returns 1 if
+ * the file descriptor is a socket of the specified type (SOCK_DGRAM,
+ * SOCK_STREAM, ...), 0 otherwise. If type is 0 a socket type check
+ * will not be done and the call only verifies if the file descriptor
+ * refers to a socket. Returns a negative errno style error code on
+ * failure. */
+int sd_is_socket(int fd, int type, int listening);
+
+/* Helper call for identifying a passed file descriptor. Returns 1 if
+ * the file descriptor is an Internet socket (either AF_INET or
+ * AF_INET6) of the specified type (SOCK_DGRAM, SOCK_STREAM, ...), 0
+ * otherwise. If type is 0 a socket type check will not be done. If
+ * port is 0 a socket port check will not be done. Returns a negative
+ * errno style error code on failure. */
+int sd_is_socket_inet(int fd, int type, int listening, uint16_t port);
+
+/* Helper call for identifying a passed file descriptor. Returns 1 if
+ * the file descriptor is an AF_UNIX socket of the specified type
+ * (SOCK_DGRAM, SOCK_STREAM, ...) and path, 0 otherwise. If type is 0
+ * a socket type check will not be done. If path is NULL a socket path
+ * check will not be done. For normal AF_UNIX sockets set length to
+ * 0. For abstract namespace sockets set length to the length of the
+ * socket name (excluding the initial 0 byte). Returns a negative
+ * errno style error code on failure. */
+int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length);
+
#endif
commit ff876e283a61320b718ec752d93b1fd40a5fdd0c
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu May 20 01:08:13 2010 +0200
execute: reopen console in the spawned processes, if necessary
diff --git a/fixme b/fixme
index 0894c47..0c04ab8 100644
--- a/fixme
+++ b/fixme
@@ -9,6 +9,9 @@
* implicitly import "defaults" settings file into all types
* write .service file install tool
+ [Install]
+ WantedBy=graphical.target
+ Names=prefdm.service
* service startup should be delayed if the matching socket is being started
@@ -18,16 +21,10 @@
* bootchart hookup
-* dbus.service and syslog.service should be symlinked not ifdef to the right distro-specific names
-
* reinvestigate random seed, hwclock
-* rework sysv stuff to have SPECIAL_SYSV_BEFORE, SPECIAL_SYSV_AFTER instead SPECIAL_RCSYSINIT
-
* introduce serialized mode
-* when refusing start due to ratelimit, enter restart state
-
* "disabled" load state?
* uid are 32bit
@@ -38,8 +35,6 @@
* iCalendar semantics for the timer stuff (RFC2445)
-* autofs für /dev/mqueue usw.
-
* provide sysv-like command line utilities
* Add OnlyByDependency
diff --git a/src/execute.c b/src/execute.c
index f3cf026..53f6d9a 100644
--- a/src/execute.c
+++ b/src/execute.c
@@ -301,10 +301,15 @@ static int setup_output(const ExecContext *context, int socket_fd, const char *i
case EXEC_OUTPUT_INHERIT:
/* If the input is connected to a terminal, inherit that... */
- if (is_terminal_input(i) || i == EXEC_INPUT_SOCKET)
+ if (i != EXEC_INPUT_NULL)
return dup2(STDIN_FILENO, STDOUT_FILENO) < 0 ? -errno : STDOUT_FILENO;
- return STDIN_FILENO;
+ /* For PID 1 stdout is always connected to /dev/null,
+ * hence reopen the console if necessary. */
+ if (getpid() == 1)
+ return open_terminal_as(tty_path(context), O_WRONLY, STDOUT_FILENO);
+
+ return STDOUT_FILENO;
case EXEC_OUTPUT_NULL:
return open_null_as(O_WRONLY, STDOUT_FILENO);
@@ -346,7 +351,8 @@ static int setup_error(const ExecContext *context, int socket_fd, const char *id
* the way and are not on a tty */
if (e == EXEC_OUTPUT_INHERIT &&
o == EXEC_OUTPUT_INHERIT &&
- !is_terminal_input(i))
+ i != EXEC_INPUT_NULL &&
+ getpid () != 1)
return STDERR_FILENO;
/* Duplicate form stdout if possible */
@@ -1076,11 +1082,6 @@ void exec_context_init(ExecContext *c) {
c->cpu_sched_policy = SCHED_OTHER;
c->syslog_priority = LOG_DAEMON|LOG_INFO;
c->mount_flags = MS_SHARED;
-
- c->std_input = EXEC_INPUT_NULL;
- c->std_output = c->std_error =
- (log_get_target() == LOG_TARGET_CONSOLE ? EXEC_OUTPUT_INHERIT :
- log_get_target() == LOG_TARGET_KMSG ? EXEC_OUTPUT_KMSG : EXEC_OUTPUT_SYSLOG);
}
void exec_context_done(ExecContext *c) {
diff --git a/src/service.c b/src/service.c
index 2fcb304..3e2a499 100644
--- a/src/service.c
+++ b/src/service.c
@@ -632,11 +632,6 @@ static int service_load_sysv_path(Service *s, const char *path) {
s->valid_no_process = true;
s->kill_mode = KILL_PROCESS_GROUP;
- /* For SysV services log output should go to the console */
- s->exec_context.std_input = EXEC_INPUT_NULL;
- s->exec_context.std_output = EXEC_OUTPUT_TTY;
- s->exec_context.std_error = EXEC_OUTPUT_TTY;
-
u->meta.load_state = UNIT_LOADED;
r = 0;
More information about the systemd-commits
mailing list