Changeset cf42e735 in rtems


Ignore:
Timestamp:
Jan 16, 2002, 10:50:04 PM (19 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
089abb6d
Parents:
46c1096
Message:

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

  • lib/tftpDriver.clib/tftpDriver.c: Fix TFTP block number checking.
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • c/src/exec/libnetworking/ChangeLog

    r46c1096 rcf42e735  
     12001-01-16      Eric Norum <eric.norum@usask.ca>
     2
     3        * lib/tftpDriver.clib/tftpDriver.c: Fix TFTP block number checking.
     4
    152002-02-05      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    26
  • c/src/exec/libnetworking/lib/tftpDriver.c

    r46c1096 rcf42e735  
    722722            if (tp->writing
    723723             && (opcode == TFTP_OPCODE_ACK)
    724              && ((ntohs (tp->pkbuf.tftpACK.blocknum) == 0)
    725               || (ntohs (tp->pkbuf.tftpACK.blocknum) == 1))) {
     724             && (ntohs (tp->pkbuf.tftpACK.blocknum) == 0)) {
    726725                tp->nused = 0;
    727                 tp->blocknum = ntohs (tp->pkbuf.tftpACK.blocknum);
     726                tp->blocknum = 1;
    728727                break;
    729728            }
     
    892891            int opcode = ntohs (tp->pkbuf.tftpACK.opcode);
    893892            if ((opcode == TFTP_OPCODE_ACK)
    894              && (ntohs (tp->pkbuf.tftpACK.blocknum) == (tp->blocknum + 1))) {
     893             && (ntohs (tp->pkbuf.tftpACK.blocknum) == tp->blocknum)) {
    895894                tp->nused = 0;
    896895                tp->blocknum++;
  • c/src/libnetworking/ChangeLog

    r46c1096 rcf42e735  
     12001-01-16      Eric Norum <eric.norum@usask.ca>
     2
     3        * lib/tftpDriver.clib/tftpDriver.c: Fix TFTP block number checking.
     4
    152002-02-05      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    26
  • c/src/libnetworking/lib/tftpDriver.c

    r46c1096 rcf42e735  
    722722            if (tp->writing
    723723             && (opcode == TFTP_OPCODE_ACK)
    724              && ((ntohs (tp->pkbuf.tftpACK.blocknum) == 0)
    725               || (ntohs (tp->pkbuf.tftpACK.blocknum) == 1))) {
     724             && (ntohs (tp->pkbuf.tftpACK.blocknum) == 0)) {
    726725                tp->nused = 0;
    727                 tp->blocknum = ntohs (tp->pkbuf.tftpACK.blocknum);
     726                tp->blocknum = 1;
    728727                break;
    729728            }
     
    892891            int opcode = ntohs (tp->pkbuf.tftpACK.opcode);
    893892            if ((opcode == TFTP_OPCODE_ACK)
    894              && (ntohs (tp->pkbuf.tftpACK.blocknum) == (tp->blocknum + 1))) {
     893             && (ntohs (tp->pkbuf.tftpACK.blocknum) == tp->blocknum)) {
    895894                tp->nused = 0;
    896895                tp->blocknum++;
  • cpukit/libnetworking/ChangeLog

    r46c1096 rcf42e735  
     12001-01-16      Eric Norum <eric.norum@usask.ca>
     2
     3        * lib/tftpDriver.clib/tftpDriver.c: Fix TFTP block number checking.
     4
    152002-02-05      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    26
  • cpukit/libnetworking/lib/tftpDriver.c

    r46c1096 rcf42e735  
    722722            if (tp->writing
    723723             && (opcode == TFTP_OPCODE_ACK)
    724              && ((ntohs (tp->pkbuf.tftpACK.blocknum) == 0)
    725               || (ntohs (tp->pkbuf.tftpACK.blocknum) == 1))) {
     724             && (ntohs (tp->pkbuf.tftpACK.blocknum) == 0)) {
    726725                tp->nused = 0;
    727                 tp->blocknum = ntohs (tp->pkbuf.tftpACK.blocknum);
     726                tp->blocknum = 1;
    728727                break;
    729728            }
     
    892891            int opcode = ntohs (tp->pkbuf.tftpACK.opcode);
    893892            if ((opcode == TFTP_OPCODE_ACK)
    894              && (ntohs (tp->pkbuf.tftpACK.blocknum) == (tp->blocknum + 1))) {
     893             && (ntohs (tp->pkbuf.tftpACK.blocknum) == tp->blocknum)) {
    895894                tp->nused = 0;
    896895                tp->blocknum++;
Note: See TracChangeset for help on using the changeset viewer.