diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2021-11-03 14:59:38 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2021-11-03 14:59:38 +0000 |
| commit | 4a2ff12064c624e1e5758b1821b70cadf3769a4e (patch) | |
| tree | fe16c6c004655d51e7fd8c57ce41abaf4b32775c /usr.sbin/rpki-client/rsync.c | |
| parent | e6757c2675e420f19d405387e486a6319781e4ab (diff) | |
Limit the number of rsync processes being spawned by stopping to accept
new requests when over the limit. Use a generous limit of 16.
OK deraadt@
Diffstat (limited to 'usr.sbin/rpki-client/rsync.c')
| -rw-r--r-- | usr.sbin/rpki-client/rsync.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/usr.sbin/rpki-client/rsync.c b/usr.sbin/rpki-client/rsync.c index bc711f143ef..14dbd26cc53 100644 --- a/usr.sbin/rpki-client/rsync.c +++ b/usr.sbin/rpki-client/rsync.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsync.c,v 1.29 2021/10/28 13:50:29 job Exp $ */ +/* $OpenBSD: rsync.c,v 1.30 2021/11/03 14:59:37 claudio Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -119,7 +119,7 @@ proc_child(int signal) void proc_rsync(char *prog, char *bind_addr, int fd) { - size_t i, idsz = 0; + size_t i, idsz = 0, nprocs = 0; int rc = 0; struct pollfd pfd; struct msgbuf msgq; @@ -186,7 +186,9 @@ proc_rsync(char *prog, char *bind_addr, int fd) pid_t pid; int st; - pfd.events = POLLIN; + pfd.events = 0; + if (nprocs < MAX_RSYNC_PROCESSES) + pfd.events |= POLLIN; if (msgq.queued) pfd.events |= POLLOUT; @@ -228,6 +230,7 @@ proc_rsync(char *prog, char *bind_addr, int fd) ids[i].uri = NULL; ids[i].pid = 0; ids[i].id = 0; + nprocs--; } if (pid == -1 && errno != ECHILD) err(1, "waitpid"); @@ -314,6 +317,7 @@ proc_rsync(char *prog, char *bind_addr, int fd) ids[i].id = id; ids[i].pid = pid; ids[i].uri = uri; + nprocs++; /* Clean up temporary values. */ |