Am Mo., 25. Juni 2018 um 00:42 Uhr schrieb DH@synoia.com:
From: Duncan Hare DuncanCHare@yahoo.com
Commit-notes All the code is new, and not copied from any source
Test wget
wget is a general purpose TCP/IP program. There is a Linux/unix version of wget, which enables server verification without running u-boot.
- The python distribution include a simple http request handler.
To use it with u-boot and Linux wget start the python server in the directory which contains your test files.
sudo python -m SimplleHTTPServer 80
sudo becuse the port number used is lower than 1,000. Leave this window open.
Then test the server, in a directory different from your directory containing test file, assuming a test file named "test file.name" at a Linux command prompt enter:
wget localhost/testfile.name
and the file should be transferred to the receiving directory.
The server verification is now complete.
- wget in u-boot needs a load address, server ip address, an ip
address, optional file path, and file name.
The server and u-boot ip address can be 127.0.0.1. The routing is then between the u-boot test environment and the server in the same machine.
u-boot script example
env set ipaddr 127.0.0.1; env set loadaddr 0x8000000; wget 127.0.0.1 testfile.name
or
env set ipaddr 127.0.0.1; env set loadaddr 0x8000000; wget 127.0.0.1 pathname/testfile.name
wget prints a progress "|" every 127 packets, and at the end of transfer prints a message of success or fail, and bytes transferred.
When testing u-boot, we first did a large file transfer with wget and then modified tftp to download the same file and verify wget's transfer was both complete and correct, with a strcmp function replacing the copy to kernel area code fragment. END
Cover-letter Add TCP and WGET This is a limited implementation of a TCP, a receiver, with selective acknowledgment (SACK), and wget as a transfer protocol over TCP.
TCP with SACK provides maximum transfer rates over fast and fast multi-hop networks. TCP continues stream transfer if packets are dropped, and then recoveres dropped packed asynchronously.
WGET is a very efficient file transfer protocol running over TCP. There is a single request for each file transferred, irrespective of file size. END
Signed-off-by: Duncan Hare DuncanCHare@yahoo.com
cmd/Kconfig | 7 + cmd/net.c | 13 ++ include/net.h | 2 +- include/net/wget.h | 19 +++ net/Makefile | 2 +- net/net.c | 9 +- net/wget.c | 426 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 475 insertions(+), 3 deletions(-) create mode 100644 include/net/wget.h create mode 100644 net/wget.c
diff --git a/cmd/Kconfig b/cmd/Kconfig index 45c83359ad..fb9c894363 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1192,6 +1192,13 @@ config CMD_NFS help Boot image via network using NFS protocol.
+config CMD_WGET
bool "wget"select TCPhelpDownload kernel, or other files, from a web server over TCP.Fast file transfer over networks with latencconfig CMD_MII bool "mii" help diff --git a/cmd/net.c b/cmd/net.c index f83839c35e..f5fde849c4 100644 --- a/cmd/net.c +++ b/cmd/net.c @@ -113,6 +113,19 @@ U_BOOT_CMD( ); #endif
+#if defined(CONFIG_CMD_WGET) +static int do_wget(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{
return netboot_common(WGET, cmdtp, argc, argv);+}
+U_BOOT_CMD(
wget, 3, 1, do_wget,"boot image via network using HTTP protocol","[loadAddress] [[hostIPaddr:]path and image name]"+); +#endif
static void netboot_update_env(void) { char tmp[22]; diff --git a/include/net.h b/include/net.h index ba96267eb8..14b013083d 100644 --- a/include/net.h +++ b/include/net.h @@ -539,7 +539,7 @@ extern int net_restart_wrap; /* Tried all network devices */
enum proto_t { BOOTP, RARP, ARP, TFTPGET, DHCP, PING, DNS, NFS, CDP, NETCONS, SNTP,
TFTPSRV, TFTPPUT, LINKLOCAL, FASTBOOT
TFTPSRV, TFTPPUT, LINKLOCAL, FASTBOOT, WGET};
extern char net_boot_file_name[1024];/* Boot File name */ diff --git a/include/net/wget.h b/include/net/wget.h new file mode 100644 index 0000000000..61bdd851f9 --- /dev/null +++ b/include/net/wget.h @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/*
- Duncan Hare Copyright 2017
- */
+void wget_start(void); /* Begin wget */
+enum WGET_STATE {
WGET_CLOSED,WGET_CONNECTING,WGET_CONNECTED,WGET_TRANSFERRING,WGET_TRANSFERRED+};
+#define DEBUG_WGET 0 /* Set to 1 for debug messges */ +#define SERVER_PORT 80 +#define WGET_RETRY_COUNT 30 +#define WGET_TIMEOUT 2000UL diff --git a/net/Makefile b/net/Makefile index 237023407f..882af145aa 100644 --- a/net/Makefile +++ b/net/Makefile @@ -23,8 +23,8 @@ obj-$(CONFIG_CMD_PING) += ping.o obj-$(CONFIG_CMD_RARP) += rarp.o obj-$(CONFIG_CMD_SNTP) += sntp.o obj-$(CONFIG_CMD_TFTPBOOT) += tftp.o -obj-$(CONFIG_UDP_FUNCTION_FASTBOOT) += fastboot.o obj-$(CONFIG_TCP) += tcp.o +obj-$(CONFIG_CMD_WGET) += wget.o
# Disable this warning as it is triggered by: # sprintf(buf, index ? "foo%d" : "foo", index) diff --git a/net/net.c b/net/net.c index 8ac1ff050f..39707d5b18 100644 --- a/net/net.c +++ b/net/net.c @@ -109,6 +109,7 @@ #include "sntp.h" #endif #include <net/tcp.h> +#include <net/wget.h>
/** BOOTP EXTENTIONS **/
@@ -494,6 +495,11 @@ restart: nfs_start(); break; #endif +#if defined(CONFIG_CMD_WGET)
case WGET:wget_start();break;+#endif #if defined(CONFIG_CMD_CDP) case CDP: cdp_start(); @@ -1540,7 +1546,8 @@ void copy_filename(char *dst, const char *src, int size)
#if defined(CONFIG_CMD_NFS) || \ defined(CONFIG_CMD_SNTP) || \
defined(CONFIG_CMD_DNS)
defined(CONFIG_CMD_DNS) || \defined(CONFIG_CMD_WGET)/*
- make port a little random (1024-17407)
- This keeps the math somewhat trivial to compute, and seems to work with
diff --git a/net/wget.c b/net/wget.c new file mode 100644 index 0000000000..8238ec52c4 --- /dev/null +++ b/net/wget.c @@ -0,0 +1,426 @@ +// SPDX-License-Identifier: GPL-2.0 +/*
- WGET/HTTP support driver based on U-BOOT's nfs.c
- Copyright Duncan Hare dh@synoia.com 2017
- */
+#include <common.h> +#include <command.h> +#include <mapmem.h> +#include <net.h> +#include <net/wget.h> +#include <net/tcp.h>
+const char bootfile1[] = "GET "; +const char bootfile3[] = " HTTP/1.0\r\n\r\n"; +const char http_eom[] = "\r\n\r\n"; +const char http_ok[] = "200"; +const char content_len[] = "Content-Length"; +const char linefeed[] = "\r\n";
Make all of them static const char ... ?
+static struct in_addr web_server_ip; +static int our_port; +static int wget_timeout_count;
+struct pkt_qd {
uchar *pkt;unsigned int tcp_seq_num;unsigned int len;+};
+/*
- This is a control structure for out of order packets received.
- The actual packet bufers are in the kernel space, and are
- expected to be overwritten by the downloaded image.
- */
+static struct pkt_qd pkt_q[PKTBUFSRX / 4]; +static int pkt_q_idx; +static unsigned long content_length; +static unsigned int packets;
+static unsigned int initial_data_seq_num;
+static enum WGET_STATE wget_state;
+static char *image_url; +static unsigned int wget_timeout = WGET_TIMEOUT;
+static void wget_timeout_handler(void);
+static enum net_loop_state wget_loop_state;
+/* Timeout retry parameters */ +static u8 retry_action; +static unsigned int retry_tcp_ack_num; +static unsigned int retry_tcp_seq_num; +static int retry_len;
+static inline int store_block(uchar *src, unsigned int offset, unsigned int len) +{
ulong newsize = offset + len;uchar *ptr;+#ifdef CONFIG_SYS_DIRECT_FLASH_WGET
int i, rc = 0;for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++) {/* start address in flash? */if (load_addr + offset >= flash_info[i].start[0]) {rc = 1;break;}}if (rc) { /* Flash is destination for this packet */rc = flash_write((uchar *)src,(ulong)(load_addr + offset), len);if (rc) {flash_perror(rc);return -1;}} else {+#endif /* CONFIG_SYS_DIRECT_FLASH_WGET */
ptr = map_sysmem(load_addr + offset, len);memcpy(ptr, src, len);unmap_sysmem(ptr);+#ifdef CONFIG_SYS_DIRECT_FLASH_WGET
}+#endif
if (net_boot_file_size < (offset + len))net_boot_file_size = newsize;return 0;+}
+/*
- wget response dispatcher
- WARNING, This, and only this, is the place in wget.c where
- SEQUENCE NUMBERS are swapped between incoming (RX)
- and outgoing (TX).
- Procedure wget_handler() is correct for RX traffic.
- */
+static void wget_send_stored(void) +{
u8 action = retry_action;unsigned int tcp_ack_num = retry_tcp_ack_num;unsigned int tcp_seq_num = retry_tcp_seq_num;int len = retry_len;uchar *ptr;uchar *offset;tcp_ack_num = tcp_ack_num + len;switch (wget_state) {case WGET_CLOSED:debug_cond(DEBUG_WGET, "wget: send SYN\n");wget_state = WGET_CONNECTING;net_send_tcp_packet(0, SERVER_PORT, our_port, action,tcp_seq_num, tcp_ack_num);packets = 0;break;case WGET_CONNECTING:pkt_q_idx = 0;net_send_tcp_packet(0, SERVER_PORT, our_port, action,tcp_seq_num, tcp_ack_num);ptr = net_tx_packet + net_eth_hdr_size()+ IP_TCP_HDR_SIZE + TCP_TSOPT_SIZE + 2;offset = ptr;memcpy(offset, &bootfile1, strlen(bootfile1));offset = offset + strlen(bootfile1);memcpy(offset, image_url, strlen(image_url));offset = offset + strlen(image_url);memcpy(offset, &bootfile3, strlen(bootfile3));offset = offset + strlen(bootfile3);net_send_tcp_packet((offset - ptr), SERVER_PORT, our_port,TCP_PUSH, tcp_seq_num, tcp_ack_num);wget_state = WGET_CONNECTED;break;case WGET_CONNECTED:case WGET_TRANSFERRING:case WGET_TRANSFERRED:net_send_tcp_packet(0, SERVER_PORT, our_port, action,tcp_seq_num, tcp_ack_num);break;}+}
+static void wget_send(u8 action, unsigned int tcp_ack_num,
unsigned int tcp_seq_num, int len)+{
retry_action = action;retry_tcp_ack_num = tcp_ack_num;retry_tcp_seq_num = tcp_seq_num;retry_len = len;wget_send_stored();+}
+void wget_fail(char *error_message, unsigned int tcp_seq_num,
unsigned int tcp_ack_num, u8 action)+{
printf("%s", error_message);printf("%s", "wget: Transfer Fail\n");net_set_timeout_handler(0, NULL);wget_send(action, tcp_seq_num, tcp_ack_num, 0);+}
+void wget_success(u8 action, unsigned int tcp_seq_num,
unsigned int tcp_ack_num, int len, int packets)+{
printf("Packets received %d, Transfer Successful\n", packets);wget_send(action, tcp_seq_num, tcp_ack_num, len);+}
+/*
- Interfaces of U-BOOT
- */
+static void wget_timeout_handler(void) +{
if (++wget_timeout_count > WGET_RETRY_COUNT) {puts("\nRetry count exceeded; starting again\n");wget_send(TCP_RST, 0, 0, 0);net_start_again();} else {puts("T ");net_set_timeout_handler(wget_timeout +WGET_TIMEOUT * wget_timeout_count,wget_timeout_handler);wget_send_stored();}+}
+static void wget_connected(uchar *pkt, unsigned int tcp_seq_num,
struct in_addr action_and_state,unsigned int tcp_ack_num, unsigned int len)+{
u8 action = action_and_state.s_addr;uchar *pkt_in_q;char *pos;int hlen;int i;pkt[len] = '\0';pos = strstr((char *)pkt, http_eom);if (pos == 0) {debug_cond(DEBUG_WGET,"wget: Connected, data before Header %p\n", pkt);pkt_in_q = (void *)load_addr + 0x20000 + (pkt_q_idx * 0x800);memcpy(pkt_in_q, pkt, len);pkt_q[pkt_q_idx].pkt = pkt_in_q;pkt_q[pkt_q_idx].tcp_seq_num = tcp_seq_num;pkt_q[pkt_q_idx].len = len;pkt_q_idx++;} else {debug_cond(DEBUG_WGET, "wget: Connected HTTP Header %p\n", pkt);hlen = pos - (char *)pkt + sizeof(http_eom) - 1;pos = strstr((char *)pkt, linefeed);if (pos > 0)i = pos - (char *)pkt;elsei = hlen;printf("%.*s", i, pkt);wget_state = WGET_TRANSFERRING;if (strstr((char *)pkt, http_ok) == 0) {debug_cond(DEBUG_WGET,"wget: Connected Bad Xfer\n");wget_loop_state = NETLOOP_FAIL;wget_send(action, tcp_seq_num, tcp_ack_num, len);} else {debug_cond(DEBUG_WGET,"wget: Connctd pkt %p hlen %x\n",pkt, hlen);initial_data_seq_num = tcp_seq_num + hlen;pos = strstr((char *)pkt, content_len);if (!pos) {content_length = -1;} else {pos = pos + sizeof(content_len) + 2;strict_strtoul(pos, 10, &content_length);debug_cond(DEBUG_WGET,"wget: Connected Len %lu\n",content_length);}net_boot_file_size = 0;if (len > hlen)store_block(pkt + hlen, 0, len - hlen);debug_cond(DEBUG_WGET,"wget: Connected Pkt %p hlen %x\n",pkt, hlen);for (i = 0; i < pkt_q_idx; i++) {store_block(pkt_q[i].pkt,pkt_q[i].tcp_seq_num -initial_data_seq_num,pkt_q[i].len);debug_cond(DEBUG_WGET,"wget: Connctd pkt Q %p len %x\n",pkt_q[i].pkt, pkt_q[i].len);}}}wget_send(action, tcp_seq_num, tcp_ack_num, len);+}
/** In the "application push" invocation, the TCP header with all* its information is pointed to by the packet pointer.** in the typedef* void rxhand_tcp(uchar *pkt, unsigned int dport,* struct in_addr sip, unsigned int sport,* unsigned int len);* *pkt is the pointer to the payload* dport is used for tcp_seg_num* action_and_state.s_addr is used for TCP state* sport is used for tcp_ack_num (which is unused by the app)* pkt_ length is the payload length.*/
interesting indentation...
+static void wget_handler(uchar *pkt, unsigned int tcp_seq_num,
struct in_addr action_and_state,unsigned int tcp_ack_num, unsigned int len)+{
enum TCP_STATE wget_tcp_state = tcp_get_tcp_state();u8 action = action_and_state.s_addr;net_set_timeout_handler(wget_timeout, wget_timeout_handler);packets++;switch (wget_state) {case WGET_CLOSED:debug_cond(DEBUG_WGET, "wget: Handler: Error!, State wrong\n");break;case WGET_CONNECTING:debug_cond(DEBUG_WGET,"wget: Connecting In len=%x, Seq=%x, Ack=%x\n",len, tcp_seq_num, tcp_ack_num);if (len == 0) {if (wget_tcp_state == TCP_ESTABLISHED) {debug_cond(DEBUG_WGET,"wget: Cting, send, len=%x\n", len);wget_send(action, tcp_seq_num, tcp_ack_num,len);} else {printf("%.*s", len, pkt);wget_fail("wget: Handler Connected Fail\n",tcp_seq_num, tcp_ack_num, action);}}break;case WGET_CONNECTED:debug_cond(DEBUG_WGET, "wget: Connected seq=%x, len=%x\n",tcp_seq_num, len);if (len == 0) {wget_fail("Image not found, no data returned\n",tcp_seq_num, tcp_ack_num, action);} else {wget_connected(pkt, tcp_seq_num, action_and_state,tcp_ack_num, len);}break;case WGET_TRANSFERRING:debug_cond(DEBUG_WGET,"wget: Transferring, seq=%x, ack=%x,len=%x\n",tcp_seq_num, tcp_ack_num, len);if (store_block(pkt,tcp_seq_num - initial_data_seq_num, len) != 0) {wget_fail("wget: store error\n",tcp_seq_num, tcp_ack_num, action);return;}switch (wget_tcp_state) {case TCP_FIN_WAIT_2:wget_send(TCP_ACK, tcp_seq_num, tcp_ack_num, len);case TCP_SYN_SENT:case TCP_CLOSING:case TCP_FIN_WAIT_1:case TCP_CLOSED:net_set_state(NETLOOP_FAIL);break;case TCP_ESTABLISHED:wget_send(TCP_ACK, tcp_seq_num, tcp_ack_num,len);wget_loop_state = NETLOOP_SUCCESS;break;case TCP_CLOSE_WAIT: /* End of transfer */wget_state = WGET_TRANSFERRED;wget_send(action | TCP_ACK | TCP_FIN,tcp_seq_num, tcp_ack_num, len);break;}break;case WGET_TRANSFERRED:printf("Packets received %d, Transfer Successful\n", packets);net_set_state(wget_loop_state);break;}+}
+void wget_start(void) +{
debug_cond(DEBUG_WGET, "%s\n", __func__);image_url = strchr(net_boot_file_name, ':');if (image_url > 0) {web_server_ip = string_to_ip(net_boot_file_name);++image_url;} else {web_server_ip = net_server_ip;image_url = net_boot_file_name;}debug_cond(DEBUG_WGET,"wget: Transfer HTTP Server %pI4; our IP %pI4\n",&web_server_ip, &net_ip);/* Check if we need to send across this subnet */if (net_gateway.s_addr && net_netmask.s_addr) {struct in_addr our_net;struct in_addr server_net;our_net.s_addr = net_ip.s_addr & net_netmask.s_addr;server_net.s_addr = net_server_ip.s_addr & net_netmask.s_addr;if (our_net.s_addr != server_net.s_addr)debug_cond(DEBUG_WGET,"wget: sending through gateway %pI4",&net_gateway);}debug_cond(DEBUG_WGET, "URL '%s\n", image_url);if (net_boot_file_expected_size_in_blocks) {debug_cond(DEBUG_WGET, "wget: Size is 0x%x Bytes = ",net_boot_file_expected_size_in_blocks << 9);print_size(net_boot_file_expected_size_in_blocks << 9, "");}debug_cond(DEBUG_WGET,"\nwget:Load address: 0x%lx\nLoading: *\b", load_addr);net_set_timeout_handler(wget_timeout, wget_timeout_handler);tcp_set_tcp_handler(wget_handler);wget_timeout_count = 0;wget_state = WGET_CLOSED;our_port = random_port();/** Zero out server ether to forece apr resolution in case* the server ip for the previous u-boot commsnd, for exanple dns* is not the same as the web server ip.*/memset(net_server_ethaddr, 0, 6);wget_send(TCP_SYN, 0, 0, 0);+}
2.11.0
U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot