mirror of https://github.com/wolfSSL/wolfssh.git
add more support for want writes on server side
parent
5386297429
commit
ee85cc552e
|
|
@ -48,7 +48,7 @@
|
|||
|
||||
#ifndef NO_WOLFSSH_SERVER
|
||||
|
||||
#define TEST_SFTP_TIMEOUT 10
|
||||
#define TEST_SFTP_TIMEOUT 1
|
||||
|
||||
static const char echoserverBanner[] = "wolfSSH Example Echo Server\n";
|
||||
|
||||
|
|
@ -222,7 +222,8 @@ static int sftp_worker(thread_ctx_t* threadCtx) {
|
|||
|
||||
select_ret = tcp_select(sockfd, TEST_SFTP_TIMEOUT);
|
||||
if (select_ret == WS_SELECT_RECV_READY ||
|
||||
select_ret == WS_SELECT_ERROR_READY)
|
||||
select_ret == WS_SELECT_ERROR_READY ||
|
||||
error == WS_WANT_WRITE)
|
||||
{
|
||||
ret = wolfSSH_SFTP_read(threadCtx->ssh);
|
||||
error = wolfSSH_get_error(threadCtx->ssh);
|
||||
|
|
@ -261,8 +262,9 @@ static int NonBlockSSH_accept(WOLFSSH* ssh)
|
|||
printf("... server would write block\n");
|
||||
|
||||
select_ret = tcp_select(sockfd, 1);
|
||||
if (select_ret == WS_SELECT_RECV_READY ||
|
||||
select_ret == WS_SELECT_ERROR_READY)
|
||||
if (select_ret == WS_SELECT_RECV_READY ||
|
||||
select_ret == WS_SELECT_ERROR_READY ||
|
||||
error == WS_WANT_WRITE)
|
||||
{
|
||||
ret = wolfSSH_accept(ssh);
|
||||
error = wolfSSH_get_error(ssh);
|
||||
|
|
@ -926,6 +928,7 @@ THREAD_RETURN WOLFSSH_THREAD echoserver_test(void* args)
|
|||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
(void)defaultSftpPath;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -120,8 +120,9 @@ static int NonBlockSSH_accept(WOLFSSH* ssh)
|
|||
printf("... client would write block\n");
|
||||
|
||||
select_ret = tcp_select(sockfd, 1);
|
||||
if (select_ret == WS_SELECT_RECV_READY ||
|
||||
select_ret == WS_SELECT_ERROR_READY)
|
||||
if (select_ret == WS_SELECT_RECV_READY ||
|
||||
select_ret == WS_SELECT_ERROR_READY ||
|
||||
error == WS_WANT_WRITE)
|
||||
{
|
||||
ret = wolfSSH_accept(ssh);
|
||||
error = wolfSSH_get_error(ssh);
|
||||
|
|
|
|||
|
|
@ -4875,8 +4875,8 @@ int DoReceive(WOLFSSH* ssh)
|
|||
ssh->error = ret;
|
||||
return WS_FATAL_ERROR;
|
||||
}
|
||||
WLOG(WS_LOG_DEBUG, "PR3: peerMacSz = %u", peerMacSz);
|
||||
ssh->inputBuffer.idx += peerMacSz;
|
||||
WLOG(WS_LOG_DEBUG, "PR3: peerMacSz = %u", ssh->peerMacSz);
|
||||
ssh->inputBuffer.idx += ssh->peerMacSz;
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
@ -5899,9 +5899,6 @@ int SendNewKeys(WOLFSSH* ssh)
|
|||
ret = BundlePacket(ssh);
|
||||
}
|
||||
|
||||
if (ret == WS_SUCCESS)
|
||||
ret = wolfSSH_SendPacket(ssh);
|
||||
|
||||
if (ret == WS_SUCCESS) {
|
||||
ssh->blockSz = ssh->handshake->blockSz;
|
||||
ssh->encryptId = ssh->handshake->encryptId;
|
||||
|
|
@ -5938,6 +5935,9 @@ int SendNewKeys(WOLFSSH* ssh)
|
|||
ssh->txCount = 0;
|
||||
}
|
||||
|
||||
if (ret == WS_SUCCESS)
|
||||
ret = wolfSSH_SendPacket(ssh);
|
||||
|
||||
WLOG(WS_LOG_DEBUG, "Leaving SendNewKeys(), ret = %d", ret);
|
||||
return ret;
|
||||
}
|
||||
|
|
|
|||
42
src/ssh.c
42
src/ssh.c
|
|
@ -267,6 +267,38 @@ int wolfSSH_accept(WOLFSSH* ssh)
|
|||
if (ssh == NULL)
|
||||
return WS_BAD_ARGUMENT;
|
||||
|
||||
/* check if data pending to be sent */
|
||||
if (ssh->outputBuffer.length > 0 &&
|
||||
ssh->acceptState < ACCEPT_CLIENT_SESSION_ESTABLISHED) {
|
||||
if ((ssh->error = wolfSSH_SendPacket(ssh)) == WS_SUCCESS) {
|
||||
WLOG(WS_LOG_DEBUG, "Sent pending packet");
|
||||
|
||||
/* adjust state, a couple of them use multiple sends */
|
||||
if (ssh->acceptState != ACCEPT_SERVER_VERSION_SENT &&
|
||||
ssh->acceptState != ACCEPT_SERVER_USERAUTH_ACCEPT_SENT &&
|
||||
ssh->acceptState != ACCEPT_SERVER_KEXINIT_SENT &&
|
||||
ssh->acceptState != ACCEPT_KEYED) {
|
||||
WLOG(WS_LOG_DEBUG, "Advancing accept state");
|
||||
ssh->acceptState++;
|
||||
}
|
||||
|
||||
/* handle in process reply state */
|
||||
if (ssh->processReplyState == PROCESS_PACKET) {
|
||||
WLOG(WS_LOG_DEBUG, "PR3: peerMacSz = %u", ssh->peerMacSz);
|
||||
ssh->inputBuffer.idx += ssh->peerMacSz;
|
||||
WLOG(WS_LOG_DEBUG, "PR4: Shrinking input buffer");
|
||||
ShrinkBuffer(&ssh->inputBuffer, 1);
|
||||
ssh->processReplyState = PROCESS_INIT;
|
||||
|
||||
WLOG(WS_LOG_DEBUG, "PR5: txCount = %u, rxCount = %u",
|
||||
ssh->txCount, ssh->rxCount);
|
||||
}
|
||||
}
|
||||
else {
|
||||
return WS_FATAL_ERROR;
|
||||
}
|
||||
}
|
||||
|
||||
while (ssh->acceptState != ACCEPT_CLIENT_SESSION_ESTABLISHED) {
|
||||
switch (ssh->acceptState) {
|
||||
|
||||
|
|
@ -415,6 +447,7 @@ int wolfSSH_accept(WOLFSSH* ssh)
|
|||
if (cmd != NULL &&
|
||||
WOLFSSH_SESSION_SUBSYSTEM == wolfSSH_GetSessionType(ssh)
|
||||
&& (WMEMCMP(cmd, "sftp", sizeof("sftp")) == 0)) {
|
||||
ssh->acceptState = ACCEPT_INIT_SFTP;
|
||||
return wolfSSH_SFTP_accept(ssh);
|
||||
}
|
||||
}
|
||||
|
|
@ -430,6 +463,11 @@ int wolfSSH_accept(WOLFSSH* ssh)
|
|||
}
|
||||
return WS_SCP_COMPLETE;
|
||||
#endif
|
||||
#ifdef WOLFSSH_SFTP
|
||||
case ACCEPT_INIT_SFTP:
|
||||
return wolfSSH_SFTP_accept(ssh);
|
||||
#endif
|
||||
|
||||
}
|
||||
} /* end while */
|
||||
|
||||
|
|
@ -763,11 +801,11 @@ int wolfSSH_stream_send(WOLFSSH* ssh, byte* buf, word32 bufSz)
|
|||
return WS_BAD_ARGUMENT;
|
||||
|
||||
/* case of WANT WRITE and data stored in output buffer */
|
||||
if (ssh->error == WS_WANT_WRITE && ssh->outputBuffer.length != 0) {
|
||||
if (ssh->outputBuffer.plainSz && ssh->outputBuffer.length != 0) {
|
||||
int ret;
|
||||
|
||||
bytesTxd = ssh->outputBuffer.plainSz;
|
||||
WLOG(WS_LOG_DEBUG, "\n\nTrying to resend %d bytes\n\n\n", bytesTxd);
|
||||
WLOG(WS_LOG_DEBUG, "Trying to resend %d bytes", bytesTxd);
|
||||
ssh->error = WS_SUCCESS;
|
||||
ret = wolfSSH_SendPacket(ssh);
|
||||
|
||||
|
|
|
|||
|
|
@ -754,6 +754,9 @@ int wolfSSH_SFTP_accept(WOLFSSH* ssh)
|
|||
return WS_BAD_ARGUMENT;
|
||||
}
|
||||
|
||||
if (ssh->error == WS_WANT_READ || ssh->error == WS_WANT_WRITE)
|
||||
ssh->error = WS_SUCCESS;
|
||||
|
||||
/* check accept is done, if not call wolfSSH accept */
|
||||
if (ssh->acceptState < ACCEPT_CLIENT_SESSION_ESTABLISHED) {
|
||||
byte name[] = "sftp";
|
||||
|
|
@ -772,7 +775,7 @@ int wolfSSH_SFTP_accept(WOLFSSH* ssh)
|
|||
|
||||
switch (ssh->sftpState) {
|
||||
case SFTP_BEGIN:
|
||||
if ((ssh->error = SFTP_ServerRecvInit(ssh)) != WS_SUCCESS) {
|
||||
if (SFTP_ServerRecvInit(ssh) != WS_SUCCESS) {
|
||||
return WS_FATAL_ERROR;
|
||||
}
|
||||
ssh->sftpState = SFTP_RECV;
|
||||
|
|
@ -780,7 +783,7 @@ int wolfSSH_SFTP_accept(WOLFSSH* ssh)
|
|||
/* no break */
|
||||
|
||||
case SFTP_RECV:
|
||||
if ((ssh->error = SFTP_ServerSendInit(ssh)) != WS_SUCCESS) {
|
||||
if (SFTP_ServerSendInit(ssh) != WS_SUCCESS) {
|
||||
return WS_FATAL_ERROR;
|
||||
}
|
||||
ssh->sftpState = SFTP_DONE;
|
||||
|
|
@ -1133,24 +1136,30 @@ int wolfSSH_SFTP_read(WOLFSSH* ssh)
|
|||
case STATE_RECV_SEND:
|
||||
if (state->toSend) {
|
||||
do {
|
||||
int err;
|
||||
ret = wolfSSH_stream_send(ssh, state->data + state->idx,
|
||||
state->sz - state->idx);
|
||||
if (ret < 0) {
|
||||
if (ssh->error != WS_WANT_READ &&
|
||||
ssh->error != WS_WANT_WRITE)
|
||||
wolfSSH_SFTP_ClearState(ssh, STATE_ID_RECV);
|
||||
return WS_FATAL_ERROR;
|
||||
if (state->toSend != 2) {
|
||||
ret = wolfSSH_stream_send(ssh, state->data + state->idx,
|
||||
state->sz - state->idx);
|
||||
if (ret < 0) {
|
||||
if (ssh->error != WS_WANT_READ &&
|
||||
ssh->error != WS_WANT_WRITE)
|
||||
wolfSSH_SFTP_ClearState(ssh, STATE_ID_RECV);
|
||||
return WS_FATAL_ERROR;
|
||||
}
|
||||
|
||||
/* check if there is more to be sent. This could be due to
|
||||
* limit on channel size when sending / receiving files */
|
||||
state->idx += ret;
|
||||
}
|
||||
state->toSend = 1;
|
||||
|
||||
/* check if there is more to be sent. This could be due to
|
||||
* limit on channel size */
|
||||
state->idx += ret;
|
||||
|
||||
/* do not block on receive pending */
|
||||
err = wolfSSH_get_error(ssh);
|
||||
wolfSSH_CheckReceivePending(ssh);
|
||||
ssh->error = err;
|
||||
if ((int)state->idx < state->sz) {
|
||||
wolfSSH_CheckReceivePending(ssh);
|
||||
if (ssh->error == WS_WANT_READ) {
|
||||
/* was something there to read, try again */
|
||||
state->toSend = 2;
|
||||
return WS_FATAL_ERROR;
|
||||
}
|
||||
}
|
||||
} while ((int)state->idx < state->sz);
|
||||
ret = WS_SUCCESS;
|
||||
state->toSend = 0;
|
||||
|
|
|
|||
|
|
@ -529,6 +529,9 @@ enum AcceptStates {
|
|||
#ifdef WOLFSSH_SCP
|
||||
ACCEPT_INIT_SCP_TRANSFER,
|
||||
#endif
|
||||
#ifdef WOLFSSH_SFTP
|
||||
ACCEPT_INIT_SFTP,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue