aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cmd/Makemodule.am2
-rw-r--r--initd/init.h1
-rw-r--r--initd/main.c59
-rw-r--r--lib/Makemodule.am7
-rw-r--r--lib/include/telinit.h38
-rw-r--r--lib/include/util.h10
-rw-r--r--lib/init/opensock.c50
-rw-r--r--lib/util/mksock.c84
8 files changed, 4 insertions, 247 deletions
diff --git a/cmd/Makemodule.am b/cmd/Makemodule.am
index 78692d1..ea25ea8 100644
--- a/cmd/Makemodule.am
+++ b/cmd/Makemodule.am
@@ -2,7 +2,7 @@ shutdown_SOURCES = cmd/shutdown.c
shutdown_CPPFLAGS = $(AM_CPPFLAGS)
shutdown_CFLAGS = $(AM_CFLAGS)
shutdown_LDFLAGS = $(AM_LDFLAGS)
-shutdown_LDADD = libinit.a libutil.a
+shutdown_LDADD = libutil.a
runsvc_SOURCES = cmd/runsvc/runsvc.c cmd/runsvc/env.c cmd/runsvc/runsvc.h
runsvc_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/initd/init.h b/initd/init.h
index 7d525a2..d0acc81 100644
--- a/initd/init.h
+++ b/initd/init.h
@@ -34,7 +34,6 @@
#include <signal.h>
#include "service.h"
-#include "telinit.h"
#include "util.h"
#define RUNSVCBIN SCRIPTDIR "/runsvc"
diff --git a/initd/main.c b/initd/main.c
index b50c09c..64dd7ac 100644
--- a/initd/main.c
+++ b/initd/main.c
@@ -17,7 +17,6 @@
*/
#include "init.h"
-static int ti_sock = -1;
static int sigfd = -1;
static void handle_signal(void)
@@ -49,59 +48,10 @@ static void handle_signal(void)
}
}
-static int read_msg(int fd, ti_msg_t *msg)
-{
- ssize_t ret;
-retry:
- ret = read(fd, msg, sizeof(*msg));
-
- if (ret < 0) {
- if (errno == EINTR)
- goto retry;
- perror("read on telinit socket");
- return -1;
- }
-
- if ((size_t)ret < sizeof(*msg)) {
- fputs("short read on telinit socket", stderr);
- return -1;
- }
-
- return 0;
-}
-
-static void handle_tellinit(void)
-{
- ti_msg_t msg;
- int fd;
-
- fd = accept(ti_sock, NULL, NULL);
- if (fd == -1)
- return;
-
- if (read_msg(fd, &msg)) {
- close(fd);
- return;
- }
-
- switch (msg.type) {
- case TI_SHUTDOWN:
- supervisor_set_target(TGT_SHUTDOWN);
- break;
- case TI_REBOOT:
- supervisor_set_target(TGT_REBOOT);
- break;
- }
-
- close(fd);
-}
-
void target_completed(int target)
{
switch (target) {
case TGT_BOOT:
- if (ti_sock == -1)
- ti_sock = mksock(INITSOCK, SOCK_FLAG_ROOT_ONLY);
break;
case TGT_SHUTDOWN:
for (;;)
@@ -139,20 +89,11 @@ int main(void)
pfd[0].events = POLLIN;
count = 1;
- if (ti_sock != -1) {
- pfd[1].fd = ti_sock;
- pfd[1].events = POLLIN;
- count = 2;
- }
-
ret = poll(pfd, count, -1);
if (ret > 0) {
if (pfd[0].revents & POLLIN)
handle_signal();
-
- if (ti_sock != -1 && pfd[1].revents & POLLIN)
- handle_tellinit();
}
}
diff --git a/lib/Makemodule.am b/lib/Makemodule.am
index 9f22547..11a96e5 100644
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -2,14 +2,13 @@ HEADRS = lib/include/util.h lib/include/service.h lib/include/telinit.h
libinit_a_SOURCES = lib/init/delsvc.c lib/init/svcmap.c lib/init/rdsvc.c
libinit_a_SOURCES += lib/init/svcscan.c lib/init/del_svc_list.c
-libinit_a_SOURCES += lib/init/svc_tsort.c lib/init/opensock.c $(HEADRS)
+libinit_a_SOURCES += lib/init/svc_tsort.c $(HEADRS)
libinit_a_CPPFLAGS = $(AM_CPPFLAGS)
libinit_a_CFLAGS = $(AM_CFLAGS)
libutil_a_SOURCES = lib/util/argv_exec.c lib/util/enum_by_name.c
-libutil_a_SOURCES += lib/util/enum_to_name.c lib/util/mksock.c
-libutil_a_SOURCES += lib/util/print_version.c lib/util/fopenat.c
-libutil_a_SOURCES += lib/include/util.h
+libutil_a_SOURCES += lib/util/enum_to_name.c lib/util/print_version.c
+libutil_a_SOURCES += lib/util/fopenat.c lib/include/util.h
libutil_a_CPPFLAGS = $(AM_CPPFLAGS)
libutil_a_CFLAGS = $(AM_CFLAGS)
diff --git a/lib/include/telinit.h b/lib/include/telinit.h
deleted file mode 100644
index 3a3dd8c..0000000
--- a/lib/include/telinit.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* SPDX-License-Identifier: GPL-3.0-or-later */
-/*
- * Copyright (C) 2018 - David Oberhollenzer
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-#ifndef TELINIT_H
-#define TELINIT_H
-
-#include "config.h"
-
-#define INITSOCK SOCKDIR "/" "initd.socket"
-
-enum {
- TI_SHUTDOWN = 1,
- TI_REBOOT = 2,
-};
-
-typedef struct {
- int type; /* TI_* message type identifier */
-} ti_msg_t;
-
-/* Try to connect to the init socket. */
-int opensock(void);
-
-#endif /* TELINIT_H */
-
diff --git a/lib/include/util.h b/lib/include/util.h
index f300329..ce96ffe 100644
--- a/lib/include/util.h
+++ b/lib/include/util.h
@@ -67,16 +67,6 @@ const enum_map_t *enum_by_name(const enum_map_t *map, const char *name);
*/
const char *enum_to_name(const enum_map_t *map, int value);
-/*
- Create a UNIX stream socket at the given path.
-
- Returns the socket fd, -1 on failure. The function takes care of
- printing error messages on failure.
-
- The socket has the CLOEXEC flag set.
-*/
-int mksock(const char *path, int flags);
-
/* print a default version info and license string */
NORETURN void print_version(const char *program);
diff --git a/lib/init/opensock.c b/lib/init/opensock.c
deleted file mode 100644
index 0c2bf56..0000000
--- a/lib/init/opensock.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* SPDX-License-Identifier: GPL-3.0-or-later */
-/*
- * Copyright (C) 2018 - David Oberhollenzer
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdio.h>
-
-#include "telinit.h"
-
-int opensock(void)
-{
- struct sockaddr_un un;
- int fd;
-
- fd = socket(AF_UNIX, SOCK_STREAM, 0);
- if (fd < 0) {
- perror("socket");
- return -1;
- }
-
- memset(&un, 0, sizeof(un));
- un.sun_family = AF_UNIX;
-
- strcpy(un.sun_path, INITSOCK);
-
- if (connect(fd, (struct sockaddr *)&un, sizeof(un))) {
- perror("connect: " INITSOCK);
- close(fd);
- return -1;
- }
-
- return fd;
-}
diff --git a/lib/util/mksock.c b/lib/util/mksock.c
deleted file mode 100644
index ae46096..0000000
--- a/lib/util/mksock.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* SPDX-License-Identifier: GPL-3.0-or-later */
-/*
- * Copyright (C) 2018 - David Oberhollenzer
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/un.h>
-#include <unistd.h>
-#include <string.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <errno.h>
-
-#include "util.h"
-
-int mksock(const char *path, int flags)
-{
- struct sockaddr_un un;
- const char *errmsg;
- int fd, type;
-
- type = (flags & SOCK_FLAG_DGRAM) ? SOCK_DGRAM : SOCK_STREAM;
-
- fd = socket(AF_UNIX, type | SOCK_CLOEXEC, 0);
- if (fd < 0) {
- perror("socket");
- return -1;
- }
-
- memset(&un, 0, sizeof(un));
- un.sun_family = AF_UNIX;
-
- strcpy(un.sun_path, path);
-
- if (bind(fd, (struct sockaddr *)&un, sizeof(un))) {
- errmsg ="bind";
- goto fail_errno;
- }
-
- if (flags & SOCK_FLAG_ROOT_ONLY) {
- if (chown(path, 0, 0)) {
- errmsg = "chown";
- goto fail_errno;
- }
-
- if (chmod(path, 0770)) {
- errmsg = "chmod";
- goto fail_errno;
- }
- } else if (flags & SOCK_FLAG_EVERYONE) {
- if (chmod(path, 0777)) {
- errmsg = "chmod";
- goto fail_errno;
- }
- }
-
- if (!(flags & SOCK_FLAG_DGRAM)) {
- if (listen(fd, 10)) {
- errmsg = "listen";
- goto fail_errno;
- }
- }
-
- return fd;
-fail_errno:
- fprintf(stderr, "%s: %s: %s\n", path, errmsg, strerror(errno));
- close(fd);
- unlink(path);
- return -1;
-}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 20:49:57 +0000