Skip to content

Address unit.test fail when resuming client #9697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
padelsbach wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −0
Draft

Address unit.test fail when resuming client #9697

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions examples/client/client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1040,12 +1040,16 @@ static int ClientRead(WOLFSSL* ssl, char* reply, int replyLen, int mustRead,
int ret, err;
char buffer[WOLFSSL_MAX_ERROR_SZ];
double start = current_time(1), elapsed;
int wantReadLoops = 0;

do {
err = 0; /* reset error */
ret = wolfSSL_read(ssl, reply, replyLen);
if (ret <= 0) {
err = wolfSSL_get_error(ssl, 0);
fprintf(stderr,
"DEBUG ClientRead: ret=%d err=%d mustRead=%d str=%s\n",
ret, err, mustRead, str);
#ifdef WOLFSSL_ASYNC_CRYPT
if (err == WC_NO_ERR_TRACE(WC_PENDING_E)) {
ret = wolfSSL_AsyncPoll(ssl, WOLF_POLL_FLAG_CHECK_HW);
Expand All @@ -1071,6 +1075,7 @@ static int ClientRead(WOLFSSL* ssl, char* reply, int replyLen, int mustRead,
if (mustRead &&
(err == WOLFSSL_ERROR_WANT_READ
|| err == WOLFSSL_ERROR_WANT_WRITE)) {
wantReadLoops++;
elapsed = current_time(0) - start;
if (elapsed > MAX_NON_BLOCK_SEC) {
LOG_ERROR("Nonblocking read timeout\n");
Expand All @@ -1089,6 +1094,9 @@ static int ClientRead(WOLFSSL* ssl, char* reply, int replyLen, int mustRead,
reply[ret] = 0; /* null terminate */
printf("%s%s\n", str, reply);
}
fprintf(stderr,
"DEBUG ClientRead done: ret=%d err=%d mustRead=%d str=%s loops=%d\n",
ret, err, mustRead, str, wantReadLoops);

return err;
}
Expand All @@ -1098,6 +1106,9 @@ static int ClientWriteRead(WOLFSSL* ssl, const char* msg, int msgSz,
const char* str, int exitWithRet)
{
int ret = 0;
fprintf(stderr,
"DEBUG ClientWriteRead: msgSz=%d mustRead=%d str=%s\n",
msgSz, mustRead, str);

do {
ret = ClientWrite(ssl, msg, msgSz, str, exitWithRet);
Expand Down Expand Up @@ -4775,6 +4786,9 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
XMEMCPY(msg, kResumeMsg, (size_t)msgSz);
}

fprintf(stderr,
"DEBUG resume ClientWriteRead: sendGET=%d mustRead=%d msgSz=%d\n",
sendGET, sendGET, msgSz);
(void)ClientWriteRead(sslResume, msg, msgSz, reply, sizeof(reply)-1,
sendGET, " resume", 0);

Expand Down