RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2001-01-16 Eric Norum <eric.norum@usask.ca>

Browse Source 
* lib/tftpDriver.clib/tftpDriver.c: Fix TFTP block number checking.
This commit is contained in:
Joel Sherrill
2002-01-16 22:50:04 +00:00
parent 46c109656a
commit cf42e73556
6 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
c/src/exec/libnetworking/ChangeLog
View File

@@ -1,3 +1,7 @@
2001-01-16 Eric Norum <eric.norum@usask.ca>
* lib/tftpDriver.clib/tftpDriver.c: Fix TFTP block number checking.
2002-02-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2002-02-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* pppd/sys-rtems.c: Remove unused variable status from * pppd/sys-rtems.c: Remove unused variable status from

7
c/src/exec/libnetworking/lib/tftpDriver.c
View File

@@ -721,10 +721,9 @@ static int rtems_tftp_open_worker(
} }
if (tp->writing if (tp->writing
&& (opcode == TFTP_OPCODE_ACK) && (opcode == TFTP_OPCODE_ACK)
&& ((ntohs (tp->pkbuf.tftpACK.blocknum) == 0) && (ntohs (tp->pkbuf.tftpACK.blocknum) == 0)) {
|| (ntohs (tp->pkbuf.tftpACK.blocknum) == 1))) {
tp->nused = 0; tp->nused = 0;
tp->blocknum = ntohs (tp->pkbuf.tftpACK.blocknum); tp->blocknum = 1;
break; break;
} }
if (opcode == TFTP_OPCODE_ERROR) { if (opcode == TFTP_OPCODE_ERROR) {
@@ -891,7 +890,7 @@ static int rtems_tftp_flush ( struct tftpStream *tp )
if (rlen >= (int)sizeof tp->pkbuf.tftpACK) { if (rlen >= (int)sizeof tp->pkbuf.tftpACK) {
int opcode = ntohs (tp->pkbuf.tftpACK.opcode); int opcode = ntohs (tp->pkbuf.tftpACK.opcode);
if ((opcode == TFTP_OPCODE_ACK) if ((opcode == TFTP_OPCODE_ACK)
&& (ntohs (tp->pkbuf.tftpACK.blocknum) == (tp->blocknum + 1))) { && (ntohs (tp->pkbuf.tftpACK.blocknum) == tp->blocknum)) {
tp->nused = 0; tp->nused = 0;
tp->blocknum++; tp->blocknum++;
return 0; return 0;

4
c/src/libnetworking/ChangeLog
View File

@@ -1,3 +1,7 @@
2001-01-16 Eric Norum <eric.norum@usask.ca>
* lib/tftpDriver.clib/tftpDriver.c: Fix TFTP block number checking.
2002-02-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2002-02-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* pppd/sys-rtems.c: Remove unused variable status from * pppd/sys-rtems.c: Remove unused variable status from

7
c/src/libnetworking/lib/tftpDriver.c
View File

@@ -721,10 +721,9 @@ static int rtems_tftp_open_worker(
} }
if (tp->writing if (tp->writing
&& (opcode == TFTP_OPCODE_ACK) && (opcode == TFTP_OPCODE_ACK)
&& ((ntohs (tp->pkbuf.tftpACK.blocknum) == 0) && (ntohs (tp->pkbuf.tftpACK.blocknum) == 0)) {
|| (ntohs (tp->pkbuf.tftpACK.blocknum) == 1))) {
tp->nused = 0; tp->nused = 0;
tp->blocknum = ntohs (tp->pkbuf.tftpACK.blocknum); tp->blocknum = 1;
break; break;
} }
if (opcode == TFTP_OPCODE_ERROR) { if (opcode == TFTP_OPCODE_ERROR) {
@@ -891,7 +890,7 @@ static int rtems_tftp_flush ( struct tftpStream *tp )
if (rlen >= (int)sizeof tp->pkbuf.tftpACK) { if (rlen >= (int)sizeof tp->pkbuf.tftpACK) {
int opcode = ntohs (tp->pkbuf.tftpACK.opcode); int opcode = ntohs (tp->pkbuf.tftpACK.opcode);
if ((opcode == TFTP_OPCODE_ACK) if ((opcode == TFTP_OPCODE_ACK)
&& (ntohs (tp->pkbuf.tftpACK.blocknum) == (tp->blocknum + 1))) { && (ntohs (tp->pkbuf.tftpACK.blocknum) == tp->blocknum)) {
tp->nused = 0; tp->nused = 0;
tp->blocknum++; tp->blocknum++;
return 0; return 0;

4
cpukit/libnetworking/ChangeLog
View File

@@ -1,3 +1,7 @@
2001-01-16 Eric Norum <eric.norum@usask.ca>
* lib/tftpDriver.clib/tftpDriver.c: Fix TFTP block number checking.
2002-02-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2002-02-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* pppd/sys-rtems.c: Remove unused variable status from * pppd/sys-rtems.c: Remove unused variable status from

7
cpukit/libnetworking/lib/tftpDriver.c
View File

@@ -721,10 +721,9 @@ static int rtems_tftp_open_worker(
} }
if (tp->writing if (tp->writing
&& (opcode == TFTP_OPCODE_ACK) && (opcode == TFTP_OPCODE_ACK)
&& ((ntohs (tp->pkbuf.tftpACK.blocknum) == 0) && (ntohs (tp->pkbuf.tftpACK.blocknum) == 0)) {
|| (ntohs (tp->pkbuf.tftpACK.blocknum) == 1))) {
tp->nused = 0; tp->nused = 0;
tp->blocknum = ntohs (tp->pkbuf.tftpACK.blocknum); tp->blocknum = 1;
break; break;
} }
if (opcode == TFTP_OPCODE_ERROR) { if (opcode == TFTP_OPCODE_ERROR) {
@@ -891,7 +890,7 @@ static int rtems_tftp_flush ( struct tftpStream *tp )
if (rlen >= (int)sizeof tp->pkbuf.tftpACK) { if (rlen >= (int)sizeof tp->pkbuf.tftpACK) {
int opcode = ntohs (tp->pkbuf.tftpACK.opcode); int opcode = ntohs (tp->pkbuf.tftpACK.opcode);
if ((opcode == TFTP_OPCODE_ACK) if ((opcode == TFTP_OPCODE_ACK)
&& (ntohs (tp->pkbuf.tftpACK.blocknum) == (tp->blocknum + 1))) { && (ntohs (tp->pkbuf.tftpACK.blocknum) == tp->blocknum)) {
tp->nused = 0; tp->nused = 0;
tp->blocknum++; tp->blocknum++;
return 0; return 0;