generic-library/ssh2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

If recv() returns something less than the full buffer we know we're done for

Browse Source 
now, so skip looping and doing another read that then simply will cause an
EAGAIN as it may trick the user into believing things that aren't true.
This commit is contained in:
Daniel Stenberg 2009-05-20 14:30:05 +02:00
parent 035cb24fa0
commit b95fe985af
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/transport.c
View File

@ -272,9 +272,12 @@ _libssh2_transport_read(LIBSSH2_SESSION * session)
unsigned char block[MAX_BLOCKSIZE]; unsigned char block[MAX_BLOCKSIZE];
int blocksize; int blocksize;
int encrypted = 1; int encrypted = 1;
int loop = 1;
int status; int status;
/* default clear the bit */
session->socket_block_directions &= ~LIBSSH2_SESSION_BLOCK_INBOUND;
/* /*
* All channels, systems, subsystems, etc eventually make it down here * All channels, systems, subsystems, etc eventually make it down here
* when looking for more incoming data. If a key exchange is going on * when looking for more incoming data. If a key exchange is going on
@ -348,6 +351,7 @@ _libssh2_transport_read(LIBSSH2_SESSION * session)
/* If we have less than a blocksize left, it is too /* If we have less than a blocksize left, it is too
little data to deal with, read more */ little data to deal with, read more */
ssize_t nread; ssize_t nread;
size_t recv_amount;
/* move any remainder to the start of the buffer so /* move any remainder to the start of the buffer so
that we can do a full refill */ that we can do a full refill */
@ -360,11 +364,12 @@ _libssh2_transport_read(LIBSSH2_SESSION * session)
p->readidx = p->writeidx = 0; p->readidx = p->writeidx = 0;
} }
recv_amount = PACKETBUFSIZE - remainbuf;
/* now read a big chunk from the network into the temp buffer */ /* now read a big chunk from the network into the temp buffer */
nread = nread =
_libssh2_recv(session->socket_fd, &p->buf[remainbuf], _libssh2_recv(session->socket_fd, &p->buf[remainbuf],
PACKETBUFSIZE - remainbuf, recv_amount, LIBSSH2_SOCKET_RECV_FLAGS(session));
LIBSSH2_SOCKET_RECV_FLAGS(session));
if (nread <= 0) { if (nread <= 0) {
/* check if this is due to EAGAIN and return the special /* check if this is due to EAGAIN and return the special
return code if so, error out normally otherwise */ return code if so, error out normally otherwise */
@ -375,6 +380,11 @@ _libssh2_transport_read(LIBSSH2_SESSION * session)
} }
return PACKET_FAIL; return PACKET_FAIL;
} }
else if(nread != recv_amount) {
/* we're done for this time! */
loop = 0;
}
debugdump(session, "libssh2_transport_read() raw", debugdump(session, "libssh2_transport_read() raw",
&p->buf[remainbuf], nread); &p->buf[remainbuf], nread);
/* advance write pointer */ /* advance write pointer */
@ -566,12 +576,11 @@ _libssh2_transport_read(LIBSSH2_SESSION * session)
} }
p->total_num = 0; /* no packet buffer available */ p->total_num = 0; /* no packet buffer available */
return rc; return rc;
} }
} while (1); /* loop */ } while (loop); /* loop until done */
return PACKET_FAIL; /* we never reach this point */ return rc;
} }
static libssh2pack_t static libssh2pack_t
@ -603,7 +612,7 @@ send_existing(LIBSSH2_SESSION * session, unsigned char *data,
length = p->ototal_num - p->osent; length = p->ototal_num - p->osent;
rc = _libssh2_send(session->socket_fd, &p->outbuf[p->osent], length, rc = _libssh2_send(session->socket_fd, &p->outbuf[p->osent], length,
LIBSSH2_SOCKET_SEND_FLAGS(session)); LIBSSH2_SOCKET_SEND_FLAGS(session));
if (rc == length) { if (rc == length) {
/* the remainder of the package was sent */ /* the remainder of the package was sent */
@ -667,6 +676,9 @@ _libssh2_transport_write(LIBSSH2_SESSION * session, unsigned char *data,
debugdump(session, "libssh2_transport_write plain", data, data_len); debugdump(session, "libssh2_transport_write plain", data, data_len);
/* default clear the bit */
session->socket_block_directions &= ~LIBSSH2_SESSION_BLOCK_OUTBOUND;
/* FIRST, check if we have a pending write to complete */ /* FIRST, check if we have a pending write to complete */
rc = send_existing(session, data, data_len, &ret); rc = send_existing(session, data, data_len, &ret);
if (rc || ret) { if (rc || ret) {
@ -768,7 +780,7 @@ _libssh2_transport_write(LIBSSH2_SESSION * session, unsigned char *data,
session->local.seqno++; session->local.seqno++;
ret = _libssh2_send(session->socket_fd, p->outbuf, total_length, ret = _libssh2_send(session->socket_fd, p->outbuf, total_length,
LIBSSH2_SOCKET_SEND_FLAGS(session)); LIBSSH2_SOCKET_SEND_FLAGS(session));
if (ret != -1) { if (ret != -1) {
debugdump(session, "libssh2_transport_write send()", p->outbuf, ret); debugdump(session, "libssh2_transport_write send()", p->outbuf, ret);