nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-04-19 03:58:05 -05:00
Code Issues Projects Releases Wiki Activity

Uppity: add a --listen-once option.

Browse Source 
This modifies 'uppity --listen' so that it closes the listening socket
after the first connection comes in.
This commit is contained in:
Simon Tatham 2019-03-31 09:27:47 +01:00
parent 443ad75a81
commit d990dfc395
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
unix/uxserver.c
View File

@ -323,14 +323,14 @@ static void show_version_and_exit(void)
const bool buildinfo_gtk_relevant = false; const bool buildinfo_gtk_relevant = false;
static bool listening = false; static bool listening = false, listen_once = false;
static bool finished = false; static bool finished = false;
void server_instance_terminated(LogPolicy *lp) void server_instance_terminated(LogPolicy *lp)
{ {
struct server_instance *inst = container_of( struct server_instance *inst = container_of(
lp, struct server_instance, logpolicy); lp, struct server_instance, logpolicy);
if (listening) { if (listening && !listen_once) {
log_to_stderr(inst->id, "connection terminated"); log_to_stderr(inst->id, "connection terminated");
} else { } else {
finished = true; finished = true;
@ -389,6 +389,7 @@ struct server_config {
unsigned next_id; unsigned next_id;
Socket *listening_socket;
Plug listening_plug; Plug listening_plug;
}; };
@ -429,6 +430,13 @@ static int server_accepting(Plug *p, accept_fn_t constructor, accept_ctx_t ctx)
struct server_instance *inst; struct server_instance *inst;
if (listen_once) {
if (!cfg->listening_socket) /* in case of rapid double-accept */
return 1;
sk_close(cfg->listening_socket);
cfg->listening_socket = NULL;
}
unsigned old_next_id = cfg->next_id; unsigned old_next_id = cfg->next_id;
Plug *plug = server_conn_plug(cfg, &inst); Plug *plug = server_conn_plug(cfg, &inst);
@ -514,6 +522,8 @@ int main(int argc, char **argv)
verbose = true; verbose = true;
} else if (longoptarg(arg, "--listen", &val, &argc, &argv)) { } else if (longoptarg(arg, "--listen", &val, &argc, &argv)) {
listen_port = atoi(val); listen_port = atoi(val);
} else if (!strcmp(arg, "--listen-once")) {
listen_once = true;
} else if (longoptarg(arg, "--hostkey", &val, &argc, &argv)) { } else if (longoptarg(arg, "--hostkey", &val, &argc, &argv)) {
Filename *keyfile; Filename *keyfile;
int keytype; int keytype;
@ -711,8 +721,8 @@ int main(int argc, char **argv)
if (listen_port >= 0) { if (listen_port >= 0) {
listening = true; listening = true;
scfg.listening_plug.vt = &server_plugvt; scfg.listening_plug.vt = &server_plugvt;
sk_newlistener(NULL, listen_port, &scfg.listening_plug, scfg.listening_socket = sk_newlistener(
true, ADDRTYPE_UNSPEC); NULL, listen_port, &scfg.listening_plug, true, ADDRTYPE_UNSPEC);
} else { } else {
Plug *plug = server_conn_plug(&scfg, NULL); Plug *plug = server_conn_plug(&scfg, NULL);
ssh_server_start(plug, make_fd_socket(0, 1, -1, plug)); ssh_server_start(plug, make_fd_socket(0, 1, -1, plug));