TFTP: send timeout option correctly

Eric Mertens posted bug report #3003005 pointing out that the
libcurl TFTP code was not sending the timeout option properly to
the server, and suggested a fix.

(http://curl.haxx.se/bug/view.cgi?id=3003005)

diff --git a/CHANGES b/CHANGES
index 115e33cf880765c916a0796f560eeab7da481c44..9e4ec8e591f43afdb672d9cd5494389ac5564a30 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,13 @@
 
                                   Changelog
 
+Daniel Stenberg (18 May 2010)
+- Eric Mertens posted bug report #3003005 pointing out that the libcurl TFTP
+  code was not sending the timeout option properly to the server, and
+  suggested a fix.
+
+  (http://curl.haxx.se/bug/view.cgi?id=3003005)
+
 Kamil Dudka (16 May 2010)
 - Pavel Raiskup introduced a new option CURLOPT_FNMATCH_DATA in order to pass
   a custom data pointer to the callback specified by CURLOPT_FNMATCH_FUNCTION.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b73997900a6eb2c8fcd5b1ffac68f283baff5e4f..614b47c290ee897431a2bb22a45b3c72814f8ea5 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -30,6 +30,7 @@ This release includes the following bugfixes:
  o broken CRL support in libcurl-NSS
  o ignore response-body on redirect even if compressed
  o OpenSSL handshake state-machine for multi interface
+ o TFTP timeout option sent correctly
 
 This release includes the following known bugs:
 
@@ -40,6 +41,6 @@ advice from friends like these:
 
  Rainer Canavan, Paul Howarth, Jerome Vouillon, Ruslan Gazizov, Yang Tse,
  Kamil Dudka, Alex Bligh, Ben Greear, Hoi-Ho Chan, Howard Chu, Dirk Manske,
- Pavel Raiskup, John-Mark Bell
+ Pavel Raiskup, John-Mark Bell, Eric Mertens
 
         Thanks! (and sorry if I forgot to mention someone)

diff --git a/lib/tftp.c b/lib/tftp.c
index 3c288b66e0ec3ea4ccf1adb4e94419a5d322115f..141c57570957ee77ca75c2694c1df6827551bdea 100644 (file)
--- a/lib/tftp.c
+++ b/lib/tftp.c
@@ -87,8 +87,10 @@
 #define TFTP_BLKSIZE_MIN 8
 #define TFTP_BLKSIZE_MAX 65464
 #define TFTP_OPTION_BLKSIZE "blksize"
-#define TFTP_OPTION_TSIZE "tsize"
-#define TFTP_OPTION_INTERVAL "interval"
+
+/* from RFC2349: */
+#define TFTP_OPTION_TSIZE    "tsize"
+#define TFTP_OPTION_INTERVAL "timeout"
 
 typedef enum {
   TFTP_MODE_NETASCII=0,