add TCP and HTTP for downloading images
Subsystems (2)
v16 cover add TCP and HTTP for downloading images
From: "Ying-Chun Liu (PaulLiu)" <[email protected]>
This patch is a refresh from previous patches made by Duncan Hare <[email protected]>. I've contacted him and continue to work on this patch.
This patch introduce a TCP stack with SACK. And a simple wget command to download images from http server.
v1-v12: Made by Duncan, didn't tracked.
v13: Fix some issues which is reviewed by Christian
v14: Add options to enable/disable SACK.
v15: Fix various syntax errors reviewed by Michal.
Remove magic numbers. Use kernel-doc format.
v16: Add more kernel-doc. Fix more double spaces.
Ying-Chun Liu (PaulLiu) (2):
net: Add TCP protocol
net: Add wget application
cmd/Kconfig | 7 + cmd/net.c | 13 + include/net.h | 38 ++- include/net/tcp.h | 312 ++++++++++++++++++++ include/net/wget.h | 22 ++ net/Kconfig | 16 + net/Makefile | 2 + net/net.c | 36 +++ net/tcp.c | 720 +++++++++++++++++++++++++++++++++++++++++++++ net/wget.c | 426 +++++++++++++++++++++++++++ 10 files changed, 1582 insertions(+), 10 deletions(-) create mode 100644 include/net/tcp.h create mode 100644 include/net/wget.h create mode 100644 net/tcp.c create mode 100644 net/wget.c
Signature · 1 line
2.35.1
PATCH v16 1/2 net: Add TCP protocol
From: "Ying-Chun Liu (PaulLiu)" <[email protected]>
Currently file transfers are done using tftp or NFS both over udp. This requires a request to be sent from client (u-boot) to the boot server.
The current standard is TCP with selective acknowledgment.
---
v1-v12: Made by Duncan, didn't tracked.
v13: Fix some issues which is reviewed by Christian
v14: Add options to enable/disable SACK.
v15: Fix various syntax errors reviewed by Michal.
Remove magic numbers. Use kernel-doc format.
v16: Add more kernel-doc. Fix more double spaces.
--- include/net.h | 36 ++- include/net/tcp.h | 312 ++++++++++++++++++++ net/Kconfig | 16 ++ net/Makefile | 1 + net/net.c | 30 ++ net/tcp.c | 720 ++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 1106 insertions(+), 9 deletions(-) create mode 100644 include/net/tcp.h create mode 100644 net/tcp.c
include/net.h +27 -9
@@ -365,6 +365,7 @@ struct vlan_ethernet_hdr {#define PROT_NCSI 0x88f8/* NC-SI control packets */ #define IPPROTO_ICMP 1/* Internet Control Message Protocol */ +#define IPPROTO_TCP 6/* Transmission Control Protocol */ #define IPPROTO_UDP 17/* User Datagram Protocol */ /*
@@ -688,19 +689,36 @@ static inline void net_send_packet(uchar *pkt, int len) (void )eth_send (pkt, len); } -/* -* Transmit "net_tx_packet" as UDP packet, performing ARP request if needed -* (ether will be populated) -* -* @param ether Raw packet buffer -* @param dest IP address to send the datagram to -* @param dport Destination UDP port -* @param sport Source UDP port -* @param payload_len Length of data after the UDP header +/** +* net_send_ip_packet() - Transmit "net_tx_packet" as UDP or TCP packet, +* send ARP request if needed (ether will be populated) +* @ether: Raw packet buffer +* @dest: IP address to send the datagram to +* @dport: Destination UDP port +* @sport: Source UDP port +* @payload_len: Length of data after the UDP header +* @action: TCP action to be performed +* @tcp_seq_num: TCP sequence number of this transmission +* @tcp_ack_num: TCP stream acknolegement number +* +* Return: 0 on success, other value on failure */ int net_send_ip_packet (uchar *ether,struct in_addr dest,int dport,int sport,int payload_len,int proto,u8 action,u32 tcp_seq_num,u32 tcp_ack_num); +/** +* net_send_tcp_packet() - Transmit TCP packet. +* @payload_len: length of payload +* @dport: Destination TCP port +* @sport: Source TCP port +* @action: TCP action to be performed +* @tcp_seq_num: TCP sequence number of this transmission +* @tcp_ack_num: TCP stream acknolegement number +* +* Return: 0 on success, other value on failure +*/ +int net_send_tcp_packet (int payload_len,int dport,int sport,u8 action, +u32 tcp_seq_num,u32 tcp_ack_num);int net_send_udp_packet (uchar *ether,struct in_addr dest,int dport,int sport,int payload_len);
include/net/tcp.h new file +312 -0
312 lines not on this page · raw message
net/Kconfig +16 -0
@@ -168,6 +168,22 @@ config BOOTP_SERVERIP variable, not the BOOTP server. This affects the operation of both bootp and tftp. +config PROT_TCP + bool "TCP stack" + help + Enable a generic tcp framework that allows defining a custom + handler for tcp protocol. + +config PROT_TCP_SACK + bool "TCP SACK support" + depends on PROT_TCP + help + TCP protocol with SACK. SACK means selective acknowledgements. + By turning this option on TCP will learn what segments are already + received. So that it improves TCP's retransmission efficiency. + This option should be turn on if you want to achieve the fastest + file transfer possible. + endif # if NET config SYS_RX_ETH_BUFFER
net/Makefile +1 -0
@@ -30,6 +30,7 @@ obj-$(CONFIG_CMD_TFTPBOOT) += tftp.o obj-$(CONFIG_UDP_FUNCTION_FASTBOOT) += fastboot.o obj-$(CONFIG_CMD_WOL) += wol.o obj-$(CONFIG_PROT_UDP) += udp.o +obj-$(CONFIG_PROT_TCP) += tcp.o # Disable this warning as it is triggered by: # sprintf(buf, index ? "foo%d" : "foo", index)
net/net.c +30 -0
@@ -116,6 +116,7 @@#if defined(CONFIG_CMD_WOL )#include "wol.h" #endif +#include <net/tcp.h> /** BOOTP EXTENTIONS **/
@@ -386,6 +387,8 @@ int net_init(void)/* Only need to setup buffer pointers once. */ first_call =0 ; +if (IS_ENABLED (CONFIG_PROT_TCP )) +tcp_set_tcp_state (TCP_CLOSED ); }return net_init_loop ();
@@ -816,6 +819,16 @@ int net_send_udp_packet(uchar *ether, struct in_addr dest, int dport, int sport, IPPROTO_UDP, 0, 0, 0); } +#if defined(CONFIG_PROT_TCP ) +int net_send_tcp_packet (int payload_len,int dport,int sport,u8 action, +u32 tcp_seq_num,u32 tcp_ack_num) +{ +return net_send_ip_packet (net_server_ethaddr, net_server_ip, dport, + sport, payload_len,IPPROTO_TCP , action, + tcp_seq_num, tcp_ack_num); +} +#endif +int net_send_ip_packet (uchar *ether,struct in_addr dest,int dport,int sport,int payload_len,int proto,u8 action,u32 tcp_seq_num,u32 tcp_ack_num)
@@ -847,6 +860,14 @@ int net_send_ip_packet(uchar *ether, struct in_addr dest, int dport, int sport, payload_len); pkt_hdr_size = eth_hdr_size +IP_UDP_HDR_SIZE ;break ; +#if defined(CONFIG_PROT_TCP ) +case IPPROTO_TCP : + pkt_hdr_size = eth_hdr_size + +tcp_set_tcp_header (pkt + eth_hdr_size, dport, sport, + payload_len, action, tcp_seq_num, + tcp_ack_num); +break ; +#endif default :return -EINVAL ; }
@@ -1256,6 +1277,15 @@ void net_process_received_packet(uchar *in_packet, int len)if (ip->ip_p ==IPPROTO_ICMP ) {receive_icmp (ip, len, src_ip, et);return ; +#if defined(CONFIG_PROT_TCP ) + } else if (ip->ip_p == IPPROTO_TCP) { +debug_cond (DEBUG_DEV_PKT , +"TCP PH (to=%pI4, from=%pI4, len=%d)\n" , + &dst_ip, &src_ip, len); + +rxhand_tcp_f ((union tcp_build_pkt *)ip, len); +return ; +#endif }else if (ip->ip_p !=IPPROTO_UDP ) {/* Only UDP packets */ return ; }
net/tcp.c new file +720 -0
720 lines not on this page · raw message
Signature · 1 line
2.35.1
PATCH v16 2/2 net: Add wget application
In reply to Ying-Chun Liu (PaulLiu)From: "Ying-Chun Liu (PaulLiu)" <[email protected]>
This commit adds a simple wget command that can download files from http server.
The command syntax is
wget ${loadaddr} <path of the file from server>
---
v1-v12: Made by Duncan, didn't tracked.
v13: Fix some issues which is reviewed by Christian
v14: Add options to enable/disable SACK.
v15: Fix various syntax errors reviewed by Michal.
Remove magic numbers. Use kernel-doc format.
v16: Add more kernel-doc. Fix more double spaces.
--- cmd/Kconfig | 7 + cmd/net.c | 13 ++ include/net.h | 2 +- include/net/wget.h | 22 +++ net/Makefile | 1 + net/net.c | 6 + net/wget.c | 426 +++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 476 insertions(+), 1 deletion(-) create mode 100644 include/net/wget.h create mode 100644 net/wget.c
cmd/Kconfig +7 -0
@@ -1715,6 +1715,13 @@ config NFS_TIMEOUT "ERROR: Cannot umount" in nfs command, try longer timeout such as 10000. +config CMD_WGET + bool "wget" + select TCP + help + wget is a simple command to download kernel, or other files, + from a http server over TCP. + config CMD_MII bool "mii" imply CMD_MDIO
cmd/net.c +13 -0
@@ -124,6 +124,19 @@ U_BOOT_CMD( );#endif +#if defined(CONFIG_CMD_WGET ) +static int do_wget (struct cmd_tbl *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 ];
include/net.h +1 -1
@@ -559,7 +559,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 ,WOL ,UDP +TFTPSRV ,TFTPPUT ,LINKLOCAL ,FASTBOOT ,WOL ,UDP ,WGET };extern char net_boot_file_name[1024 ];/* Boot File name */
include/net/wget.h new file +22 -0
@@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Duncan Hare Copyright 2017 +*/ + +/** +* wget_start() - begin wget +*/ +void wget_start (void ); + +enum wget_state { +WGET_CLOSED , +WGET_CONNECTING , +WGET_CONNECTED , +WGET_TRANSFERRING , +WGET_TRANSFERRED +}; + +#define DEBUG_WGET 0/* Set to 1 for debug messages */ +#define SERVER_PORT 80 +#define WGET_RETRY_COUNT 30 +#define WGET_TIMEOUT 2000UL
net/Makefile +1 -0
@@ -31,6 +31,7 @@ obj-$(CONFIG_UDP_FUNCTION_FASTBOOT) += fastboot.o obj-$(CONFIG_CMD_WOL) += wol.o obj-$(CONFIG_PROT_UDP) += udp.o obj-$(CONFIG_PROT_TCP) += tcp.o +obj-$(CONFIG_CMD_WGET) += wget.o # Disable this warning as it is triggered by: # sprintf(buf, index ? "foo%d" : "foo", index)
net/net.c +6 -0
@@ -117,6 +117,7 @@#include "wol.h" #endif #include <net/tcp.h> +#include <net/wget.h> /** BOOTP EXTENTIONS **/
@@ -505,6 +506,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 ();
net/wget.c new file +426 -0
426 lines not on this page · raw message
Signature · 1 line
2.35.1
Re: [PATCH v16 2/2] net: Add wget application
Quoted 586 lines · Ying-Chun Liu (PaulLiu)
From: "Ying-Chun Liu (PaulLiu)" <[email protected]>
This commit adds a simple wget command that can download files from http server.
The command syntax is
wget ${loadaddr} <path of the file from server>Signed-off-by Duncan Hare <[email protected]>Signed-off-by Ying-Chun Liu (PaulLiu) <[email protected]>Cc Christian Gmeiner <[email protected]>Cc Joe Hershberger <[email protected]>Cc Michal Simek <[email protected]>Cc Ramon Fried <[email protected]>---
v1-v12: Made by Duncan, didn't tracked.
v13: Fix some issues which is reviewed by Christian
v14: Add options to enable/disable SACK.
v15: Fix various syntax errors reviewed by Michal.
Remove magic numbers. Use kernel-doc format.
v16: Add more kernel-doc. Fix more double spaces.--- cmd/Kconfig | 7 + cmd/net.c | 13 ++ include/net.h | 2 +- include/net/wget.h | 22 +++ net/Makefile | 1 + net/net.c | 6 + net/wget.c | 426 +++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 476 insertions(+), 1 deletion(-) create mode 100644 include/net/wget.h create mode 100644 net/wget.ccmd/Kconfig +7
-0@@ -1715,6 +1715,13 @@ config NFS_TIMEOUT "ERROR: Cannot umount" in nfs command, try longer timeout such as 10000. +config CMD_WGET + bool "wget" + select TCP + help + wget is a simple command to download kernel, or other files, + from a http server over TCP. + config CMD_MII bool "mii" imply CMD_MDIOcmd/net.c +13
-0@@ -124,6 +124,19 @@ U_BOOT_CMD( );#endif +#if defined(CONFIG_CMD_WGET ) +static int do_wget (struct cmd_tbl *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 ];include/net.h +1
-1@@ -559,7 +559,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 ,WOL ,UDP +TFTPSRV ,TFTPPUT ,LINKLOCAL ,FASTBOOT ,WOL ,UDP ,WGET };extern char net_boot_file_name[1024 ];/* Boot File name */ include/net/wget.h new file +22
-0@@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Duncan Hare Copyright 2017 +*/ + +/** +* wget_start() - begin wget +*/ +void wget_start (void ); + +enum wget_state { +WGET_CLOSED , +WGET_CONNECTING , +WGET_CONNECTED , +WGET_TRANSFERRING , +WGET_TRANSFERRED +}; + +#define DEBUG_WGET 0/* Set to 1 for debug messages */ +#define SERVER_PORT 80 +#define WGET_RETRY_COUNT 30 +#define WGET_TIMEOUT 2000ULnet/Makefile +1
-0@@ -31,6 +31,7 @@ obj-$(CONFIG_UDP_FUNCTION_FASTBOOT) += fastboot.o obj-$(CONFIG_CMD_WOL) += wol.o obj-$(CONFIG_PROT_UDP) += udp.o obj-$(CONFIG_PROT_TCP) += tcp.o +obj-$(CONFIG_CMD_WGET) += wget.o # Disable this warning as it is triggered by: # sprintf(buf, index ? "foo%d" : "foo", index)net/net.c +6
-0@@ -117,6 +117,7 @@#include "wol.h" #endif #include <net/tcp.h> +#include <net/wget.h> /** BOOTP EXTENTIONS **/ @@ -505,6 +506,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 ();net/wget.c new file +426
-1@@ -0,0 +1,426 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* WGET/HTTP support driver based on U-BOOT's nfs.c +* Copyright Duncan Hare <[email protected]> 2017 +*/ + +#include <command.h> +#include <common.h> +#include <env.h> +#include <image.h> +#include <mapmem.h> +#include <net.h> +#include <net/tcp.h> +#include <net/wget.h> + +static const char bootfile1[] ="GET " ; +static const char bootfile3[] =" HTTP/1.0\r\n\r\n" ; +static const char http_eom[] ="\r\n\r\n" ; +static const char http_ok[] ="200" ; +static const char content_len[] ="Content-Length" ; +static const char linefeed[] ="\r\n" ; +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 current_wget_state; + +static char *image_url; +static unsigned int wget_timeout =WGET_TIMEOUT ; + +static enum net_loop_state wget_loop_state; + +/* Timeout retry parameters */ +static u8 retry_action;/* actions for TCP retry */ +static unsigned int retry_tcp_ack_num;/* TCP retry acknowledge number*/ +static unsigned int retry_tcp_seq_num;/* TCP retry sequence number */ +static int retry_len;/* TCP retry length */ + +/** +* store_block() - store block in memory +* @src: source of data +* @offset: offset +* @len: length +*/ +static inline int store_block (uchar *src,unsigned int offset,unsigned int len) +{ +ulong newsize = offset + len; +uchar *ptr; + + ptr =map_sysmem (image_load_addr + offset, len); +memcpy (ptr, src, len); +unmap_sysmem (ptr); + +if (net_boot_file_size < (offset + len)) + net_boot_file_size = newsize; + +return 0 ; +} + +/** +* wget_send_stored() - 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; +int len = retry_len; +unsigned int tcp_ack_num = retry_tcp_ack_num + len; +unsigned int tcp_seq_num = retry_tcp_seq_num; +uchar *ptr, *offset; + +switch (current_wget_state) { +case WGET_CLOSED : +debug_cond (DEBUG_WGET ,"wget: send SYN\n" ); + current_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 +=strlen (bootfile1); + +memcpy (offset, image_url,strlen (image_url)); + offset +=strlen (image_url); + +memcpy (offset, &bootfile3,strlen (bootfile3)); + offset +=strlen (bootfile3); +net_send_tcp_packet ((offset - ptr),SERVER_PORT , our_port, +TCP_PUSH , tcp_seq_num, tcp_ack_num); + current_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 ("wget: Transfer Fail - %s\n" , error_message); +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 (); + } +} + +#define PKT_QUEUE_OFFSET 0x20000 +#define PKT_QUEUE_PACKET_SIZE 0x800 + +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, i; + + pkt[len] ='\0' ; + pos =strstr ((char *)pkt, http_eom); + +if (!pos) { +debug_cond (DEBUG_WGET , +"wget: Connected, data before Header %p\n" , pkt); + pkt_in_q = (void *)image_load_addr +PKT_QUEUE_OFFSET + + (pkt_q_idx *PKT_QUEUE_PACKET_SIZE ); +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); +/* sizeof(http_eom) - 1 is the string length of (http_eom) */ + hlen = pos - (char *)pkt +sizeof (http_eom) -1 ; + pos =strstr ((char *)pkt, linefeed); +if (pos >0 ) + i = pos - (char *)pkt; +else + i = hlen; +printf ("%.*s" , i, pkt); + + current_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 +=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); +} + +/** +* wget_handler() - handler of wget +* @pkt: the pointer to the payload +* @tcp_seq_num: tcp sequence number +* @action_and_state: TCP state +* @tcp_ack_num: tcp acknowledge number +* @len: length of the payload +* +* In the "application push" invocation, the TCP header with all +* its information is pointed to by the packet pointer. +*/ +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 (current_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) { +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) { +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); + fallthrough; +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 */ + current_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 ; + } +} + +#define RANDOM_PORT_START 1024 +#define RANDOM_PORT_RANGE 0x4000 + +/** +* random_port() - make port a little random (1024-17407) +* +* Return: random port number from 1024 to 17407 +* +* This keeps the math somewhat trivial to compute, and seems to work with +* all supported protocols/clients/servers +*/ +static unsigned int random_port (void ) +{ +return RANDOM_PORT_START + (get_timer (0 ) %RANDOM_PORT_RANGE ); +} + +#define BLOCKSIZE 512 + +void wget_start (void ) +{ + 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 *BLOCKSIZE ); +print_size (net_boot_file_expected_size_in_blocks *BLOCKSIZE , +"" ); + } +debug_cond (DEBUG_WGET , +"\nwget:Load address: 0x%lx\nLoading: *\b" , image_load_addr); + +net_set_timeout_handler (wget_timeout, wget_timeout_handler); +tcp_set_tcp_handler (wget_handler); + + wget_timeout_count =0 ; + current_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 ); +} --
Quoted 2 lines
2.35.1
Hi Ying.
I downloaded the patches and tried to wget a file from a remote server and it doesn't work.
I used the sandbox64, ping to the server is working correctly, but wget is just printing timeouts.
=> dhcp
BOOTP broadcast 1
BOOTP broadcast 2
BOOTP broadcast 3
*** Unhandled DHCP Option in OFFER/ACK: 224
*** Unhandled DHCP Option in OFFER/ACK: 224
DHCP client bound to address 172.23.1.113 (1005 ms)
*** ERROR: `serverip' not set
=>
BOOTP broadcast 1
*** Unhandled DHCP Option in OFFER/ACK: 224
*** Unhandled DHCP Option in OFFER/ACK: 224
DHCP client bound to address 172.23.1.113 (4 ms)
*** ERROR: `serverip' not set
=> wget 0x1000000 172.25.1.14/index.html
wget: Transfer HTTP Server 0.0.0.0; our IP 172.23.1.113
wget: sending through gateway 172.23.1.254URL '172.25.1.14/index.html'
wget:Load address: 0x1000000
Loading: wget: send SYN
T T T T
Can you verify on your end ?
Thanks,
Ramon