ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-02-07 13:21:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix "-m none" case where an entire packet fits in a block and can be

Browse Source 
read by read_packet_init()
This commit is contained in:
Matt Johnston 2013-03-20 23:13:19 +08:00
parent d37dcc636f
commit 34f9b2a8f7
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
packet.c
View File

@ -133,22 +133,29 @@ void read_packet() {
/* Attempt to read the remainder of the packet, note that there /* Attempt to read the remainder of the packet, note that there
* mightn't be any available (EAGAIN) */ * mightn't be any available (EAGAIN) */
maxlen = ses.readbuf->len - ses.readbuf->pos; maxlen = ses.readbuf->len - ses.readbuf->pos;
len = read(ses.sock_in, buf_getptr(ses.readbuf, maxlen), maxlen); if (maxlen == 0) {
/* Occurs when the packet is only a single block long and has all
* been read in read_packet_init(). Usually means that MAC is disabled
*/
len = 0;
} else {
len = read(ses.sock_in, buf_getptr(ses.readbuf, maxlen), maxlen);
if (len == 0) { if (len == 0) {
ses.remoteclosed(); ses.remoteclosed();
}
if (len < 0) {
if (errno == EINTR || errno == EAGAIN) {
TRACE(("leave read_packet: EINTR or EAGAIN"))
return;
} else {
dropbear_exit("Error reading: %s", strerror(errno));
} }
}
buf_incrpos(ses.readbuf, len); if (len < 0) {
if (errno == EINTR || errno == EAGAIN) {
TRACE(("leave read_packet: EINTR or EAGAIN"))
return;
} else {
dropbear_exit("Error reading: %s", strerror(errno));
}
}
buf_incrpos(ses.readbuf, len);
}
if ((unsigned int)len == maxlen) { if ((unsigned int)len == maxlen) {
/* The whole packet has been read */ /* The whole packet has been read */