Changeset 3488

Timestamp:

04/22/08 18:52:14 (9 months ago)

Author:

alonbl

Message:

Survive pcscd restart

Files:

• branches/alonbl/pnp/src/libopensc/reader-pcsc.c (modified) (3 diffs)

branches/alonbl/pnp/src/libopensc/reader-pcsc.c

@@ -761 +761 @@
         gpriv->enable_pinpad = 0;
         gpriv->provider_library = DEFAULT_PCSC_PROVIDER;
+        gpriv->pcsc_ctx = -1;
         
         conf_block = sc_get_conf_block(ctx, "reader_driver", "pcsc", 1);
@@ -826 +827 @@
         }
 
-        rv = gpriv->SCardEstablishContext(SCARD_SCOPE_USER,
-                              NULL, NULL, &gpriv->pcsc_ctx);
-        if (rv != SCARD_S_SUCCESS) {
-                ret = pcsc_ret_to_error(rv);
-                goto out;
-        }
-
         *reader_data = gpriv;
         gpriv = NULL;
@@ -871 +865 @@
         const char *mszGroups = NULL;
         int ret = SC_ERROR_INTERNAL;
-
-        rv = gpriv->SCardListReaders(gpriv->pcsc_ctx, NULL, NULL,
-                              (LPDWORD) &reader_buf_size);
-        if (rv != SCARD_S_SUCCESS) {
-                ret = pcsc_ret_to_error(rv);
+        int again;
+
+        if (!priv) {
+                ret = SC_ERROR_NO_READERS_FOUND;
                 goto out;
         }
+
+        do {
+                rv = gpriv->SCardListReaders(gpriv->pcsc_ctx, NULL, NULL,
+                                      (LPDWORD) &reader_buf_size);
+                if (rv != SCARD_S_SUCCESS) {
+                        if (rv != SCARD_E_INVALID_HANDLE) {
+                                ret = pcsc_ret_to_error(rv);
+                                goto out;
+                        }
+
+                        rv = gpriv->SCardEstablishContext(SCARD_SCOPE_USER,
+                                              NULL, NULL, &gpriv->pcsc_ctx);
+                        if (rv != SCARD_S_SUCCESS) {
+                                ret = pcsc_ret_to_error(rv);
+                                goto out;
+                        }
+
+                        rv = SCARD_E_INVALID_HANDLE;
+                }
+        } while (rv != SCARD_S_SUCCESS);
 
         reader_buf = (char *) malloc(sizeof(char) * reader_buf_size);