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

- Add tests.

- Add an example to CURLOPT_TFTP_NO_OPTIONS.3.

- Add --tftp-no-options to expose CURLOPT_TFTP_NO_OPTIONS.

Bug: https://github.com/curl/curl/issues/481
This commit is contained in:
Jay Satiro 2015-08-24 00:15:01 -04:00
parent 9dc3eaee29
commit 186546f1c5
12 changed files with 155 additions and 20 deletions

View file

@ -126,7 +126,7 @@ test1208 test1209 test1210 test1211 test1212 test1213 test1214 test1215 \
test1216 test1217 test1218 test1219 \
test1220 test1221 test1222 test1223 test1224 test1225 test1226 test1227 \
test1228 test1229 test1230 test1231 test1232 test1233 test1234 test1235 \
test1236 test1237 test1238 test1239 test1240 test1241 \
test1236 test1237 test1238 test1239 test1240 test1241 test1242 test1243 \
\
test1300 test1301 test1302 test1303 test1304 test1305 test1306 test1307 \
test1308 test1309 test1310 test1311 test1312 test1313 test1314 test1315 \

43
tests/data/test1242 Normal file
View file

@ -0,0 +1,43 @@
<testcase>
<info>
<keywords>
TFTP
TFTP RRQ
</keywords>
</info>
#
# Server-side
<reply>
<data>
a chunk of
data
returned
to client
</data>
</reply>
#
# Client-side
<client>
<server>
tftp
</server>
<name>
TFTP retrieve without TFTP options requests
</name>
<command>
tftp://%HOSTIP:%TFTPPORT//1242 --tftp-no-options --trace-ascii log/traceit
</command>
</client>
#
# Verify pseudo protocol after the test has been "shot"
<verify>
<protocol>
opcode: 1
mode: octet
filename: /1242
</protocol>
</verify>
</testcase>

44
tests/data/test1243 Normal file
View file

@ -0,0 +1,44 @@
<testcase>
<info>
<keywords>
TFTP
TFTP WRQ
</keywords>
</info>
#
# Client-side
<client>
<server>
tftp
</server>
<name>
TFTP send without TFTP options requests
</name>
<command>
-T log/test1243.txt tftp://%HOSTIP:%TFTPPORT// --tftp-no-options --trace-ascii log/traceit
</command>
<file name="log/test1243.txt">
a chunk of
data
sent
to server
</file>
</client>
#
# Verify pseudo protocol after the test has been "shot"
<verify>
<upload>
a chunk of
data
sent
to server
</upload>
<protocol>
opcode: 2
mode: octet
filename: /test1243.txt
</protocol>
</verify>
</testcase>