aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2007-05-18 10:32:48 +0000
committerDaniel Stenberg <daniel@haxx.se>2007-05-18 10:32:48 +0000
commit250f9670b72637a2cdca49d6ac5656c6f58235fd (patch)
treead5e49e72a94b902a331ef31c79fc26823afb8d8
parented4936fd30122d142e89f11518b2f3bc66fea721 (diff)
Feng Tu reported that curl -w did wrong on TFTP transfers in
bug report #1715394 (http://curl.haxx.se/bug/view.cgi?id=1715394), and the transfer-related info "variables" were indeed overwritten with zeroes wrongly and have now been adjusted. The upload size still isn't accurate.
-rw-r--r--CHANGES7
-rw-r--r--RELEASE-NOTES3
-rw-r--r--lib/tftp.c9
-rw-r--r--lib/transfer.c8
4 files changed, 20 insertions, 7 deletions
diff --git a/CHANGES b/CHANGES
index eb19f401c..af7271c0e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,9 +5,16 @@
\___|\___/|_| \_\_____|
Changelog
+Daniel S (18 May 2007)
+- Feng Tu reported that curl -w did wrong on TFTP transfers in
+ bug report #1715394 (http://curl.haxx.se/bug/view.cgi?id=1715394), and the
+ transfer-related info "variables" were indeed overwritten with zeroes wrongly
+ and have now been adjusted. The upload size still isn't accurate.
+
Daniel S (17 May 2007)
- Feng Tu pointed out a division by zero error in the TFTP connect timeout
code for timeouts less than five seconds, and also provided a fix for it.
+ Bug report #1715392 (http://curl.haxx.se/bug/view.cgi?id=1715392)
Dan F (16 May 2007)
- Added support for compiling under Minix 3.1.3 using ACK.
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a99410c8c..0bb7221c3 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -5,7 +5,7 @@ Curl and libcurl 7.16.3
Available command line options: 118
Available curl_easy_setopt() options: 141
Number of public functions in libcurl: 54
- Amount of public web site mirrors: 39
+ Amount of public web site mirrors: 38
Number of known libcurl bindings: 35
Number of contributors: 554
@@ -44,6 +44,7 @@ This release includes the following bugfixes:
o overwriting an uploaded file with sftp now truncates it first
o SFTP quote commands chmod, chown, chgrp can now set a value of 0
o TFTP connect timouts less than 5 seconds
+ o improved curl -w for TFTP transfers
This release includes the following known bugs:
diff --git a/lib/tftp.c b/lib/tftp.c
index 038306d86..9104d605c 100644
--- a/lib/tftp.c
+++ b/lib/tftp.c
@@ -415,8 +415,6 @@ static CURLcode tftp_rx(tftp_state_data_t *state, tftp_event_t event)
return CURLE_TFTP_ILLEGAL; /* not really the perfect return code for
this */
}
- Curl_pgrsSetDownloadCounter(data,
- (curl_off_t) state->block*TFTP_BLOCKSIZE);
return CURLE_OK;
}
@@ -485,6 +483,7 @@ static CURLcode tftp_tx(tftp_state_data_t *state, tftp_event_t event)
/* Check all sbytes were sent */
if(sbytes<0) {
failf(data, "%s\n", Curl_strerror(state->conn, SOCKERRNO));
+ return CURLE_SEND_ERROR;
}
break;
@@ -497,7 +496,8 @@ static CURLcode tftp_tx(tftp_state_data_t *state, tftp_event_t event)
if(state->retries > state->retry_max) {
state->error = TFTP_ERR_TIMEOUT;
state->state = TFTP_STATE_FIN;
- } else {
+ }
+ else {
/* Re-send the data packet */
sbytes = sendto(state->sockfd, (void *)&state->spacket,
4+state->sbytes, SEND_4TH_ARG,
@@ -506,6 +506,7 @@ static CURLcode tftp_tx(tftp_state_data_t *state, tftp_event_t event)
/* Check all sbytes were sent */
if(sbytes<0) {
failf(data, "%s\n", Curl_strerror(state->conn, SOCKERRNO));
+ return CURLE_SEND_ERROR;
}
}
break;
@@ -738,6 +739,8 @@ CURLcode Curl_tftp(struct connectdata *conn, bool *done)
state->rbytes-4);
if(code)
return code;
+ Curl_pgrsSetDownloadCounter(data,
+ (curl_off_t) state->rbytes-4);
}
break;
case TFTP_EVENT_ERROR:
diff --git a/lib/transfer.c b/lib/transfer.c
index 10a3f87dc..f8d0af87b 100644
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -1792,9 +1792,11 @@ Transfer(struct connectdata *conn)
struct Curl_transfer_keeper *k = &data->reqdata.keep;
bool done=FALSE;
- if(!(conn->protocol & PROT_FILE)) {
- /* Only do this if we are not transferring FILE:, since the file: treatment
- is different*/
+ if(!(conn->protocol & (PROT_FILE|PROT_TFTP))) {
+ /* Only do this if we are not transferring FILE or TFTP, since those
+ transfers are treated differently. They do their entire transfers in
+ the DO function and just returns from this. That is ugly indeed.
+ */
Curl_readwrite_init(conn);
Curl_pre_readwrite(conn);
}