holm/endlessh
1
1
Fork 0
forked from extern/endlessh
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix up max clients option

Browse Source
This commit is contained in:
Christopher Wellons 2019-02-03 09:36:04 -05:00
parent 66c549c87c
commit 4bd7b1a3ea
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
endlessh.c
View File

@ -264,8 +264,8 @@ main(int argc, char **argv)
{ {
int port = DEFAULT_PORT; int port = DEFAULT_PORT;
int max_length = DEFAULT_LINE_LENGTH; int max_length = DEFAULT_LINE_LENGTH;
int max_clients = DEFAULT_MAX_CLIENTS;
long delay = DEFAULT_DELAY; long delay = DEFAULT_DELAY;
long max_clients = DEFAULT_MAX_CLIENTS;
int option; int option;
while ((option = getopt(argc, argv, "d:hl:m:p:v")) != -1) { while ((option = getopt(argc, argv, "d:hl:m:p:v")) != -1) {
@ -294,8 +294,9 @@ main(int argc, char **argv)
break; break;
case 'm': case 'm':
tmp = strtol(optarg, &end, 10); tmp = strtol(optarg, &end, 10);
if (errno || *end || tmp < 0) { if (errno || *end || tmp < 0 || tmp > INT_MAX) {
fprintf(stderr, "endlessh: Invalid port: %s\n", optarg); fprintf(stderr, "endlessh: Invalid max clients: %s\n",
optarg);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
max_clients = tmp; max_clients = tmp;
@ -321,7 +322,7 @@ main(int argc, char **argv)
struct sigaction sa = {.sa_handler = sigterm_handler}; struct sigaction sa = {.sa_handler = sigterm_handler};
check(sigaction(SIGTERM, &sa, 0)); check(sigaction(SIGTERM, &sa, 0));
long nclients = 0; int nclients = 0;
struct queue queue[1]; struct queue queue[1];
queue_init(queue); queue_init(queue);
@ -385,7 +386,7 @@ main(int argc, char **argv)
case ENFILE: case ENFILE:
max_clients = nclients; max_clients = nclients;
logmsg(LOG_INFO, logmsg(LOG_INFO,
"maximum number of clients reduced to %ld", "maximum number of clients reduced to %d",
nclients); nclients);
break; break;
case ECONNABORTED: case ECONNABORTED:
@ -406,7 +407,7 @@ main(int argc, char **argv)
close(fd); close(fd);
} }
nclients++; nclients++;
logmsg(LOG_INFO, "ACCEPT host=%s:%d fd=%d n=%ld/%ld", logmsg(LOG_INFO, "ACCEPT host=%s:%d fd=%d n=%d/%d",
client->ipaddr, client->port, client->fd, client->ipaddr, client->port, client->fd,
nclients, max_clients); nclients, max_clients);
queue_append(queue, client); queue_append(queue, client);