dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

systemd: do not serialize peer, bump count when deserializing socket instead

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2016-08-04 23:42:27 -04:00
parent 9dfb64f87d
commit 3ebcd323bd
3 changed files with 16 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/service.c
View File

@@ -1041,6 +1041,20 @@ static int service_coldplug(Unit *u) {
if (!IN_SET(s->deserialized_state, SERVICE_DEAD, SERVICE_FAILED, SERVICE_AUTO_RESTART))
(void) unit_setup_dynamic_creds(u);
if (UNIT_ISSET(s->accept_socket)) {
Socket* socket = SOCKET(UNIT_DEREF(s->accept_socket));
if (socket->max_connections_per_source > 0) {
SocketPeer *peer;
/* Make a best-effort attempt at bumping the connection count */
if (socket_acquire_peer(socket, s->socket_fd, &peer) > 0) {
socket_peer_unref(s->peer);
s->peer = peer;
}
}
}
service_set_state(s, s->deserialized_state);
return 0;
}

42
src/core/socket.c
View File

@@ -580,7 +580,7 @@ SocketPeer *socket_peer_unref(SocketPeer *p) {
return mfree(p);
}
static int socket_acquire_peer(Socket *s, int fd, SocketPeer **p) {
int socket_acquire_peer(Socket *s, int fd, SocketPeer **p) {
_cleanup_(socket_peer_unrefp) SocketPeer *remote = NULL;
SocketPeer sa = {}, *i;
socklen_t salen = sizeof(sa.peer);
@@ -2396,9 +2396,7 @@ static int socket_stop(Unit *u) {
static int socket_serialize(Unit *u, FILE *f, FDSet *fds) {
Socket *s = SOCKET(u);
SocketPeer *k;
SocketPort *p;
Iterator i;
int r;
assert(u);
@@ -2449,16 +2447,6 @@ static int socket_serialize(Unit *u, FILE *f, FDSet *fds) {
}
}
SET_FOREACH(k, s->peers_by_address, i) {
_cleanup_free_ char *t = NULL;
r = sockaddr_pretty(&k->peer.sa, FAMILY_ADDRESS_SIZE(k->peer.sa.sa_family), true, true, &t);
if (r < 0)
return r;
unit_serialize_item_format(u, f, "peer", "%u %s", k->n_ref, t);
}
return 0;
}
@@ -2574,7 +2562,6 @@ static int socket_deserialize_item(Unit *u, const char *key, const char *value,
if (sscanf(value, "%i %i %n", &fd, &type, &skip) < 2 || fd < 0 || type < 0 || !fdset_contains(fds, fd))
log_unit_debug(u, "Failed to parse socket value: %s", value);
else {
LIST_FOREACH(port, p, s->ports)
if (socket_address_is(&p->address, value+skip, type))
break;
@@ -2622,33 +2609,6 @@ static int socket_deserialize_item(Unit *u, const char *key, const char *value,
}
}
} else if (streq(key, "peer")) {
_cleanup_(socket_peer_unrefp) SocketPeer *p;
int n_ref, skip = 0;
SocketAddress a;
int r;
if (sscanf(value, "%u %n", &n_ref, &skip) < 1 || n_ref < 1)
log_unit_debug(u, "Failed to parse socket peer value: %s", value);
else {
r = socket_address_parse(&a, value+skip);
if (r < 0)
return r;
p = socket_peer_new();
if (!p)
return log_oom();
p->n_ref = n_ref;
memcpy(&p->peer, &a.sockaddr, sizeof(a.sockaddr));
p->socket = s;
r = set_put(s->peers_by_address, p);
if (r < 0)
return r;
p = NULL;
}
} else
log_unit_debug(UNIT(s), "Unknown serialization key: %s", key);

1
src/core/socket.h
View File

@@ -170,6 +170,7 @@ struct Socket {
SocketPeer *socket_peer_ref(SocketPeer *p);
SocketPeer *socket_peer_unref(SocketPeer *p);
int socket_acquire_peer(Socket *s, int fd, SocketPeer **p);
DEFINE_TRIVIAL_CLEANUP_FUNC(SocketPeer*, socket_peer_unref);