mirror of
https://github.com/moparisthebest/curl
synced 2024-12-22 16:18:48 -05:00
no longer uses errno but Curl_sockerrno() and now acknowledges return codes
from Curl_client_write
This commit is contained in:
parent
df9108e19b
commit
3b7359a27a
26
lib/tftp.c
26
lib/tftp.c
@ -36,7 +36,6 @@
|
||||
#ifdef HAVE_SYS_STAT_H
|
||||
#include <sys/stat.h>
|
||||
#endif
|
||||
#include <errno.h>
|
||||
|
||||
#if defined(WIN32)
|
||||
#include <time.h>
|
||||
@ -294,7 +293,7 @@ static void tftp_send_first(tftp_state_data_t *state, tftp_event_t event)
|
||||
state->conn->ip_addr->ai_addr,
|
||||
state->conn->ip_addr->ai_addrlen);
|
||||
if(sbytes < 0) {
|
||||
failf(data, "%s\n", Curl_strerror(state->conn, errno));
|
||||
failf(data, "%s\n", Curl_strerror(state->conn, Curl_sockerrno()));
|
||||
}
|
||||
break;
|
||||
|
||||
@ -362,7 +361,7 @@ static void tftp_rx(tftp_state_data_t *state, tftp_event_t event)
|
||||
(struct sockaddr *)&state->remote_addr,
|
||||
state->remote_addrlen);
|
||||
if(sbytes < 0) {
|
||||
failf(data, "%s\n", Curl_strerror(state->conn, errno));
|
||||
failf(data, "%s\n", Curl_strerror(state->conn, Curl_sockerrno()));
|
||||
}
|
||||
|
||||
/* Check if completed (That is, a less than full packet is received) */
|
||||
@ -390,7 +389,7 @@ static void tftp_rx(tftp_state_data_t *state, tftp_event_t event)
|
||||
state->remote_addrlen);
|
||||
/* Check all sbytes were sent */
|
||||
if(sbytes<0) {
|
||||
failf(data, "%s\n", Curl_strerror(state->conn, errno));
|
||||
failf(data, "%s\n", Curl_strerror(state->conn, Curl_sockerrno()));
|
||||
}
|
||||
}
|
||||
break;
|
||||
@ -444,7 +443,7 @@ static void tftp_tx(tftp_state_data_t *state, tftp_event_t event)
|
||||
state->remote_addrlen);
|
||||
/* Check all sbytes were sent */
|
||||
if(sbytes<0) {
|
||||
failf(data, "%s\n", Curl_strerror(state->conn, errno));
|
||||
failf(data, "%s\n", Curl_strerror(state->conn, Curl_sockerrno()));
|
||||
}
|
||||
}
|
||||
return;
|
||||
@ -466,7 +465,7 @@ static void tftp_tx(tftp_state_data_t *state, tftp_event_t event)
|
||||
state->remote_addrlen);
|
||||
/* Check all sbytes were sent */
|
||||
if(sbytes<0) {
|
||||
failf(data, "%s\n", Curl_strerror(state->conn, errno));
|
||||
failf(data, "%s\n", Curl_strerror(state->conn, Curl_sockerrno()));
|
||||
}
|
||||
break;
|
||||
|
||||
@ -487,7 +486,7 @@ static void tftp_tx(tftp_state_data_t *state, tftp_event_t event)
|
||||
state->remote_addrlen);
|
||||
/* Check all sbytes were sent */
|
||||
if(sbytes<0) {
|
||||
failf(data, "%s\n", Curl_strerror(state->conn, errno));
|
||||
failf(data, "%s\n", Curl_strerror(state->conn, Curl_sockerrno()));
|
||||
}
|
||||
}
|
||||
break;
|
||||
@ -676,12 +675,12 @@ CURLcode Curl_tftp(struct connectdata *conn, bool *done)
|
||||
}
|
||||
|
||||
/* Sanity check packet length */
|
||||
if (state->rbytes < 4)
|
||||
{
|
||||
if (state->rbytes < 4) {
|
||||
failf(conn->data, "Received too short packet\n");
|
||||
/* Not a timeout, but how best to handle it? */
|
||||
event = TFTP_EVENT_TIMEOUT;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
|
||||
/* The event is given by the TFTP packet time */
|
||||
event = (tftp_event_t)getrpacketevent(&state->rpacket);
|
||||
@ -691,8 +690,11 @@ CURLcode Curl_tftp(struct connectdata *conn, bool *done)
|
||||
/* Don't pass to the client empty or retransmitted packets */
|
||||
if (state->rbytes > 4 &&
|
||||
((state->block+1) == getrpacketblock(&state->rpacket))) {
|
||||
Curl_client_write(data, CLIENTWRITE_BODY,
|
||||
(char *)&state->rpacket.data[4], state->rbytes-4);
|
||||
code = Curl_client_write(data, CLIENTWRITE_BODY,
|
||||
(char *)&state->rpacket.data[4],
|
||||
state->rbytes-4);
|
||||
if(code)
|
||||
return code;
|
||||
}
|
||||
break;
|
||||
case TFTP_EVENT_ERROR:
|
||||
|
Loading…
Reference in New Issue
Block a user