Changeset 3506 for trunk/src/libopensc/ctx.c

Timestamp:

04/29/08 19:01:19 (7 months ago)

Author:

alonbl

Message:

Plug&Play support

This is not the best solution, but focus on smallest code change.

Changes:

1. Add detect_readers() to reader opts, this adds new readers to the end

of the readers list until list is full.

2. Add sc_ctx_detect_readers() that calls readers' detect_readers().

3. Fixup pcsc_lock() so that it reconnect to the card and report proper

error so caller may be notified if session was lost.

4. Allow context to be created without readers.

5. Call sc_ctx_detect_readers() from PKCS#11 C_GetSlotList with NULL_PTR.

6. Allow no reader at detect_card, as reader my be removed.

7. Since I broke ABI, I updated the external module version requirement

to match OpenSC version. In the future a separate version should be
maintained for each interface, this should be unrelated to the package
version.

Alon

---

svn merge -r 3480:3505 https://www.opensc-project.org/svn/opensc/branches/alonbl/pnp

M src/tools/opensc-tool.c
M src/pkcs11/pkcs11-global.c
M src/pkcs11/slot.c
M src/libopensc/reader-pcsc.c
M src/libopensc/internal-winscard.h
M src/libopensc/ctx.c
M src/libopensc/reader-ctapi.c
M src/libopensc/libopensc.exports
M src/libopensc/reader-openct.c
M src/libopensc/opensc.h

Files:

• trunk/src/libopensc/ctx.c (modified) (3 diffs)

trunk/src/libopensc/ctx.c

@@ -355 +355 @@
         /* verify module version */
         version = modversion();
-        if (version == NULL || strncmp(version, "0.9.", strlen("0.9.")) > 0) {
+        /* XXX: We really need to have ABI version for each interface */
+        if (version == NULL || strncmp(version, PACKAGE_VERSION, strlen(PACKAGE_VERSION)) != 0) {
                 sc_error(ctx,"dynamic library '%s': invalid module version\n",libname);
                 lt_dlclose(handle);
@@ -638 +639 @@
 }
 
+int sc_ctx_detect_readers(sc_context_t *ctx)
+{
+        int i;
+
+        sc_mutex_lock(ctx, ctx->mutex);
+
+        for (i = 0; ctx->reader_drivers[i] != NULL; i++) {
+                const struct sc_reader_driver *drv = ctx->reader_drivers[i];
+
+                if (drv->ops->detect_readers != NULL)
+                        drv->ops->detect_readers(ctx, ctx->reader_drv_data[i]);
+        }
+
+        sc_mutex_unlock(ctx, ctx->mutex);
+
+        /* XXX: Do not ignore erros? */
+        return SC_SUCCESS;
+}
+
 sc_reader_t *sc_ctx_get_reader(sc_context_t *ctx, unsigned int i)
 {
@@ -725 +745 @@
         del_drvs(&opts, 0);
         del_drvs(&opts, 1);
-        if (ctx->reader_count == 0) {
-                sc_release_context(ctx);
-                return SC_ERROR_NO_READERS_FOUND;
-        }
+        sc_ctx_detect_readers(ctx);
         *ctx_out = ctx;
         return SC_SUCCESS;