VivoKey/vsmartcard
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

let user configure the number of slots

Browse Source
This commit is contained in:
Frank Morgner
2015-05-18 07:14:19 +02:00
parent f3dc6db045
commit 2ef0e7828c
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
virtualsmartcard/configure.ac
View File

@@ -134,7 +134,7 @@ fi
# --enable-vpcdhost # --enable-vpcdhost
AC_ARG_ENABLE(vpcdhost, AC_ARG_ENABLE(vpcdhost,
AC_HELP_STRING([--enable-vpcdhost=ADRESS],[Default address to connect to when AC_HELP_STRING([--enable-vpcdhost=ADDRESS],[Default address to connect to when
communicating with vicc. Use "/dev/null" if vpcd shall open communicating with vicc. Use "/dev/null" if vpcd shall open
the socket and wait for an incoming connection. the socket and wait for an incoming connection.
@<:@default=/dev/null@:>@]), @<:@default=/dev/null@:>@]),
@@ -147,6 +147,16 @@ else
fi fi
# --enable-vpcdslots
AC_ARG_ENABLE(vpcdslots,
AC_HELP_STRING([--enable-vpcdslots=COUNT],[Default number of slots to open.
vpcd will open one socket for each slot incrementing the
port number each time. @<:@default=2@:>@]),
[vpcdslots="${enableval}"], [vpcdslots=2])
AC_SUBST(vpcdslots)
AC_DEFINE_UNQUOTED(VPCDSLOTS, ${vpcdslots}, [number of vpcd slots])
HAVE_QRENCODE=yes HAVE_QRENCODE=yes
PKG_CHECK_EXISTS([libqrencode], PKG_CHECK_EXISTS([libqrencode],
[PKG_CHECK_MODULES([QRENCODE], [libqrencode])], [PKG_CHECK_MODULES([QRENCODE], [libqrencode])],
@@ -240,6 +250,7 @@ Build libpcsclite: ${libpcsclite}
Build Info.plist: ${infoplist} Build Info.plist: ${infoplist}
Build reader.conf: ${readerconf} Build reader.conf: ${readerconf}
VPCD hostname: ${vpcdhost} VPCD hostname: ${vpcdhost}
VPCD slot count: ${vpcdslots}
Host: ${host} Host: ${host}

2
virtualsmartcard/src/ifd-vpcd/ifd-vpcd.c
View File

@@ -33,7 +33,7 @@
/* pcscd allows at most 16 readers. Apple's SmartCardServices on OS X 10.10 /* pcscd allows at most 16 readers. Apple's SmartCardServices on OS X 10.10
* freaks out if more than 8 slots are registered. We want only two slots... */ * freaks out if more than 8 slots are registered. We want only two slots... */
#define VICC_MAX_SLOTS (2 <= PCSCLITE_MAX_READERS_CONTEXTS ? 2 : PCSCLITE_MAX_READERS_CONTEXTS) #define VICC_MAX_SLOTS (VPCDSLOTS <= PCSCLITE_MAX_READERS_CONTEXTS ? VPCDSLOTS : PCSCLITE_MAX_READERS_CONTEXTS)
const unsigned char vicc_max_slots = VICC_MAX_SLOTS; const unsigned char vicc_max_slots = VICC_MAX_SLOTS;
#ifdef HAVE_DEBUGLOG_H #ifdef HAVE_DEBUGLOG_H