Has anyone done any work in improving TFTP get performance?
Block size is currently set to 512 whereas TFTP RFC 248 allows for
negotiating block size...
http://www.faqs.org/rfcs/rfc2348.html
Attached is some work in progress. It doesn't work, but including it
in case anyone
is interested in this.
--
Øyvind Harboe
http://www.zylin.com - eCos ARM & FPGA developer kit
### Eclipse Workspace Patch 1.0
#P ecos
Index: net/common/current/cdl/net.cdl
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/common/current/cdl/net.cdl,v
retrieving revision 1.17
diff -u -r1.17 net.cdl
--- net/common/current/cdl/net.cdl 7 Jan 2007 14:46:55 -0000 1.17
+++ net/common/current/cdl/net.cdl 19 Dec 2007 09:04:00 -0000
@@ -167,6 +167,16 @@
threads can have precedence over TFTP server processing."
}
+ cdl_option CYGPKG_NET_TFTPD_CLIENT_GET_PACKETSIZE {
+ display "Pervert TFTP protocol to allow bigger packets."
+ flavor data
+ default_value 512
+ legal_values 512 to 65464
+ description "
+ Some TFTP servers pragmatically allow increasing the
+ packet size, contrary to the TFTP standard. Use with caution!"
+ }
+
cdl_option CYGPKG_NET_TFTPD_THREAD_STACK_SIZE {
display "Stack size for TFTP threads."
flavor data
Index: net/common/current/src/tftp_client.c
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/common/current/src/tftp_client.c,v
retrieving revision 1.10
diff -u -r1.10 tftp_client.c
--- net/common/current/src/tftp_client.c 16 Sep 2005 14:56:26 -0000
1.10
+++ net/common/current/src/tftp_client.c 19 Dec 2007 09:04:01 -0000
@@ -57,6 +57,7 @@
#include <network.h>
#include <arpa/tftp.h>
#include <tftp_support.h>
+#include <stdlib.h>
#define min(x,y) (x<y ? x : y)
@@ -66,7 +67,8 @@
// On error, *err will hold the reason.
// This version uses the server name. This can be a name for DNS lookup
// or a dotty or colony number format for IPv4 or IPv6.
-int tftp_client_get(const char * const filename,
+static int tftp_client_get_inner(char *data,
+ const char * const filename,
const char * const server,
const int port,
char *buf,
@@ -85,7 +87,6 @@
int error;
struct sockaddr local_addr, from_addr;
- char data[SEGSIZE+sizeof(struct tftphdr)];
struct tftphdr *hdr = (struct tftphdr *)data;
const char *fp;
char *cp, *bp;
@@ -214,9 +215,9 @@
}
}
} else {
- recv_len = sizeof(data);
+ recv_len = CYGPKG_NET_TFTPD_CLIENT_GET_PACKETSIZE;
from_len = sizeof(from_addr);
- if ((data_len = recvfrom(s, &data, recv_len, 0,
+ if ((data_len = recvfrom(s, data, recv_len, 0,
&from_addr, &from_len)) < 0) {
// What happened?
*err = TFTP_NETERR;
@@ -244,7 +245,7 @@
// To prevent an out-of-sequence packet from
// terminating transmission prematurely, set
// actual_len to a full size packet.
- actual_len = SEGSIZE;
+ actual_len = CYGPKG_NET_TFTPD_CLIENT_GET_PACKETSIZE;
}
// Send out the ACK
hdr->th_opcode = htons(ACK);
@@ -256,7 +257,7 @@
goto out;
}
// A short packet marks the end of the file.
- if ((actual_len >= 0) && (actual_len < SEGSIZE)) {
+ if ((actual_len >= 0) && (actual_len <
CYGPKG_NET_TFTPD_CLIENT_GET_PACKETSIZE)) {
// End of data
close(s);
freeaddrinfo(res);
@@ -290,6 +291,35 @@
freeaddrinfo(res);
return -1;
}
+
+
+int tftp_client_get(const char * const filename,
+ const char * const server,
+ const int port,
+ char *buf,
+ int len,
+ const int mode,
+ int * const err) {
+ int result;
+#if CYGPKG_NET_TFTPD_CLIENT_GET_PACKETSIZE>512
+ char *data = malloc(CYGPKG_NET_TFTPD_CLIENT_GET_PACKETSIZE+sizeof(struct
tftphdr));
+ if (data==NULL)
+ {
+ *err=TFTP_ENOSPACE;
+ return -1;
+ }
+#else
+ char data[SEGSIZE+sizeof(struct tftphdr)];
+#endif
+ result=tftp_client_get_inner(data, filename, server, port, buf, len, mode,
err);
+
+#if CYGPKG_NET_TFTPD_CLIENT_GET_PACKETSIZE>512
+ free(data);
+#endif
+
+ return result;
+}
+
//
// Read a file from a host into a local buffer. Returns the
// number of bytes actually read, or (-1) if an error occurs.
--
Before posting, please read the FAQ: http://ecos.sourceware.org/fom/ecos
and search the list archive: http://ecos.sourceware.org/ml/ecos-discuss
