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

Merge pull request #225 from bowb/master

Browse Source 
Client reconnect
This commit is contained in:
Frank Morgner
2022-06-08 10:23:59 +02:00
committed by GitHub
parent 51fb023c3b 76543ea32b
commit 562eb4297a
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
virtualsmartcard/src/vpcd/vpcd.c
View File

@@ -272,7 +272,7 @@ static ssize_t recvFromVICC(struct vicc_ctx *ctx, unsigned char **buffer)
int vicc_eject(struct vicc_ctx *ctx) int vicc_eject(struct vicc_ctx *ctx)
{ {
int r = 0; int r = 0;
if (ctx && ctx->client_sock > 0) { if (ctx && ctx->client_sock != INVALID_SOCKET) {
if (close(ctx->client_sock) < 0) { if (close(ctx->client_sock) < 0) {
r -= 1; r -= 1;
} }
@@ -334,7 +334,7 @@ int vicc_exit(struct vicc_ctx *ctx)
if (ctx) { if (ctx) {
free_lock(ctx->io_lock); free_lock(ctx->io_lock);
free(ctx->hostname); free(ctx->hostname);
if (ctx->server_sock > 0) { if (ctx->server_sock != INVALID_SOCKET) {
ctx->server_sock = close(ctx->server_sock); ctx->server_sock = close(ctx->server_sock);
if (ctx->server_sock == INVALID_SOCKET) { if (ctx->server_sock == INVALID_SOCKET) {
r -= 1; r -= 1;
@@ -380,12 +380,9 @@ int vicc_connect(struct vicc_ctx *ctx, long secs, long usecs)
return 0; return 0;
if (ctx->client_sock == INVALID_SOCKET) { if (ctx->client_sock == INVALID_SOCKET) {
if (ctx->server_sock) { if(!ctx->hostname) {
/* server mode, try to accept a client */ /* server mode, try to accept a client */
ctx->client_sock = waitforclient(ctx->server_sock, secs, usecs); ctx->client_sock = waitforclient(ctx->server_sock, secs, usecs);
if (!ctx->client_sock) {
ctx->client_sock = INVALID_SOCKET;
}
} else { } else {
/* client mode, try to connect (again) */ /* client mode, try to connect (again) */
ctx->client_sock = connectsock(ctx->hostname, ctx->port); ctx->client_sock = connectsock(ctx->hostname, ctx->port);