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

Update vpcd.c

Browse Source 
FIXES #193
This commit is contained in:
Bowb
2021-08-09 14:47:38 -06:00
committed by GitHub
parent 4658f86108
commit cebe05e78d
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,6 +38,7 @@ typedef WORD uint16_t;
#else #else
#include <arpa/inet.h> #include <arpa/inet.h>
#include <netdb.h> #include <netdb.h>
#include <poll.h>
#include <stdint.h> #include <stdint.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/time.h> #include <sys/time.h>
@@ -171,20 +172,16 @@ err:
SOCKET waitforclient(SOCKET server, long secs, long usecs) SOCKET waitforclient(SOCKET server, long secs, long usecs)
{ {
fd_set rfds;
struct sockaddr_in client_sockaddr; struct sockaddr_in client_sockaddr;
socklen_t client_socklen = sizeof client_sockaddr; socklen_t client_socklen = sizeof client_sockaddr;
#if _WIN32
fd_set rfds;
struct timeval tv; struct timeval tv;
FD_ZERO(&rfds);
#if _WIN32
/* work around clumsy define of FD_SET in winsock2.h */
#pragma warning(disable:4127) #pragma warning(disable:4127)
FD_SET(server, &rfds); FD_SET(server, &rfds);
#pragma warning(default:4127) #pragma warning(default:4127)
#else
FD_SET(server, &rfds);
#endif
tv.tv_sec = secs; tv.tv_sec = secs;
tv.tv_usec = usecs; tv.tv_usec = usecs;
@@ -193,6 +190,21 @@ SOCKET waitforclient(SOCKET server, long secs, long usecs)
return INVALID_SOCKET; return INVALID_SOCKET;
if (FD_ISSET(server, &rfds)) if (FD_ISSET(server, &rfds))
/* work around clumsy define of FD_SET in winsock2.h */
#else
int timeout;
struct pollfd pfd;
pfd.fd = server;
timeout = (secs * 1000000 + usecs / 1000);
if (poll(&pfd, 1, timeout) == -1)
return INVALID_SOCKET;
if(pfd.revents & POLLIN)
#endif
return accept(server, (struct sockaddr *) &client_sockaddr, return accept(server, (struct sockaddr *) &client_sockaddr,
&client_socklen); &client_socklen);