Hand listening sockets over on a reload

A service's TCP listening socket is kept as a listener: when a reload
commits, before the old services are told to stop, each new service
takes over the listener of an older configuration's service on the same
address, port, network namespace and device with the same -ol options.
It skips socket() and bind(), calling only listen() again for its own
backlog, and logs "Accepting connections, taken over". The old service
stops accepting at its next poll and lets go of the socket; whoever
lets go last closes it, unlinking a Unix socket's path.

So a service staying where it was no longer leaves a gap: before, the
old one closed its socket and the new one opened another, and a
connection queued on the old socket was reset. UDP services, whose
clients read from the service's socket, and two services of the same
configuration on one address keep their own sockets as before.

A test case makes requests nonstop through three reloads and wants none
refused or reset; against the build before this, connections were
reset. The reload case no longer waits out the switch. SIGUSR1 in
3proxy(8) describes how a reload behaves now.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Vladimir DubrovinandClaude Opus 5.5 committed 2026-10-14 22:14:04 +03:00
1 parent 06ba6570f8
commit 3520e6e7cf
9 files changed
+256 -8

No files matched your search

+4 -1
View File
@@ -86,6 +86,7 @@ struct trafvalue * trafvalue(unsigned number){
int mainprepare(int argc, char** argv, void **service);
int mainrun(void *service);
void maindrop(void *service);
void mainclaim(void *service);
struct proxydef childdef = {NULL, 0, 0, S_NOSERVICE, ""};
@@ -2638,7 +2639,9 @@ int reload (void){
runconf = new;
_3proxy_mutex_unlock(&confref_mutex);
resolvfunc = new->resolvfunc;
/* the old services stop accepting, the new ones start */
/* the new services take over the listening sockets of the old ones on
the same addresses, which then stop accepting, and start */
for(d = deferred; d; d = d->next) mainclaim(d->service);
old->paused++;
while((d = deferred)){
deferred = d->next;