giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove readers when smart card service stops 

The code already removes all active cards when the service goes
away, but it doesn't remove the reader. This can be a bit confusing
since they will still be polled and listed.
This commit is contained in:
Pierre Ossman 2019-03-01 15:46:09 +01:00 committed by Martin Paljak
parent 9ed5f63c17
commit bc4eeda573
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/libopensc/reader-pcsc.c
View File

@ -1351,6 +1351,29 @@ static int pcsc_detect_readers(sc_context_t *ctx)
} else {
rv = gpriv->SCardListReaders(gpriv->pcsc_ctx, NULL,
NULL, (LPDWORD) &reader_buf_size);
/*
* All readers have disappeared, so mark them as
* such so we don't keep polling them over and over.
*/
if (
#ifdef SCARD_E_NO_READERS_AVAILABLE
(rv == (LONG)SCARD_E_NO_READERS_AVAILABLE) ||
#endif
(rv == (LONG)SCARD_E_NO_SERVICE) || (rv == (LONG)SCARD_E_SERVICE_STOPPED)) {
for (i = 0; i < sc_ctx_get_reader_count(ctx); i++) {
sc_reader_t *reader = sc_ctx_get_reader(ctx, i);
if (!reader) {
ret = SC_ERROR_INTERNAL;
goto out;
}
reader->flags |= SC_READER_REMOVED;
}
}
if ((rv == (LONG)SCARD_E_NO_SERVICE) || (rv == (LONG)SCARD_E_SERVICE_STOPPED)) {
gpriv->SCardReleaseContext(gpriv->pcsc_ctx);
gpriv->pcsc_ctx = 0;