From cf42e73556a02b6789ca6c6f6aa058ac7f25b6b5 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 16 Jan 2002 22:50:04 +0000 Subject: 2001-01-16 Eric Norum * lib/tftpDriver.clib/tftpDriver.c: Fix TFTP block number checking. --- cpukit/libnetworking/ChangeLog | 4 ++++ cpukit/libnetworking/lib/tftpDriver.c | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'cpukit') diff --git a/cpukit/libnetworking/ChangeLog b/cpukit/libnetworking/ChangeLog index 39a5a42637..c5ee2afc0f 100644 --- a/cpukit/libnetworking/ChangeLog +++ b/cpukit/libnetworking/ChangeLog @@ -1,3 +1,7 @@ +2001-01-16 Eric Norum + + * lib/tftpDriver.clib/tftpDriver.c: Fix TFTP block number checking. + 2002-02-05 Ralf Corsepius * pppd/sys-rtems.c: Remove unused variable status from diff --git a/cpukit/libnetworking/lib/tftpDriver.c b/cpukit/libnetworking/lib/tftpDriver.c index d7626d601f..52f51748a5 100644 --- a/cpukit/libnetworking/lib/tftpDriver.c +++ b/cpukit/libnetworking/lib/tftpDriver.c @@ -721,10 +721,9 @@ static int rtems_tftp_open_worker( } if (tp->writing && (opcode == TFTP_OPCODE_ACK) - && ((ntohs (tp->pkbuf.tftpACK.blocknum) == 0) - || (ntohs (tp->pkbuf.tftpACK.blocknum) == 1))) { + && (ntohs (tp->pkbuf.tftpACK.blocknum) == 0)) { tp->nused = 0; - tp->blocknum = ntohs (tp->pkbuf.tftpACK.blocknum); + tp->blocknum = 1; break; } if (opcode == TFTP_OPCODE_ERROR) { @@ -891,7 +890,7 @@ static int rtems_tftp_flush ( struct tftpStream *tp ) if (rlen >= (int)sizeof tp->pkbuf.tftpACK) { int opcode = ntohs (tp->pkbuf.tftpACK.opcode); if ((opcode == TFTP_OPCODE_ACK) - && (ntohs (tp->pkbuf.tftpACK.blocknum) == (tp->blocknum + 1))) { + && (ntohs (tp->pkbuf.tftpACK.blocknum) == tp->blocknum)) { tp->nused = 0; tp->blocknum++; return 0; -- cgit v1.2.3