X-Git-Url: https://git.kernelconcepts.de/?a=blobdiff_plain;f=net%2Ftftp.c;h=eacd529a98e3941f7035cf18f55d11fcdfaaae38;hb=7bc325a1b2dfda4a16789cc3b9387dbe1174af41;hp=84d83ca97b1e9f333efe1fa780c3803ce6cadca5;hpb=ac5ba41c2234dd513ed2c879914e964cc05a0135;p=karo-tx-uboot.git diff --git a/net/tftp.c b/net/tftp.c index 84d83ca97b..eacd529a98 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -1,7 +1,7 @@ /* - * 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 */ #include @@ -10,19 +10,18 @@ #include "tftp.h" #include "bootp.h" -#undef ET_DEBUG - -#if defined(CONFIG_CMD_NET) - -#define WELL_KNOWN_PORT 69 /* Well known TFTP port # */ -#define TIMEOUT 5UL /* Seconds to timeout for a 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. @@ -34,15 +33,52 @@ #define TFTP_ERROR 5 #define TFTP_OACK 6 +static ulong TftpTimeoutMSecs = TIMEOUT; +static int TftpTimeoutCountMax = TIMEOUT_COUNT; + +/* + * These globals govern the timeout behavior when attempting a connection to a + * TFTP server. TftpRRQTimeoutMSecs 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 + * 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; + +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 IPaddr_t TftpServerIP; -static int TftpServerPort; /* The UDP port at their end */ -static int TftpOurPort; /* The UDP port at our end */ +/* The UDP port at their end */ +static int TftpServerPort; +/* The UDP port at our end */ +static int TftpOurPort; 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 */ +/* packet sequence number */ +static ulong TftpBlock; +/* last packet sequence number received */ +static ulong TftpLastBlock; +/* count of sequence number wraparounds */ +static ulong TftpBlockWrap; +/* memory offset due to wrapping */ +static ulong TftpBlockWrapOffset; static int TftpState; +#ifdef CONFIG_TFTP_TSIZE +/* The file size reported by the server */ +static int TftpTsize; +/* The number of hashes we printed */ +static short TftpNumchars; +#endif #define STATE_RRQ 1 #define STATE_DATA 2 @@ -50,8 +86,10 @@ static int TftpState; #define STATE_BAD_MAGIC 4 #define STATE_OACK 5 -#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]; @@ -64,37 +102,43 @@ static char default_filename[DEFAULT_NAME_LEN]; static char tftp_filename[MAX_LEN]; -#ifdef CFG_DIRECT_FLASH_TFTP +#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 TftpBlkSize = TFTP_BLOCK_SIZE; +static unsigned short TftpBlkSizeOption = 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; +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 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; + Bitmap = NULL; Mcast_addr = Multicast = Mcast_port = 0; TftpEndingBlock = -1; } @@ -102,15 +146,17 @@ mcast_cleanup(void) #endif /* CONFIG_MCAST_TFTP */ static __inline__ void -store_block (unsigned block, uchar * src, unsigned len) +store_block(unsigned block, uchar *src, unsigned len) { ulong offset = block * TftpBlkSize + TftpBlockWrapOffset; ulong newsize = offset + len; -#ifdef CFG_DIRECT_FLASH_TFTP +#ifdef CONFIG_SYS_DIRECT_FLASH_TFTP int i, rc = 0; - for (i=0; i= flash_info[i].start[0]) { rc = 1; break; @@ -118,15 +164,15 @@ store_block (unsigned block, uchar * src, unsigned len) } if (rc) { /* Flash is destination for this packet */ - rc = flash_write ((char *)src, (ulong)(load_addr+offset), len); + rc = flash_write((char *)src, (ulong)(load_addr+offset), len); if (rc) { - flash_perror (rc); + flash_perror(rc); NetState = NETLOOP_FAIL; return; } } else -#endif /* CFG_DIRECT_FLASH_TFTP */ +#endif /* CONFIG_SYS_DIRECT_FLASH_TFTP */ { (void)memcpy((void *)(load_addr + offset), src, len); } @@ -139,17 +185,17 @@ store_block (unsigned block, uchar * src, unsigned len) NetBootFileXferSize = newsize; } -static void TftpSend (void); -static void TftpTimeout (void); +static void TftpSend(void); +static void TftpTimeout(void); /**********************************************************************/ static void -TftpSend (void) +TftpSend(void) { - volatile uchar * pkt; - volatile uchar * xp; - int len = 0; + volatile uchar *pkt; + volatile uchar *xp; + int len = 0; volatile ushort *s; #ifdef CONFIG_MCAST_TFTP @@ -172,28 +218,30 @@ TftpSend (void) s = (ushort *)pkt; *s++ = htons(TFTP_RRQ); 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); -#ifdef ET_DEBUG - printf("send option \"timeout %s\"\n", (char *)pkt); -#endif + sprintf((char *)pkt, "%lu", TftpTimeoutMSecs / 1000); + debug("send option \"timeout %s\"\n", (char *)pkt); pkt += strlen((char *)pkt) + 1; +#ifdef CONFIG_TFTP_TSIZE + memcpy((char *)pkt, "tsize\0000\0", 8); + pkt += 8; +#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, TftpBlkSizeOption, 0); #ifdef CONFIG_MCAST_TFTP /* Check all preconditions before even trying the option */ if (!ProhibitMcast - && (Bitmap=malloc(Mapsize)) + && (Bitmap = malloc(Mapsize)) && eth_get_dev()->mcast) { free(Bitmap); - Bitmap=NULL; - pkt += sprintf((char *)pkt,"multicast%c%c",0,0); + Bitmap = NULL; + pkt += sprintf((char *)pkt, "multicast%c%c", 0, 0); } #endif /* CONFIG_MCAST_TFTP */ len = pkt - xp; @@ -203,7 +251,8 @@ TftpSend (void) #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); + TftpBlock = ext2_find_next_zero_bit(Bitmap, + (Mapsize*8), 0); /*..falling..*/ #endif case STATE_DATA: @@ -221,7 +270,7 @@ TftpSend (void) *s++ = htons(TFTP_ERROR); *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; @@ -232,18 +281,20 @@ 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); + NetSendUDPPacket(NetServerEther, TftpServerIP, TftpServerPort, + TftpOurPort, len); } static void -TftpHandler (uchar * pkt, unsigned dest, unsigned src, unsigned len) +TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src, + unsigned len) { ushort proto; ushort *s; @@ -256,13 +307,11 @@ TftpHandler (uchar * pkt, unsigned dest, unsigned src, unsigned len) #endif return; } - if (TftpState != STATE_RRQ && src != TftpServerPort) { + if (TftpState != STATE_RRQ && src != TftpServerPort) return; - } - if (len < 2) { + if (len < 2) return; - } len -= 2; /* warning: don't use increment (++) in ntohs() macros!! */ s = (ushort *)pkt; @@ -278,9 +327,9 @@ TftpHandler (uchar * pkt, unsigned dest, unsigned src, unsigned len) break; case TFTP_OACK: -#ifdef ET_DEBUG - printf("Got OACK: %s %s\n", pkt, pkt+strlen(pkt)+1); -#endif + debug("Got OACK: %s %s\n", + pkt, + pkt + strlen((char *)pkt) + 1); TftpState = STATE_OACK; TftpServerPort = src; /* @@ -288,24 +337,30 @@ TftpHandler (uchar * pkt, unsigned dest, unsigned src, unsigned len) * 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 "); - } + TftpBlockWrapOffset += + TftpBlkSize * TFTP_SEQUENCE_SIZE; + printf("\n\t %lu MB received\n\t ", + TftpBlockWrapOffset>>20); } - -#ifdef ET_DEBUG - if (TftpState == STATE_RRQ) { - puts ("Server did not acknowledge timeout option!\n"); +#ifdef CONFIG_TFTP_TSIZE + else if (TftpTsize) { + while (TftpNumchars < + NetBootFileXferSize * 50 / TftpTsize) { + putc('#'); + TftpNumchars++; + } } #endif + else { + if (((TftpBlock - 1) % 10) == 0) + putc('#'); + else if ((TftpBlock % (10 * HASHES_PER_LINE)) == 0) + puts("\n\t "); + } + + if (TftpState == STATE_RRQ) + debug("Server did not acknowledge timeout option!\n"); if (TftpState == STATE_RRQ || TftpState == STATE_OACK) { /* first block received */ @@ -351,11 +414,11 @@ TftpHandler (uchar * pkt, unsigned dest, unsigned src, unsigned len) } else #endif if (TftpBlock != 1) { /* Assertion */ - printf ("\nTFTP error: " - "First block is not block 1 (%ld)\n" - "Starting again\n\n", + printf("\nTFTP error: " + "First block is not block 1 (%ld)\n" + "Starting again\n\n", TftpBlock); - NetStartAgain (); + NetStartAgain(); break; } } @@ -368,9 +431,10 @@ TftpHandler (uchar * pkt, unsigned dest, unsigned src, unsigned len) } TftpLastBlock = TftpBlock; - NetSetTimeout (TIMEOUT * CFG_HZ, TftpTimeout); + TftpTimeoutCountMax = TIMEOUT_COUNT; + NetSetTimeout(TftpTimeoutMSecs, TftpTimeout); - store_block (TftpBlock - 1, pkt + 2, len); + store_block(TftpBlock - 1, pkt + 2, len); /* * Acknoledge the block just received, which will prompt @@ -390,23 +454,23 @@ TftpHandler (uchar * pkt, unsigned dest, unsigned src, unsigned len) (Mapsize*8), PrevBitmapHole); if (TftpBlock > ((Mapsize*8) - 1)) { - printf ("tftpfile too big\n"); + printf("tftpfile too big\n"); /* try to double it and retry */ - Mapsize<<=1; + Mapsize <<= 1; mcast_cleanup(); - NetStartAgain (); + NetStartAgain(); return; } TftpLastBlock = TftpBlock; } } #endif - TftpSend (); + TftpSend(); #ifdef CONFIG_MCAST_TFTP if (Multicast) { if (MasterClient && (TftpBlock >= TftpEndingBlock)) { - puts ("\nMulticast tftp done\n"); + puts("\nMulticast tftp done\n"); mcast_cleanup(); NetState = NETLOOP_SUCCESS; } @@ -418,47 +482,90 @@ TftpHandler (uchar * pkt, unsigned dest, unsigned src, unsigned len) * We received the whole thing. Try to * run it. */ - puts ("\ndone\n"); +#ifdef CONFIG_TFTP_TSIZE + /* Print hash marks for the last packet received */ + while (TftpTsize && TftpNumchars < 49) { + putc('#'); + TftpNumchars++; + } +#endif + puts("\ndone\n"); NetState = NETLOOP_SUCCESS; } 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(*(ushort *)pkt)); + + switch (ntohs(*(ushort *)pkt)) { + case TFTP_ERR_FILE_NOT_FOUND: + case TFTP_ERR_ACCESS_DENIED: + puts("Not retrying...\n"); + eth_halt(); + NetState = 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 (); + NetStartAgain(); + break; + } break; } } static void -TftpTimeout (void) +TftpTimeout(void) { - if (++TftpTimeoutCount > TIMEOUT_COUNT) { - puts ("\nRetry count exceeded; starting again\n"); + if (++TftpTimeoutCount > TftpTimeoutCountMax) { + puts("\nRetry count exceeded; starting again\n"); #ifdef CONFIG_MCAST_TFTP mcast_cleanup(); #endif - NetStartAgain (); + NetStartAgain(); } else { - puts ("T "); - NetSetTimeout (TIMEOUT * CFG_HZ, TftpTimeout); - TftpSend (); + puts("T "); + NetSetTimeout(TftpTimeoutMSecs, TftpTimeout); + TftpSend(); } } void -TftpStart (void) +TftpStart(void) { -#ifdef CONFIG_TFTP_PORT char *ep; /* Environment pointer */ -#endif + + /* + * Allow the user to choose TFTP blocksize and timeout. + * TFTP protocol has a minimal timeout of 1 second. + */ + ep = getenv("tftpblocksize"); + if (ep != NULL) + TftpBlkSizeOption = simple_strtol(ep, NULL, 10); + + ep = getenv("tftptimeout"); + if (ep != NULL) + TftpTimeoutMSecs = simple_strtol(ep, NULL, 10); + + if (TftpTimeoutMSecs < 1000) { + printf("TFTP timeout (%ld ms) too low, " + "set minimum = 1000 ms\n", + TftpTimeoutMSecs); + TftpTimeoutMSecs = 1000; + } + + debug("TFTP blocksize = %i, timeout = %ld ms\n", + TftpBlkSizeOption, TftpTimeoutMSecs); TftpServerIP = NetServerIP; if (BootFile[0] == '\0') { @@ -466,60 +573,59 @@ TftpStart (void) NetOurIP & 0xFF, (NetOurIP >> 8) & 0xFF, (NetOurIP >> 16) & 0xFF, - (NetOurIP >> 24) & 0xFF ); + (NetOurIP >> 24) & 0xFF); strncpy(tftp_filename, default_filename, MAX_LEN); tftp_filename[MAX_LEN-1] = 0; - printf ("*** Warning: no boot file name; using '%s'\n", + printf("*** Warning: no boot file name; using '%s'\n", tftp_filename); } else { - char *p = strchr (BootFile, ':'); + char *p = strchr(BootFile, ':'); if (p == NULL) { strncpy(tftp_filename, BootFile, MAX_LEN); tftp_filename[MAX_LEN-1] = 0; } else { - *p++ = '\0'; - TftpServerIP = string_to_ip (BootFile); - strncpy(tftp_filename, p, MAX_LEN); + TftpServerIP = string_to_ip(BootFile); + strncpy(tftp_filename, p + 1, MAX_LEN); 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()); #endif - puts ("TFTP from server "); print_IPaddr (TftpServerIP); - puts ("; our IP address is "); print_IPaddr (NetOurIP); + printf("TFTP from server %pI4" + "; our IP address is %pI4", &TftpServerIP, &NetOurIP); /* 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) { - puts ("; sending through gateway "); - print_IPaddr (NetOurGatewayIP) ; - } + if (OurNet != ServerNet) + printf("; sending through gateway %pI4", &NetOurGatewayIP); } - 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, ""); + printf(" Size is 0x%x Bytes = ", NetBootFileSize<<9); + print_size(NetBootFileSize<<9, ""); } - putc ('\n'); + putc('\n'); + + printf("Load address: 0x%lx\n", load_addr); - printf ("Load address: 0x%lx\n", load_addr); + puts("Loading: *\b"); - puts ("Loading: *\b"); + TftpTimeoutCountMax = TftpRRQTimeoutCountMax; - NetSetTimeout (TIMEOUT * CFG_HZ, TftpTimeout); - NetSetHandler (TftpHandler); + NetSetTimeout(TftpTimeoutMSecs, TftpTimeout); + NetSetHandler(TftpHandler); TftpServerPort = WELL_KNOWN_PORT; TftpTimeoutCount = 0; @@ -528,12 +634,12 @@ TftpStart (void) TftpOurPort = 1024 + (get_timer(0) % 3072); #ifdef CONFIG_TFTP_PORT - if ((ep = getenv("tftpdstp")) != NULL) { + ep = getenv("tftpdstp"); + if (ep != NULL) TftpServerPort = simple_strtol(ep, NULL, 10); - } - if ((ep = getenv("tftpsrcp")) != NULL) { - TftpOurPort= simple_strtol(ep, NULL, 10); - } + ep = getenv("tftpsrcp"); + if (ep != NULL) + TftpOurPort = simple_strtol(ep, NULL, 10); #endif TftpBlock = 0; @@ -544,8 +650,12 @@ TftpStart (void) #ifdef CONFIG_MCAST_TFTP mcast_cleanup(); #endif +#ifdef CONFIG_TFTP_TSIZE + TftpTsize = 0; + TftpNumchars = 0; +#endif - TftpSend (); + TftpSend(); } #ifdef CONFIG_MCAST_TFTP @@ -566,23 +676,23 @@ TftpStart (void) */ static void parse_multicast_oack(char *pkt, int len) { - int i; - IPaddr_t addr; - char *mc_adr, *port, *mc; + int i; + IPaddr_t addr; + char *mc_adr, *port, *mc; - mc_adr=port=mc=NULL; + mc_adr = port = 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. */ return; - i+=10; /* strlen multicast */ + i += 10; /* strlen multicast */ mc_adr = pkt+i; - for (;i