Commit 9dc3eaee authored by Michael Koenig's avatar Michael Koenig Committed by Jay Satiro
Browse files

TFTP: add option to suppress TFTP option requests (Part 1) 

Some TFTP server implementations ignore the "TFTP Option extension"
(RFC 1782-1784, 2347-2349), or implement it in a flawed way, causing
problems with libcurl. Another switch for curl_easy_setopt
"CURLOPT_TFTP_NO_OPTIONS" is introduced which prevents libcurl from
sending TFTP option requests to a server, avoiding many problems caused
by faulty implementations.

Bug: https://github.com/curl/curl/issues/481
parent 527e86b0

docs/libcurl/curl_easy_setopt.3

+2 −0
Original line number Diff line number Diff line
@@ -314,6 +314,8 @@ Authentication address. See \fICURLOPT_MAIL_AUTH(3)\fP 
.SH TFTP OPTIONS

.IP CURLOPT_TFTP_BLKSIZE

TFTP block size. See \fICURLOPT_TFTP_BLKSIZE(3)\fP

.IP CURLOPT_TFTP_NO_OPTIONS

Prevents TFTP options to be send with RRQs/WRQs. See \fICURLOPT_TFTP_NO_OPTIONS(3)\fP

.SH FTP OPTIONS

.IP CURLOPT_FTPPORT

Use active FTP. See \fICURLOPT_FTPPORT(3)\fP

docs/libcurl/opts/CURLOPT_TFTP_NO_OPTIONS.3

0 → 100644
+44 −0
Original line number Diff line number Diff line 
.\" **************************************************************************

.\" *                                  _   _ ____  _

.\" *  Project                     ___| | | |  _ \| |

.\" *                             / __| | | | |_) | |

.\" *                            | (__| |_| |  _ <| |___

.\" *                             \___|\___/|_| \_\_____|

.\" *

.\" * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.

.\" *

.\" * This software is licensed as described in the file COPYING, which

.\" * you should have received as part of this distribution. The terms

.\" * are also available at http://curl.haxx.se/docs/copyright.html.

.\" *

.\" * You may opt to use, copy, modify, merge, publish, distribute and/or sell

.\" * copies of the Software, and permit persons to whom the Software is

.\" * furnished to do so, under the terms of the COPYING file.

.\" *

.\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY

.\" * KIND, either express or implied.

.\" *

.\" **************************************************************************

.\"

.TH CURLOPT_TFTP_NO_OPTIONS 3 "19 Jun 2014" "libcurl 7.37.0" "curl_easy_setopt options"

.SH NAME

CURLOPT_TFTP_NO_OPTIONS \- Prevents TFTP options to be send with RRQs/WRQs

.SH SYNOPSIS

#include <curl/curl.h>



CURLcode curl_easy_setopt(CURL *handle, CURLOPT_TFTP_NO_OPTIONS, long sendoptions);

.SH DESCRIPTION

Set \fIsendoptions\fP to 1 to exclude all TFTP options defined in RFC2347,

RFC2348, RFC2349 from read and write requests.

libcurl will behave like a client implementing only RFC1350, ignoring any

protocol extensions.

.SH DEFAULT

0

.SH PROTOCOLS

TFTP

.SH EXAMPLE

TODO

.SH AVAILABILITY

Added in 7.48.0

.SH RETURN VALUE

Returns CURLE_OK if the option is supported, and CURLE_UNKNOWN_OPTION if not.

docs/libcurl/symbols-in-versions

+1 −0
Original line number Diff line number Diff line
@@ -537,6 +537,7 @@ CURLOPT_TCP_KEEPINTVL 7.25.0 
CURLOPT_TCP_NODELAY             7.11.2

CURLOPT_TELNETOPTIONS           7.7

CURLOPT_TFTP_BLKSIZE            7.19.4

CURLOPT_TFTP_NO_OPTIONS         7.48.0

CURLOPT_TIMECONDITION           7.1

CURLOPT_TIMEOUT                 7.1

CURLOPT_TIMEOUT_MS              7.16.2

include/curl/curl.h

+3 −0
Original line number Diff line number Diff line
@@ -1673,6 +1673,9 @@ typedef enum { 
  /* Set E-xclusive stream dependency on another CURL handle */

  CINIT(STREAM_DEPENDS_E, OBJECTPOINT, 241),



  /* Do not send any tftp option requests to the server */

  CINIT(TFTP_NO_OPTIONS, LONG, 242),



  CURLOPT_LASTENTRY /* the last unused */

} CURLoption;

lib/tftp.c

+30 −27
Original line number Diff line number Diff line
@@ -494,6 +494,8 @@ static CURLcode tftp_send_first(tftp_state_data_t *state, tftp_event_t event) 
             "%s%c%s%c", filename, '\0',  mode, '\0');

    sbytes = 4 + strlen(filename) + strlen(mode);



    /* optional addition of TFTP options */

    if(!data->set.tftp_no_options) {

      /* add tsize option */

      if(data->set.upload && (data->state.infilesize != -1))

        snprintf(buf, sizeof(buf), "%" CURL_FORMAT_CURL_OFF_T,
@@ -521,6 +523,7 @@ static CURLcode tftp_send_first(tftp_state_data_t *state, tftp_event_t event) 
                                TFTP_OPTION_INTERVAL);

      sbytes += tftp_option_add(state, sbytes,

                                (char *)state->spacket.data+sbytes, buf );

    }



    /* the typecase for the 3rd argument is mostly for systems that do

       not have a size_t argument, like older unixes that want an 'int' */