forks/tftp-hpa-google
1
0
Fork 0
forked from mirrors/tftp-hpa-google
Code Pull requests Releases 1 Activity

Even more changes to handle block number wrap correctly.

Browse source 
Make the client officially supported.  It's better than most things
that are already out there.
This commit is contained in:
hpa 2001-11-13 03:39:32 +00:00
parent 480bee14e9
commit a58b9604c5
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tftp/tftp.c
View file

@ -104,9 +104,10 @@ tftp_sendfile(int fd, char *name, char *mode)
struct tftphdr *ap; /* data and ack packets */
struct tftphdr *dp;
int n;
volatile int is_request;
volatile u_short block;
volatile int size, convert;
volatile unsigned long amount;
volatile off_t amount;
struct sockaddr_in from;
int fromlen;
FILE *file;
@ -117,13 +118,14 @@ tftp_sendfile(int fd, char *name, char *mode)
file = fdopen(fd, "r");
convert = !strcmp(mode, "netascii");
block = 0;
is_request = 1; /* First packet is the actual WRQ */
amount = 0;
bsd_signal(SIGALRM, timer);
do {
if (block == 0)
if (is_request) {
size = makerequest(WRQ, name, dp, mode) - 4;
else {
} else {
/* size = read(fd, dp->th_data, SEGSIZE); */
size = readit(file, &dp, convert);
if (size < 0) {
@ -187,8 +189,9 @@ send_data:
}
}
}
if (block > 0)
if ( !is_request )
amount += size;
is_request = 0;
block++;
} while (size == SEGSIZE || block == 1);
abort: