third-party-mirrors/sslh
1
0 Fork 0
mirror of https://github.com/yrutschle/sslh.git synced 2026-10-22 18:12:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

sslh-fork: apply the active listener's configuration, not listener 0's

Browse Source 
tcp_listener() accepts on endpoint[active_endpoint] but then used
endpoint-> - the base of the array, i.e. endpoint[0] - for the
connection counter, the max_connections limit, SIGCHLD accounting and
start_shoveler(). With several listen addresses, every listener
process therefore:

- enforces listener 0's max_connections (verified: a listener with
  limit 100 drops its second connection when listener 0 has limit 1),
- and passes listener 0's endpoint_cfg to children, so e.g. the
  proxyprotocol flag of listener 0 decides whether a PROXY header is
  expected on sockets accepted by other listeners.

Use a pointer to the active endpoint throughout the loop.
This commit is contained in:
Stefan Meinecke authored and Yves Rutschle committed 2026-10-18 22:26:58 +02:00
1 parent bbc4f91f68
commit 91736dbd17
1 file changed
+9 -8
Download Patch File Download Diff File Expand all files Collapse all files
sslh-fork.c
+9 -8
View File
@@ -224,9 +224,10 @@ static void process_signals(struct listen_endpoint* endpoint)
void tcp_listener(struct listen_endpoint* endpoint, int num_endpoints, int active_endpoint)
{
int i, in_socket;
struct listen_endpoint* self = &endpoint[active_endpoint];
while (1) {
in_socket = accept(endpoint[active_endpoint].socketfd, 0, 0);
in_socket = accept(self->socketfd, 0, 0);
if (in_socket == -1) {
print_message(msg_system_error, "%s:%d:%s:%d:%s\n",
__FILE__, __LINE__, "accept", errno, strerror(errno));
@@ -243,20 +244,20 @@ void tcp_listener(struct listen_endpoint* endpoint, int num_endpoints, int activ
continue;
case EINTR:
process_signals(endpoint);
process_signals(self);
continue;
default: /* Otherwise, it's something wrong in our parameters, we fail */
return;
}
}
endpoint->num_connections++;
print_message(msg_fd, "accepted fd %d (%d concurrent connections)\n", in_socket, endpoint->num_connections);
if ((endpoint->endpoint_cfg->max_connections_is_present)
&& (endpoint->num_connections > endpoint->endpoint_cfg->max_connections))
self->num_connections++;
print_message(msg_fd, "accepted fd %d (%d concurrent connections)\n", in_socket, self->num_connections);
if ((self->endpoint_cfg->max_connections_is_present)
&& (self->num_connections > self->endpoint_cfg->max_connections))
{
print_message(msg_fd, "too many connection, reclosing fd %d\n", in_socket);
endpoint->num_connections--;
self->num_connections--;
close(in_socket);
continue;
}
@@ -269,7 +270,7 @@ void tcp_listener(struct listen_endpoint* endpoint, int num_endpoints, int activ
/* Shoveler processes don't need to hog file descriptors */
for (i = 0; i < num_endpoints; i++)
close(endpoint[i].socketfd);
start_shoveler(in_socket, endpoint);
start_shoveler(in_socket, self);
exit(0);
default: /* In parent process */