Index: README
===================================================================
RCS file: /cvsroot/u-boot/u-boot/README,v
retrieving revision 1.117
diff -p -u -r1.117 README
--- README	9 Jan 2005 23:16:42 -0000	1.117
+++ README	10 Jan 2005 04:13:50 -0000
@@ -1480,6 +1480,22 @@ The following options need to be configu
 		When SystemACE support is added, the "ace" device type
 		becomes available to the fat commands, i.e. fatls.

+- TFTP Fixed UDP Port:
+		CONFIG_TFTP_PORT
+
+		If this is defined, the environment variable tftpsourceport
+		is used to supply the TFTP UDP source port value.
+		If tftpsourceport isn't defined, the normal pseudo-random port
+		number generator is used.
+
+		The purpose for this is to allow a TFTP server to
+		blindly start the TFTP transfer using the pre-configured
+		target IP address and UDP port. This has the effect of
+		"punching through" the (Windows XP) firewall, allowing
+		the remainder of the TFTP transfer to proceed normally.
+		A better solution is to properly configure the firewall,
+		but sometimes that is not allowed.
+
 - Show boot progress:
 		CONFIG_SHOW_BOOT_PROGRESS

@@ -2432,6 +2448,9 @@ Some configuration options can be set us
 		  Useful on scripts which control the retry operation
 		  themselves.

+  tftpsourceport	- If this is set, the value is used for TFTP's
+		  UDP source port.
+
    vlan		- When set to a value < 4095 the traffic over
 		  ethernet is encapsulated/received over 802.1q
 		  VLAN tagged frames.
Index: net/tftp.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/net/tftp.c,v
retrieving revision 1.9
diff -p -u -r1.9 tftp.c
--- net/tftp.c	15 Apr 2004 21:48:55 -0000	1.9
+++ net/tftp.c	10 Jan 2005 04:13:51 -0000
@@ -301,6 +301,10 @@ TftpTimeout (void)
 void
 TftpStart (void)
 {
+#ifdef CONFIG_TFTP_PORT
+	char *ep;             /* Environment pointer */
+#endif
+
 	if (BootFile[0] == '\0') {
 		IPaddr_t OurIP = ntohl(NetOurIP);

@@ -354,7 +358,13 @@ TftpStart (void)
 	TftpServerPort = WELL_KNOWN_PORT;
 	TftpTimeoutCount = 0;
 	TftpState = STATE_RRQ;
+	/* Use a pseudo-random port unless a specific port is set */
 	TftpOurPort = 1024 + (get_timer(0) % 3072);
+#ifdef CONFIG_TFTP_PORT
+	if ((ep = getenv("tftpsourceport")) != NULL) {
+		TftpOurPort= simple_strtol(ep, NULL, 10);
+	}
+#endif
 	TftpBlock = 0;

 	/* zero out server ether in case the server ip has changed */