diff options
author | Daniel Stenberg <daniel@haxx.se> | 2023-04-25 08:28:01 +0200 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2023-04-25 12:38:38 +0200 |
commit | 7815647d6582c0a4900be2e1de6c5e61272c496b (patch) | |
tree | 40ae2ddacadfddb1d5e26637158c8cf004da2c9d /lib/tftp.c | |
parent | e5af5b7905900a49522428f914ade3c28152bfd9 (diff) | |
download | curl-7815647d6582c0a4900be2e1de6c5e61272c496b.tar.gz |
lib: unify the upload/method handling
By making sure we set state.upload based on the set.method value and not
independently as set.upload, we reduce confusion and mixup risks, both
internally and externally.
Closes #11017
Diffstat (limited to 'lib/tftp.c')
-rw-r--r-- | lib/tftp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/tftp.c b/lib/tftp.c index 164d3c723..8ed1b887b 100644 --- a/lib/tftp.c +++ b/lib/tftp.c @@ -370,7 +370,7 @@ static CURLcode tftp_parse_option_ack(struct tftp_state_data *state, /* tsize should be ignored on upload: Who cares about the size of the remote file? */ - if(!data->set.upload) { + if(!data->state.upload) { if(!tsize) { failf(data, "invalid tsize -:%s:- value in OACK packet", value); return CURLE_TFTP_ILLEGAL; @@ -451,7 +451,7 @@ static CURLcode tftp_send_first(struct tftp_state_data *state, return result; } - if(data->set.upload) { + if(data->state.upload) { /* If we are uploading, send an WRQ */ setpacketevent(&state->spacket, TFTP_EVENT_WRQ); state->data->req.upload_fromhere = @@ -486,7 +486,7 @@ static CURLcode tftp_send_first(struct tftp_state_data *state, if(!data->set.tftp_no_options) { char buf[64]; /* add tsize option */ - if(data->set.upload && (data->state.infilesize != -1)) + if(data->state.upload && (data->state.infilesize != -1)) msnprintf(buf, sizeof(buf), "%" CURL_FORMAT_CURL_OFF_T, data->state.infilesize); else @@ -540,7 +540,7 @@ static CURLcode tftp_send_first(struct tftp_state_data *state, break; case TFTP_EVENT_OACK: - if(data->set.upload) { + if(data->state.upload) { result = tftp_connect_for_tx(state, event); } else { |