53 lines
2.2 KiB
Diff
53 lines
2.2 KiB
Diff
|
From 8f280216e052c9b9937ba77fad6659fb727535d9 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Mike Yuan <me@yhndnzj.com>
|
||
|
|
Date: Mon, 17 Jun 2024 07:47:20 +0200
|
||
|
|
Subject: [PATCH] core/service: fix accept-socket deserialization
|
||
|
|
|
||
|
|
Follow-up for 45b1017488cef2a5bacdf82028ce900a311c9a1c
|
||
|
|
|
||
|
|
(cherry picked from commit 9f5d8c3da4f505346bd1edfae907a2abcdbdc578)
|
||
|
|
(cherry picked from commit f7d55cc801611781fbff2817f2fd4a16ec96ca85)
|
||
|
|
(cherry picked from commit 8ead2545bf86bd0fe00b344506e071390ffaa99f)
|
||
|
|
|
||
|
|
Conflict:there is no macro definition ASSERT_PTR, so we use the assert function instead
|
||
|
|
Reference:https://github.com/systemd/systemd-stable/commit/8f280216e052c9b9937ba77fad6659fb727535d9
|
||
|
|
---
|
||
|
|
src/core/service.c | 7 ++++---
|
||
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/core/service.c b/src/core/service.c
|
||
|
|
index de07cde..64bfe17 100644
|
||
|
|
--- a/src/core/service.c
|
||
|
|
+++ b/src/core/service.c
|
||
|
|
@@ -1237,7 +1237,7 @@ static int service_coldplug(Unit *u) {
|
||
|
|
service_start_watchdog(s);
|
||
|
|
|
||
|
|
if (UNIT_ISSET(s->accept_socket)) {
|
||
|
|
- Socket* socket = SOCKET(UNIT_DEREF(s->accept_socket));
|
||
|
|
+ Socket *socket = SOCKET(UNIT_DEREF(s->accept_socket));
|
||
|
|
|
||
|
|
if (socket->max_connections_per_source > 0) {
|
||
|
|
SocketPeer *peer;
|
||
|
|
@@ -2948,8 +2948,8 @@ static int service_deserialize_item(Unit *u, const char *key, const char *value,
|
||
|
|
} else if (streq(key, "accept-socket")) {
|
||
|
|
Unit *socket;
|
||
|
|
|
||
|
|
- if (u->type != UNIT_SOCKET) {
|
||
|
|
- log_unit_debug(u, "Failed to deserialize accept-socket: unit is not a socket");
|
||
|
|
+ if (unit_name_to_type(value) != UNIT_SOCKET) {
|
||
|
|
+ log_unit_debug(u, "Deserialized accept-socket is not a socket unit, ignoring: %s", value);
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -2958,6 +2958,7 @@ static int service_deserialize_item(Unit *u, const char *key, const char *value,
|
||
|
|
log_unit_debug_errno(u, r, "Failed to load accept-socket unit '%s': %m", value);
|
||
|
|
else {
|
||
|
|
unit_ref_set(&s->accept_socket, u, socket);
|
||
|
|
+ assert(SOCKET(socket));
|
||
|
|
SOCKET(socket)->n_connections++;
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.33.0
|
||
|
|
|