WolfSSL
/
wolfssh
mirror of https://github.com/wolfSSL/wolfssh.git
1
0
Fork 0
Code Issues Releases Wiki Activity

handle pending sent packets with SFTP and want write case with rekey

pull/430/head
JacobBarthelmeh 2022-07-14 09:17:43 -07:00
parent 3475e99f96
commit 3013eee8cb
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
examples/echoserver/echoserver.c
View File

@ -1137,8 +1137,15 @@ static int sftp_worker(thread_ctx_t* threadCtx)
if (threadCtx->nonBlock) { if (threadCtx->nonBlock) {
if (error == WS_WANT_READ) if (error == WS_WANT_READ)
printf("... sftp server would read block\n"); printf("... sftp server would read block\n");
else if (error == WS_WANT_WRITE) else if (error == WS_WANT_WRITE) {
word32 c;
printf("... sftp server would write block\n"); printf("... sftp server would write block\n");
/* handle backlog of send packets */
wolfSSH_worker(threadCtx->ssh, &c);
ret = error = wolfSSH_get_error(threadCtx->ssh);
continue;
}
} }
if (wolfSSH_stream_peek(threadCtx->ssh, tmp, 1) > 0) { if (wolfSSH_stream_peek(threadCtx->ssh, tmp, 1) > 0) {

9
src/internal.c
View File

@ -2654,7 +2654,8 @@ static int DoKexInit(WOLFSSH* ssh, byte* buf, word32 len, word32* idx)
ret = SendKexInit(ssh); ret = SendKexInit(ssh);
} }
if (ret == WS_SUCCESS) /* account for possible want write case from SendKexInit */
if (ret == WS_SUCCESS || ret == WS_WANT_WRITE)
ret = wc_HashInit(&ssh->handshake->hash, enmhashId); ret = wc_HashInit(&ssh->handshake->hash, enmhashId);
if (ret == WS_SUCCESS) { if (ret == WS_SUCCESS) {
@ -2720,6 +2721,10 @@ static int DoKexInit(WOLFSSH* ssh, byte* buf, word32 len, word32* idx)
ssh->clientState = CLIENT_KEXINIT_DONE; ssh->clientState = CLIENT_KEXINIT_DONE;
else else
ssh->serverState = SERVER_KEXINIT_DONE; ssh->serverState = SERVER_KEXINIT_DONE;
if (ssh->error != 0)
ret = ssh->error; /* propogate potential want write case from
SendKexInit*/
} }
} }
WLOG(WS_LOG_DEBUG, "Leaving DoKexInit(), ret = %d", ret); WLOG(WS_LOG_DEBUG, "Leaving DoKexInit(), ret = %d", ret);
@ -6334,7 +6339,7 @@ int DoReceive(WOLFSSH* ssh)
ret = DoPacket(ssh); ret = DoPacket(ssh);
ssh->error = ret; ssh->error = ret;
if (ret < 0 && !(ret == WS_CHAN_RXD || ret == WS_EXTDATA || if (ret < 0 && !(ret == WS_CHAN_RXD || ret == WS_EXTDATA ||
ret == WS_CHANNEL_CLOSED)) { ret == WS_CHANNEL_CLOSED || ret == WS_WANT_WRITE)) {
return WS_FATAL_ERROR; return WS_FATAL_ERROR;
} }
WLOG(WS_LOG_DEBUG, "PR3: peerMacSz = %u", peerMacSz); WLOG(WS_LOG_DEBUG, "PR3: peerMacSz = %u", peerMacSz);