Changeset 243

Timestamp:

06/17/10 08:49:05 (2 years ago)

Author:

marek

Message:

ap51-flash: on repeat block seek the file to the right location

Signed-off-by: Marek Lindner <lindner_marek@…>
Acked-by: Linus Luessing <linus.luessing@…>

Files:

• ap51-flash/trunk/packet.c (modified) (6 diffs)

ap51-flash/trunk/packet.c

@@ -35 +35 @@
 
 unsigned long tftp_bytes_sent = 0;
-unsigned short tftp_ack_block = 0, tftp_sent_block = 0, xfer_in_progress = 0, write_req_timeout = 4;
+unsigned short last_packet_size = 0, tftp_ack_block = 0, tftp_sent_block = 0, xfer_in_progress = 0, write_req_timeout = 4;
 char tcp_status = TCP_CONTINUE;
 
@@ -130 +130 @@
 
         if (read_len > 0) {
+                lseek(fff->fd, seek_pos, SEEK_SET);
+
                 if (read_len != read(fff->fd, target_buff, read_len)) {
                         perror(fff->fname);
@@ -191 +193 @@
                 block = 0;
                 tftp_bytes_sent = 0;
+                last_packet_size = 0;
                 /* fall through - start sending data */
         /* TFTP ack */
@@ -204 +207 @@
                 } else if (block != tftp_sent_block) {
                         if (block < tftp_sent_block)
-                                fprintf(stderr, "tftp repeat block %d %d\n", block + 1, tftp_ack_block);
+                                fprintf(stderr, "tftp repeat block %d, last received ack: %d\n", block + 1, tftp_ack_block);
                         else
                                 fprintf(stderr, "tftp acks unsent block %d (last sent block: %d)\n",
@@ -210 +213 @@
 
                         block = tftp_ack_block;
+                        tftp_bytes_sent -= last_packet_size;
                 } else {
                         if (block * 512 > tftp_xfer_size) {
@@ -239 +243 @@
                 }
 
+                last_packet_size = tftp_data_len;
                 tftp_bytes_sent += tftp_data_len;
                 tftp_data_len += 4; /* opcode size */