ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-06-26 18:17:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rearrange getaddrstring() etc

Browse Source 
--HG--
extra : convert_revision : 8a18c4a60aeaec085923d13d98fa0f93c506ceba
This commit is contained in:
Matt Johnston
2009-09-01 16:38:26 +00:00
parent ccd02552dd
commit f88bed7a30
16 changed files with 141 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packet.c
View File

@@ -157,9 +157,10 @@ void read_packet() {
static int read_packet_init() {
unsigned int maxlen;
int len;
unsigned char blocksize;
unsigned char macsize;
int slen;
unsigned int len;
unsigned int blocksize;
unsigned int macsize;
blocksize = ses.keys->recv.algo_crypt->blocksize;
@@ -173,12 +174,12 @@ static int read_packet_init() {
maxlen = blocksize - ses.readbuf->pos;
/* read the rest of the packet if possible */
len = read(ses.sock_in, buf_getwriteptr(ses.readbuf, maxlen),
slen = read(ses.sock_in, buf_getwriteptr(ses.readbuf, maxlen),
maxlen);
if (len == 0) {
if (slen == 0) {
ses.remoteclosed();
}
if (len < 0) {
if (slen < 0) {
if (errno == EINTR) {
TRACE(("leave read_packet_init: EINTR"))
return DROPBEAR_FAILURE;
@@ -186,9 +187,9 @@ static int read_packet_init() {
dropbear_exit("error reading: %s", strerror(errno));
}
buf_incrwritepos(ses.readbuf, len);
buf_incrwritepos(ses.readbuf, slen);
if ((unsigned int)len != maxlen) {
if ((unsigned int)slen != maxlen) {
/* don't have enough bytes to determine length, get next time */
return DROPBEAR_FAILURE;
}