X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=blobdiff_plain;f=net%2Ftftp.c;h=89be32a26bd8cfaca738bda523cc400830088fa4;hp=fb98a346ea6e55fe2fdbcf6d5c0992cc1c56d13b;hb=1f8434723ebbae4a1d95181e2b05a5e6dadfb02c;hpb=9e4623a0addf58fe4fd389fbdd559c179146f4a0;ds=sidebyside diff --git a/net/tftp.c b/net/tftp.c index fb98a346ea..89be32a26b 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -1,26 +1,33 @@ /* - * Copyright 1994, 1995, 2000 Neil Russell. - * (See License) - * Copyright 2000, 2001 DENX Software Engineering, Wolfgang Denk, wd@denx.de + * Copyright 1994, 1995, 2000 Neil Russell. + * (See License) + * Copyright 2000, 2001 DENX Software Engineering, Wolfgang Denk, wd@denx.de + * Copyright 2011 Comelit Group SpA, + * Luca Ceresoli */ #include #include +#include #include #include "tftp.h" #include "bootp.h" +#ifdef CONFIG_SYS_DIRECT_FLASH_TFTP +#include +#endif -#if defined(CONFIG_CMD_NET) - -#define WELL_KNOWN_PORT 69 /* Well known TFTP port # */ -#define TIMEOUT 5000UL /* Millisecs to timeout for lost pkt */ +/* Well known TFTP port # */ +#define WELL_KNOWN_PORT 69 +/* Millisecs to timeout for lost pkt */ +#define TIMEOUT 5000UL #ifndef CONFIG_NET_RETRY_COUNT -# define TIMEOUT_COUNT 10 /* # of timeouts before giving up */ +/* # of timeouts before giving up */ +# define TIMEOUT_COUNT 10 #else # define TIMEOUT_COUNT (CONFIG_NET_RETRY_COUNT * 2) #endif - /* (for checking the image size) */ -#define HASHES_PER_LINE 65 /* Number of "loading" hashes per line */ +/* Number of "loading" hashes per line (for checking the image size) */ +#define HASHES_PER_LINE 65 /* * TFTP operations. @@ -32,39 +39,74 @@ #define TFTP_ERROR 5 #define TFTP_OACK 6 -static ulong TftpTimeoutMSecs = TIMEOUT; -static int TftpTimeoutCountMax = TIMEOUT_COUNT; +static ulong timeout_ms = TIMEOUT; +static int timeout_count_max = TIMEOUT_COUNT; +static ulong time_start; /* Record time we started tftp */ /* * These globals govern the timeout behavior when attempting a connection to a - * TFTP server. TftpRRQTimeoutMSecs specifies the number of milliseconds to + * TFTP server. tftp_timeout_ms specifies the number of milliseconds to * wait for the server to respond to initial connection. Second global, - * TftpRRQTimeoutCountMax, gives the number of such connection retries. - * TftpRRQTimeoutCountMax must be non-negative and TftpRRQTimeoutMSecs must be + * tftp_timeout_count_max, gives the number of such connection retries. + * tftp_timeout_count_max must be non-negative and tftp_timeout_ms must be * positive. The globals are meant to be set (and restored) by code needing * non-standard timeout behavior when initiating a TFTP transfer. */ -ulong TftpRRQTimeoutMSecs = TIMEOUT; -int TftpRRQTimeoutCountMax = TIMEOUT_COUNT; - -static IPaddr_t TftpServerIP; -static int TftpServerPort; /* The UDP port at their end */ -static int TftpOurPort; /* The UDP port at our end */ -static int TftpTimeoutCount; -static ulong TftpBlock; /* packet sequence number */ -static ulong TftpLastBlock; /* last packet sequence number received */ -static ulong TftpBlockWrap; /* count of sequence number wraparounds */ -static ulong TftpBlockWrapOffset; /* memory offset due to wrapping */ -static int TftpState; - -#define STATE_RRQ 1 +ulong tftp_timeout_ms = TIMEOUT; +int tftp_timeout_count_max = TIMEOUT_COUNT; + +enum { + TFTP_ERR_UNDEFINED = 0, + TFTP_ERR_FILE_NOT_FOUND = 1, + TFTP_ERR_ACCESS_DENIED = 2, + TFTP_ERR_DISK_FULL = 3, + TFTP_ERR_UNEXPECTED_OPCODE = 4, + TFTP_ERR_UNKNOWN_TRANSFER_ID = 5, + TFTP_ERR_FILE_ALREADY_EXISTS = 6, +}; + +static struct in_addr tftp_remote_ip; +/* The UDP port at their end */ +static int tftp_remote_port; +/* The UDP port at our end */ +static int tftp_our_port; +static int timeout_count; +/* packet sequence number */ +static ulong tftp_cur_block; +/* last packet sequence number received */ +static ulong tftp_prev_block; +/* count of sequence number wraparounds */ +static ulong tftp_block_wrap; +/* memory offset due to wrapping */ +static ulong tftp_block_wrap_offset; +static int tftp_state; +#ifdef CONFIG_TFTP_TSIZE +/* The file size reported by the server */ +static int tftp_tsize; +/* The number of hashes we printed */ +static short tftp_tsize_num_hash; +#endif +#ifdef CONFIG_CMD_TFTPPUT +/* 1 if writing, else 0 */ +static int tftp_put_active; +/* 1 if we have sent the last block */ +static int tftp_put_final_block_sent; +#else +#define tftp_put_active 0 +#endif + +#define STATE_SEND_RRQ 1 #define STATE_DATA 2 #define STATE_TOO_LARGE 3 #define STATE_BAD_MAGIC 4 #define STATE_OACK 5 +#define STATE_RECV_WRQ 6 +#define STATE_SEND_WRQ 7 -#define TFTP_BLOCK_SIZE 512 /* default TFTP block size */ -#define TFTP_SEQUENCE_SIZE ((ulong)(1<<16)) /* sequence number is 16 bit */ +/* default TFTP block size */ +#define TFTP_BLOCK_SIZE 512 +/* sequence number is 16 bit */ +#define TFTP_SEQUENCE_SIZE ((ulong)(1<<16)) #define DEFAULT_NAME_LEN (8 + 4 + 1) static char default_filename[DEFAULT_NAME_LEN]; @@ -77,52 +119,58 @@ static char default_filename[DEFAULT_NAME_LEN]; static char tftp_filename[MAX_LEN]; -#ifdef CONFIG_SYS_DIRECT_FLASH_TFTP -extern flash_info_t flash_info[]; -#endif - /* 512 is poor choice for ethernet, MTU is typically 1500. * Minus eth.hdrs thats 1468. Can get 2x better throughput with * almost-MTU block sizes. At least try... fall back to 512 if need be. + * (but those using CONFIG_IP_DEFRAG may want to set a larger block in cfg file) */ +#ifdef CONFIG_TFTP_BLOCKSIZE +#define TFTP_MTU_BLOCKSIZE CONFIG_TFTP_BLOCKSIZE +#else #define TFTP_MTU_BLOCKSIZE 1468 -static unsigned short TftpBlkSize=TFTP_BLOCK_SIZE; -static unsigned short TftpBlkSizeOption=TFTP_MTU_BLOCKSIZE; +#endif + +static unsigned short tftp_block_size = TFTP_BLOCK_SIZE; +static unsigned short tftp_block_size_option = TFTP_MTU_BLOCKSIZE; #ifdef CONFIG_MCAST_TFTP #include #define MTFTP_BITMAPSIZE 0x1000 -static unsigned *Bitmap; -static int PrevBitmapHole,Mapsize=MTFTP_BITMAPSIZE; -static uchar ProhibitMcast=0, MasterClient=0; -static uchar Multicast=0; -extern IPaddr_t Mcast_addr; -static int Mcast_port; -static ulong TftpEndingBlock; /* can get 'last' block before done..*/ - -static void parse_multicast_oack(char *pkt,int len); - -static void -mcast_cleanup(void) +static unsigned *tftp_mcast_bitmap; +static int tftp_mcast_prev_hole; +static int tftp_mcast_bitmap_size = MTFTP_BITMAPSIZE; +static int tftp_mcast_disabled; +static int tftp_mcast_master_client; +static int tftp_mcast_active; +static int tftp_mcast_port; +/* can get 'last' block before done..*/ +static ulong tftp_mcast_ending_block; + +static void parse_multicast_oack(char *pkt, int len); + +static void mcast_cleanup(void) { - if (Mcast_addr) eth_mcast_join(Mcast_addr, 0); - if (Bitmap) free(Bitmap); - Bitmap=NULL; - Mcast_addr = Multicast = Mcast_port = 0; - TftpEndingBlock = -1; + if (net_mcast_addr) + eth_mcast_join(net_mcast_addr, 0); + if (tftp_mcast_bitmap) + free(tftp_mcast_bitmap); + tftp_mcast_bitmap = NULL; + net_mcast_addr.s_addr = 0; + tftp_mcast_active = 0; + tftp_mcast_port = 0; + tftp_mcast_ending_block = -1; } #endif /* CONFIG_MCAST_TFTP */ -static __inline__ void -store_block (unsigned block, uchar * src, unsigned len) +static inline void store_block(int block, uchar *src, unsigned len) { - ulong offset = block * TftpBlkSize + TftpBlockWrapOffset; + ulong offset = block * tftp_block_size + tftp_block_wrap_offset; ulong newsize = offset + len; #ifdef CONFIG_SYS_DIRECT_FLASH_TFTP int i, rc = 0; - for (i=0; i tftp_tsize) + pos = tftp_tsize; + + while (tftp_tsize_num_hash < pos * 50 / tftp_tsize) { + putc('#'); + tftp_tsize_num_hash++; + } + } else +#endif + { + if (((tftp_cur_block - 1) % 10) == 0) + putc('#'); + else if ((tftp_cur_block % (10 * HASHES_PER_LINE)) == 0) + puts("\n\t "); + } +} + +/** + * restart the current transfer due to an error + * + * @param msg Message to print for user + */ +static void restart(const char *msg) +{ + printf("\n%s; starting again\n", msg); +#ifdef CONFIG_MCAST_TFTP + mcast_cleanup(); +#endif + net_start_again(); +} + +/* + * Check if the block number has wrapped, and update progress + * + * TODO: The egregious use of global variables in this file should be tidied. + */ +static void update_block_number(void) +{ + /* + * RFC1350 specifies that the first data packet will + * have sequence number 1. If we receive a sequence + * number of 0 this means that there was a wrap + * around of the (16 bit) counter. + */ + if (tftp_cur_block == 0 && tftp_prev_block != 0) { + tftp_block_wrap++; + tftp_block_wrap_offset += tftp_block_size * TFTP_SEQUENCE_SIZE; + timeout_count = 0; /* we've done well, reset the timeout */ + } else { + show_block_marker(); + } +} + +/* The TFTP get or put is complete */ +static void tftp_complete(void) { - volatile uchar * pkt; - volatile uchar * xp; - int len = 0; - volatile ushort *s; +#ifdef CONFIG_TFTP_TSIZE + /* Print hash marks for the last packet received */ + while (tftp_tsize && tftp_tsize_num_hash < 49) { + putc('#'); + tftp_tsize_num_hash++; + } + puts(" "); + print_size(tftp_tsize, ""); +#endif + time_start = get_timer(time_start); + if (time_start > 0) { + puts("\n\t "); /* Line up with "Loading: " */ + print_size(net_boot_file_size / + time_start * 1000, "/s"); + } + puts("\ndone\n"); + net_set_state(NETLOOP_SUCCESS); +} + +static void tftp_send(void) +{ + uchar *pkt; + uchar *xp; + int len = 0; + ushort *s; #ifdef CONFIG_MCAST_TFTP /* Multicast TFTP.. non-MasterClients do not ACK data. */ - if (Multicast - && (TftpState == STATE_DATA) - && (MasterClient == 0)) + if (tftp_mcast_active && tftp_state == STATE_DATA && + tftp_mcast_master_client == 0) return; #endif /* * We will always be sending some sort of packet, so * cobble together the packet headers now. */ - pkt = NetTxPacket + NetEthHdrSize() + IP_HDR_SIZE; + pkt = net_tx_packet + net_eth_hdr_size() + IP_UDP_HDR_SIZE; - switch (TftpState) { - - case STATE_RRQ: + switch (tftp_state) { + case STATE_SEND_RRQ: + case STATE_SEND_WRQ: xp = pkt; s = (ushort *)pkt; +#ifdef CONFIG_CMD_TFTPPUT + *s++ = htons(tftp_state == STATE_SEND_RRQ ? TFTP_RRQ : + TFTP_WRQ); +#else *s++ = htons(TFTP_RRQ); +#endif pkt = (uchar *)s; - strcpy ((char *)pkt, tftp_filename); + strcpy((char *)pkt, tftp_filename); pkt += strlen(tftp_filename) + 1; - strcpy ((char *)pkt, "octet"); + strcpy((char *)pkt, "octet"); pkt += 5 /*strlen("octet")*/ + 1; - strcpy ((char *)pkt, "timeout"); + strcpy((char *)pkt, "timeout"); pkt += 7 /*strlen("timeout")*/ + 1; - sprintf((char *)pkt, "%lu", TIMEOUT / 1000); + sprintf((char *)pkt, "%lu", timeout_ms / 1000); debug("send option \"timeout %s\"\n", (char *)pkt); pkt += strlen((char *)pkt) + 1; +#ifdef CONFIG_TFTP_TSIZE + pkt += sprintf((char *)pkt, "tsize%c%u%c", + 0, net_boot_file_size, 0); +#endif /* try for more effic. blk size */ - pkt += sprintf((char *)pkt,"blksize%c%d%c", - 0,TftpBlkSizeOption,0); + pkt += sprintf((char *)pkt, "blksize%c%d%c", + 0, tftp_block_size_option, 0); #ifdef CONFIG_MCAST_TFTP /* Check all preconditions before even trying the option */ - if (!ProhibitMcast - && (Bitmap=malloc(Mapsize)) - && eth_get_dev()->mcast) { - free(Bitmap); - Bitmap=NULL; - pkt += sprintf((char *)pkt,"multicast%c%c",0,0); + if (!tftp_mcast_disabled) { + tftp_mcast_bitmap = malloc(tftp_mcast_bitmap_size); + if (tftp_mcast_bitmap && eth_get_dev()->mcast) { + free(tftp_mcast_bitmap); + tftp_mcast_bitmap = NULL; + pkt += sprintf((char *)pkt, "multicast%c%c", + 0, 0); + } } #endif /* CONFIG_MCAST_TFTP */ len = pkt - xp; @@ -214,17 +388,31 @@ TftpSend (void) case STATE_OACK: #ifdef CONFIG_MCAST_TFTP - /* My turn! Start at where I need blocks I missed.*/ - if (Multicast) - TftpBlock=ext2_find_next_zero_bit(Bitmap,(Mapsize*8),0); - /*..falling..*/ + /* My turn! Start at where I need blocks I missed. */ + if (tftp_mcast_active) + tftp_cur_block = ext2_find_next_zero_bit( + tftp_mcast_bitmap, + tftp_mcast_bitmap_size * 8, 0); + /* fall through */ #endif + + case STATE_RECV_WRQ: case STATE_DATA: xp = pkt; s = (ushort *)pkt; - *s++ = htons(TFTP_ACK); - *s++ = htons(TftpBlock); - pkt = (uchar *)s; + s[0] = htons(TFTP_ACK); + s[1] = htons(tftp_cur_block); + pkt = (uchar *)(s + 2); +#ifdef CONFIG_CMD_TFTPPUT + if (tftp_put_active) { + int toload = tftp_block_size; + int loaded = load_block(tftp_cur_block, pkt, toload); + + s[0] = htons(TFTP_DATA); + pkt += loaded; + tftp_put_final_block_sent = (loaded < toload); + } +#endif len = pkt - xp; break; @@ -232,9 +420,10 @@ TftpSend (void) xp = pkt; s = (ushort *)pkt; *s++ = htons(TFTP_ERROR); - *s++ = htons(3); + *s++ = htons(3); + pkt = (uchar *)s; - strcpy ((char *)pkt, "File too large"); + strcpy((char *)pkt, "File too large"); pkt += 14 /*strlen("File too large")*/ + 1; len = pkt - xp; break; @@ -245,324 +434,444 @@ TftpSend (void) *s++ = htons(TFTP_ERROR); *s++ = htons(2); pkt = (uchar *)s; - strcpy ((char *)pkt, "File has bad magic"); + strcpy((char *)pkt, "File has bad magic"); pkt += 18 /*strlen("File has bad magic")*/ + 1; len = pkt - xp; break; } - NetSendUDPPacket(NetServerEther, TftpServerIP, TftpServerPort, TftpOurPort, len); + net_send_udp_packet(net_server_ethaddr, tftp_remote_ip, + tftp_remote_port, tftp_our_port, len); } +#ifdef CONFIG_CMD_TFTPPUT +static void icmp_handler(unsigned type, unsigned code, unsigned dest, + struct in_addr sip, unsigned src, uchar *pkt, + unsigned len) +{ + if (type == ICMP_NOT_REACH && code == ICMP_NOT_REACH_PORT) { + /* Oh dear the other end has gone away */ + restart("TFTP server died"); + } +} +#endif -static void -TftpHandler (uchar * pkt, unsigned dest, unsigned src, unsigned len) +static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip, + unsigned src, unsigned len) { - ushort proto; - ushort *s; + __be16 proto; + __be16 *s; int i; - if (dest != TftpOurPort) { + if (dest != tftp_our_port) { #ifdef CONFIG_MCAST_TFTP - if (Multicast - && (!Mcast_port || (dest != Mcast_port))) + if (tftp_mcast_active && + (!tftp_mcast_port || dest != tftp_mcast_port)) #endif - return; + return; } - if (TftpState != STATE_RRQ && src != TftpServerPort) { + if (tftp_state != STATE_SEND_RRQ && src != tftp_remote_port && + tftp_state != STATE_RECV_WRQ && tftp_state != STATE_SEND_WRQ) return; - } - if (len < 2) { + if (len < 2) return; - } len -= 2; /* warning: don't use increment (++) in ntohs() macros!! */ - s = (ushort *)pkt; + s = (__be16 *)pkt; proto = *s++; pkt = (uchar *)s; switch (ntohs(proto)) { - case TFTP_RRQ: - case TFTP_WRQ: + break; + case TFTP_ACK: +#ifdef CONFIG_CMD_TFTPPUT + if (tftp_put_active) { + if (tftp_put_final_block_sent) { + tftp_complete(); + } else { + /* + * Move to the next block. We want our block + * count to wrap just like the other end! + */ + int block = ntohs(*s); + int ack_ok = (tftp_cur_block == block); + + tftp_cur_block = (unsigned short)(block + 1); + update_block_number(); + if (ack_ok) + tftp_send(); /* Send next data block */ + } + } +#endif break; + default: break; +#ifdef CONFIG_CMD_TFTPSRV + case TFTP_WRQ: + debug("Got WRQ\n"); + tftp_remote_ip = sip; + tftp_remote_port = src; + tftp_our_port = 1024 + (get_timer(0) % 3072); + new_transfer(); + tftp_send(); /* Send ACK(0) */ + break; +#endif + case TFTP_OACK: debug("Got OACK: %s %s\n", - pkt, - pkt + strlen((char *)pkt) + 1); - TftpState = STATE_OACK; - TftpServerPort = src; + pkt, pkt + strlen((char *)pkt) + 1); + tftp_state = STATE_OACK; + tftp_remote_port = src; /* * Check for 'blksize' option. * Careful: "i" is signed, "len" is unsigned, thus * something like "len-8" may give a *huge* number */ - for (i=0; i+8>20); - } else { - if (((TftpBlock - 1) % 10) == 0) { - putc ('#'); - } else if ((TftpBlock % (10 * HASHES_PER_LINE)) == 0) { - puts ("\n\t "); - } - } + update_block_number(); - if (TftpState == STATE_RRQ) + if (tftp_state == STATE_SEND_RRQ) debug("Server did not acknowledge timeout option!\n"); - if (TftpState == STATE_RRQ || TftpState == STATE_OACK) { + if (tftp_state == STATE_SEND_RRQ || tftp_state == STATE_OACK || + tftp_state == STATE_RECV_WRQ) { /* first block received */ - TftpState = STATE_DATA; - TftpServerPort = src; - TftpLastBlock = 0; - TftpBlockWrap = 0; - TftpBlockWrapOffset = 0; + tftp_state = STATE_DATA; + tftp_remote_port = src; + new_transfer(); #ifdef CONFIG_MCAST_TFTP - if (Multicast) { /* start!=1 common if mcast */ - TftpLastBlock = TftpBlock - 1; + if (tftp_mcast_active) { /* start!=1 common if mcast */ + tftp_prev_block = tftp_cur_block - 1; } else #endif - if (TftpBlock != 1) { /* Assertion */ - printf ("\nTFTP error: " - "First block is not block 1 (%ld)\n" - "Starting again\n\n", - TftpBlock); - NetStartAgain (); + if (tftp_cur_block != 1) { /* Assertion */ + puts("\nTFTP error: "); + printf("First block is not block 1 (%ld)\n", + tftp_cur_block); + puts("Starting again\n\n"); + net_start_again(); break; } } - if (TftpBlock == TftpLastBlock) { - /* - * Same block again; ignore it. - */ + if (tftp_cur_block == tftp_prev_block) { + /* Same block again; ignore it. */ break; } - TftpLastBlock = TftpBlock; - TftpTimeoutMSecs = TIMEOUT; - TftpTimeoutCountMax = TIMEOUT_COUNT; - NetSetTimeout (TftpTimeoutMSecs, TftpTimeout); + tftp_prev_block = tftp_cur_block; + timeout_count_max = TIMEOUT_COUNT; + net_set_timeout_handler(timeout_ms, tftp_timeout_handler); - store_block (TftpBlock - 1, pkt + 2, len); + store_block(tftp_cur_block - 1, pkt + 2, len); /* - * Acknoledge the block just received, which will prompt - * the server for the next one. + * Acknowledge the block just received, which will prompt + * the remote for the next one. */ #ifdef CONFIG_MCAST_TFTP /* if I am the MasterClient, actively calculate what my next * needed block is; else I'm passive; not ACKING */ - if (Multicast) { - if (len < TftpBlkSize) { - TftpEndingBlock = TftpBlock; - } else if (MasterClient) { - TftpBlock = PrevBitmapHole = - ext2_find_next_zero_bit( - Bitmap, - (Mapsize*8), - PrevBitmapHole); - if (TftpBlock > ((Mapsize*8) - 1)) { - printf ("tftpfile too big\n"); + if (tftp_mcast_active) { + if (len < tftp_block_size) { + tftp_mcast_ending_block = tftp_cur_block; + } else if (tftp_mcast_master_client) { + tftp_mcast_prev_hole = ext2_find_next_zero_bit( + tftp_mcast_bitmap, + tftp_mcast_bitmap_size * 8, + tftp_mcast_prev_hole); + tftp_cur_block = tftp_mcast_prev_hole; + if (tftp_cur_block > + ((tftp_mcast_bitmap_size * 8) - 1)) { + debug("tftpfile too big\n"); /* try to double it and retry */ - Mapsize<<=1; + tftp_mcast_bitmap_size <<= 1; mcast_cleanup(); - NetStartAgain (); + net_start_again(); return; } - TftpLastBlock = TftpBlock; + tftp_prev_block = tftp_cur_block; } } #endif - TftpSend (); + tftp_send(); #ifdef CONFIG_MCAST_TFTP - if (Multicast) { - if (MasterClient && (TftpBlock >= TftpEndingBlock)) { - puts ("\nMulticast tftp done\n"); + if (tftp_mcast_active) { + if (tftp_mcast_master_client && + (tftp_cur_block >= tftp_mcast_ending_block)) { + puts("\nMulticast tftp done\n"); mcast_cleanup(); - NetState = NETLOOP_SUCCESS; + net_set_state(NETLOOP_SUCCESS); } - } - else + } else #endif - if (len < TftpBlkSize) { - /* - * We received the whole thing. Try to - * run it. - */ - puts ("\ndone\n"); - NetState = NETLOOP_SUCCESS; - } + if (len < tftp_block_size) + tftp_complete(); break; case TFTP_ERROR: - printf ("\nTFTP error: '%s' (%d)\n", - pkt + 2, ntohs(*(ushort *)pkt)); - puts ("Starting again\n\n"); + printf("\nTFTP error: '%s' (%d)\n", + pkt + 2, ntohs(*(__be16 *)pkt)); + + switch (ntohs(*(__be16 *)pkt)) { + case TFTP_ERR_FILE_NOT_FOUND: + case TFTP_ERR_ACCESS_DENIED: + puts("Not retrying...\n"); + eth_halt(); + net_set_state(NETLOOP_FAIL); + break; + case TFTP_ERR_UNDEFINED: + case TFTP_ERR_DISK_FULL: + case TFTP_ERR_UNEXPECTED_OPCODE: + case TFTP_ERR_UNKNOWN_TRANSFER_ID: + case TFTP_ERR_FILE_ALREADY_EXISTS: + default: + puts("Starting again\n\n"); #ifdef CONFIG_MCAST_TFTP - mcast_cleanup(); + mcast_cleanup(); #endif - NetStartAgain (); + net_start_again(); + break; + } break; } } -static void -TftpTimeout (void) +static void tftp_timeout_handler(void) { - if (++TftpTimeoutCount > TftpTimeoutCountMax) { - puts ("\nRetry count exceeded; starting again\n"); -#ifdef CONFIG_MCAST_TFTP - mcast_cleanup(); -#endif - NetStartAgain (); + if (++timeout_count > timeout_count_max) { + restart("Retry count exceeded"); } else { - puts ("T "); - NetSetTimeout (TftpTimeoutMSecs, TftpTimeout); - TftpSend (); + puts("T "); + net_set_timeout_handler(timeout_ms, tftp_timeout_handler); + if (tftp_state != STATE_RECV_WRQ) + tftp_send(); } } -void -TftpStart (void) +void tftp_start(enum proto_t protocol) { -#ifdef CONFIG_TFTP_PORT char *ep; /* Environment pointer */ -#endif - TftpServerIP = NetServerIP; - if (BootFile[0] == '\0') { - sprintf(default_filename, "%02lX%02lX%02lX%02lX.img", - NetOurIP & 0xFF, - (NetOurIP >> 8) & 0xFF, - (NetOurIP >> 16) & 0xFF, - (NetOurIP >> 24) & 0xFF ); + /* + * Allow the user to choose TFTP blocksize and timeout. + * TFTP protocol has a minimal timeout of 1 second. + */ + ep = getenv("tftpblocksize"); + if (ep != NULL) + tftp_block_size_option = simple_strtol(ep, NULL, 10); + + ep = getenv("tftptimeout"); + if (ep != NULL) + timeout_ms = simple_strtol(ep, NULL, 10); + + if (timeout_ms < 1000) { + printf("TFTP timeout (%ld ms) too low, set min = 1000 ms\n", + timeout_ms); + timeout_ms = 1000; + } + + debug("TFTP blocksize = %i, timeout = %ld ms\n", + tftp_block_size_option, timeout_ms); + + tftp_remote_ip = net_server_ip; + if (net_boot_file_name[0] == '\0') { + sprintf(default_filename, "%02X%02X%02X%02X.img", + net_ip.s_addr & 0xFF, + (net_ip.s_addr >> 8) & 0xFF, + (net_ip.s_addr >> 16) & 0xFF, + (net_ip.s_addr >> 24) & 0xFF); strncpy(tftp_filename, default_filename, MAX_LEN); - tftp_filename[MAX_LEN-1] = 0; + tftp_filename[MAX_LEN - 1] = 0; - printf ("*** Warning: no boot file name; using '%s'\n", - tftp_filename); + printf("*** Warning: no boot file name; using '%s'\n", + tftp_filename); } else { - char *p = strchr (BootFile, ':'); + char *p = strchr(net_boot_file_name, ':'); if (p == NULL) { - strncpy(tftp_filename, BootFile, MAX_LEN); - tftp_filename[MAX_LEN-1] = 0; + strncpy(tftp_filename, net_boot_file_name, MAX_LEN); + tftp_filename[MAX_LEN - 1] = 0; } else { - TftpServerIP = string_to_ip (BootFile); + tftp_remote_ip = string_to_ip(net_boot_file_name); strncpy(tftp_filename, p + 1, MAX_LEN); - tftp_filename[MAX_LEN-1] = 0; + tftp_filename[MAX_LEN - 1] = 0; } } -#if defined(CONFIG_NET_MULTI) - printf ("Using %s device\n", eth_get_name()); + printf("Using %s device\n", eth_get_name()); + printf("TFTP %s server %pI4; our IP address is %pI4", +#ifdef CONFIG_CMD_TFTPPUT + protocol == TFTPPUT ? "to" : "from", +#else + "from", #endif - printf("TFTP from server %pI4" - "; our IP address is %pI4", &TftpServerIP, &NetOurIP); + &tftp_remote_ip, &net_ip); /* Check if we need to send across this subnet */ - if (NetOurGatewayIP && NetOurSubnetMask) { - IPaddr_t OurNet = NetOurIP & NetOurSubnetMask; - IPaddr_t ServerNet = TftpServerIP & NetOurSubnetMask; - - if (OurNet != ServerNet) - printf("; sending through gateway %pI4", &NetOurGatewayIP); + if (net_gateway.s_addr && net_netmask.s_addr) { + struct in_addr our_net; + struct in_addr remote_net; + + our_net.s_addr = net_ip.s_addr & net_netmask.s_addr; + remote_net.s_addr = tftp_remote_ip.s_addr & net_netmask.s_addr; + if (our_net.s_addr != remote_net.s_addr) + printf("; sending through gateway %pI4", &net_gateway); } - putc ('\n'); + putc('\n'); - printf ("Filename '%s'.", tftp_filename); + printf("Filename '%s'.", tftp_filename); - if (NetBootFileSize) { - printf (" Size is 0x%x Bytes = ", NetBootFileSize<<9); - print_size (NetBootFileSize<<9, ""); + if (net_boot_file_expected_size_in_blocks) { + printf(" Size is 0x%x Bytes = ", + net_boot_file_expected_size_in_blocks << 9); + print_size(net_boot_file_expected_size_in_blocks << 9, ""); } - putc ('\n'); - - printf ("Load address: 0x%lx\n", load_addr); - - puts ("Loading: *\b"); - - TftpTimeoutMSecs = TftpRRQTimeoutMSecs; - TftpTimeoutCountMax = TftpRRQTimeoutCountMax; + putc('\n'); +#ifdef CONFIG_CMD_TFTPPUT + tftp_put_active = (protocol == TFTPPUT); + if (tftp_put_active) { + printf("Save address: 0x%lx\n", save_addr); + printf("Save size: 0x%lx\n", save_size); + net_boot_file_size = save_size; + puts("Saving: *\b"); + tftp_state = STATE_SEND_WRQ; + new_transfer(); + } else +#endif + { + printf("Load address: 0x%lx\n", load_addr); + puts("Loading: *\b"); + tftp_state = STATE_SEND_RRQ; + } - NetSetTimeout (TftpTimeoutMSecs, TftpTimeout); - NetSetHandler (TftpHandler); + time_start = get_timer(0); + timeout_count_max = tftp_timeout_count_max; - TftpServerPort = WELL_KNOWN_PORT; - TftpTimeoutCount = 0; - TftpState = STATE_RRQ; + net_set_timeout_handler(timeout_ms, tftp_timeout_handler); + net_set_udp_handler(tftp_handler); +#ifdef CONFIG_CMD_TFTPPUT + net_set_icmp_handler(icmp_handler); +#endif + tftp_remote_port = WELL_KNOWN_PORT; + timeout_count = 0; /* Use a pseudo-random port unless a specific port is set */ - TftpOurPort = 1024 + (get_timer(0) % 3072); + tftp_our_port = 1024 + (get_timer(0) % 3072); #ifdef CONFIG_TFTP_PORT - if ((ep = getenv("tftpdstp")) != NULL) { - TftpServerPort = simple_strtol(ep, NULL, 10); - } - if ((ep = getenv("tftpsrcp")) != NULL) { - TftpOurPort= simple_strtol(ep, NULL, 10); - } + ep = getenv("tftpdstp"); + if (ep != NULL) + tftp_remote_port = simple_strtol(ep, NULL, 10); + ep = getenv("tftpsrcp"); + if (ep != NULL) + tftp_our_port = simple_strtol(ep, NULL, 10); #endif - TftpBlock = 0; + tftp_cur_block = 0; /* zero out server ether in case the server ip has changed */ - memset(NetServerEther, 0, 6); - /* Revert TftpBlkSize to dflt */ - TftpBlkSize = TFTP_BLOCK_SIZE; + memset(net_server_ethaddr, 0, 6); + /* Revert tftp_block_size to dflt */ + tftp_block_size = TFTP_BLOCK_SIZE; #ifdef CONFIG_MCAST_TFTP mcast_cleanup(); #endif +#ifdef CONFIG_TFTP_TSIZE + tftp_tsize = 0; + tftp_tsize_num_hash = 0; +#endif + + tftp_send(); +} + +#ifdef CONFIG_CMD_TFTPSRV +void tftp_start_server(void) +{ + tftp_filename[0] = 0; + + printf("Using %s device\n", eth_get_name()); + printf("Listening for TFTP transfer on %pI4\n", &net_ip); + printf("Load address: 0x%lx\n", load_addr); + + puts("Loading: *\b"); + + timeout_count_max = TIMEOUT_COUNT; + timeout_count = 0; + timeout_ms = TIMEOUT; + net_set_timeout_handler(timeout_ms, tftp_timeout_handler); + + /* Revert tftp_block_size to dflt */ + tftp_block_size = TFTP_BLOCK_SIZE; + tftp_cur_block = 0; + tftp_our_port = WELL_KNOWN_PORT; + +#ifdef CONFIG_TFTP_TSIZE + tftp_tsize = 0; + tftp_tsize_num_hash = 0; +#endif + + tftp_state = STATE_RECV_WRQ; + net_set_udp_handler(tftp_handler); - TftpSend (); + /* zero out server ether in case the server ip has changed */ + memset(net_server_ethaddr, 0, 6); } +#endif /* CONFIG_CMD_TFTPSRV */ #ifdef CONFIG_MCAST_TFTP -/* Credits: atftp project. +/* + * Credits: atftp project. */ -/* pick up BcastAddr, Port, and whether I am [now] the master-client. * +/* + * Pick up BcastAddr, Port, and whether I am [now] the master-client. * Frame: * +-------+-----------+---+-------~~-------+---+ * | opc | multicast | 0 | addr, port, mc | 0 | @@ -576,76 +885,82 @@ TftpStart (void) */ static void parse_multicast_oack(char *pkt, int len) { - int i; - IPaddr_t addr; - char *mc_adr, *port, *mc; - - mc_adr=port=mc=NULL; + int i; + struct in_addr addr; + char *mc_adr; + char *port; + char *mc; + + mc_adr = NULL; + port = NULL; + mc = NULL; /* march along looking for 'multicast\0', which has to start at least * 14 bytes back from the end. */ - for (i=0;i= (len-14)) /* non-Multicast OACK, ign. */ + if (i >= (len - 14)) /* non-Multicast OACK, ign. */ return; - i+=10; /* strlen multicast */ - mc_adr = pkt+i; - for (;i