mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
scd: Fix regression tracking the connection count.
* scd/scdaemon.c (get_active_connection_count): New.
(start_connection_thread): Bump ACTIVE_CONNECTIONS up and down.
* scd/command.c (cmd_getinfo): Add subcommand "connections".
--
Apply gpg-agent change to scdaemon. See the commit in 2016-08-06:
40d16029ed
Then, add kicking the loop, so that main loop can notice the change of
the connection.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
parent
2e78aa6ff7
commit
8ddc9268f6
3 changed files with 41 additions and 24 deletions
|
@ -1150,6 +1150,8 @@ start_connection_thread (void *arg)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
active_connections++;
|
||||
|
||||
scd_init_default_ctrl (ctrl);
|
||||
if (opt.verbose)
|
||||
log_info (_("handler for fd %d started\n"),
|
||||
|
@ -1169,6 +1171,10 @@ start_connection_thread (void *arg)
|
|||
|
||||
scd_deinit_default_ctrl (ctrl);
|
||||
xfree (ctrl);
|
||||
|
||||
if (--active_connections == 0)
|
||||
scd_kick_the_loop ();
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
@ -1349,3 +1355,10 @@ handle_connections (int listen_fd)
|
|||
log_info (_("%s %s stopped\n"), strusage(11), strusage(13));
|
||||
npth_attr_destroy (&tattr);
|
||||
}
|
||||
|
||||
/* Return the number of active connections. */
|
||||
int
|
||||
get_active_connection_count (void)
|
||||
{
|
||||
return active_connections;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue