public/DigestPlay
4
Fork 0
Code Activity

Fixes

Browse source
This commit is contained in:
Artem Prilutskiy 2017-06-07 16:39:10 +03:00
parent 18186deba1
commit 48aad66df0
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
RewindClient.c
View file

@ -208,7 +208,8 @@ int ConnectRewindClient(struct RewindContext* context, const char* location, con
ssize_t length; ssize_t length;
size_t attempt = 0; size_t attempt = 0;
time_t threshold = time(NULL) + CONNECT_TIMEOUT; struct timeval now;
struct timeval threshold;
uint8_t* digest = (uint8_t*)alloca(SHA256_DIGEST_LENGTH); uint8_t* digest = (uint8_t*)alloca(SHA256_DIGEST_LENGTH);
@ -238,11 +239,17 @@ int ConnectRewindClient(struct RewindContext* context, const char* location, con
// Do login procedure // Do login procedure
while (threshold > time(NULL)) gettimeofday(&now, NULL);
threshold.tv_sec = now.tv_sec + CONNECT_TIMEOUT;
threshold.tv_usec = now.tv_usec;
while (timercmp(&now, &threshold, <))
{ {
TransmitRewindData(context, REWIND_TYPE_KEEP_ALIVE, REWIND_FLAG_NONE, context->data, context->length); TransmitRewindData(context, REWIND_TYPE_KEEP_ALIVE, REWIND_FLAG_NONE, context->data, context->length);
length = ReceiveRewindData(context, buffer, BUFFER_SIZE); length = ReceiveRewindData(context, buffer, BUFFER_SIZE);
gettimeofday(&now, NULL);
if ((length == CLIENT_ERROR_WRONG_ADDRESS) || if ((length == CLIENT_ERROR_WRONG_ADDRESS) ||
(length == CLIENT_ERROR_SOCKET_IO) && (length == CLIENT_ERROR_SOCKET_IO) &&
((errno == EWOULDBLOCK) || ((errno == EWOULDBLOCK) ||
@ -292,16 +299,19 @@ int WaitForRewindSessionEnd(struct RewindContext* context, struct RewindSessionP
struct timeval now; struct timeval now;
struct timeval threshold; struct timeval threshold;
gettimeofday(&threshold, NULL); gettimeofday(&now, NULL);
threshold.tv_sec += interval; threshold.tv_sec = now.tv_sec + CONNECT_TIMEOUT;
threshold.tv_usec = now.tv_usec;
do while (timercmp(&now, &threshold, <))
{ {
TransmitRewindData(context, REWIND_TYPE_KEEP_ALIVE, REWIND_FLAG_NONE, context->data, context->length); TransmitRewindData(context, REWIND_TYPE_KEEP_ALIVE, REWIND_FLAG_NONE, context->data, context->length);
TransmitRewindData(context, REWIND_TYPE_SESSION_POLL, REWIND_FLAG_NONE, request, sizeof(struct RewindSessionPollData)); TransmitRewindData(context, REWIND_TYPE_SESSION_POLL, REWIND_FLAG_NONE, request, sizeof(struct RewindSessionPollData));
length = ReceiveRewindData(context, buffer, BUFFER_SIZE); length = ReceiveRewindData(context, buffer, BUFFER_SIZE);
gettimeofday(&now, NULL);
if ((length == CLIENT_ERROR_WRONG_ADDRESS) || if ((length == CLIENT_ERROR_WRONG_ADDRESS) ||
(length == CLIENT_ERROR_SOCKET_IO) && (length == CLIENT_ERROR_SOCKET_IO) &&
((errno == EWOULDBLOCK) || ((errno == EWOULDBLOCK) ||
@ -334,10 +344,7 @@ int WaitForRewindSessionEnd(struct RewindContext* context, struct RewindSessionP
sleep(RECEIVE_TIMEOUT); sleep(RECEIVE_TIMEOUT);
state = 0b00; state = 0b00;
} }
gettimeofday(&now, NULL);
} }
while (timercmp(&now, &threshold, <));
return CLIENT_ERROR_RESPONSE_TIMEOUT; return CLIENT_ERROR_RESPONSE_TIMEOUT;
} }