moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

Yang Tse fixed the 4th argument in the sendto() calls

Browse Source
This commit is contained in:
Daniel Stenberg 2005-12-02 23:22:00 +00:00
parent 6513303498
commit feacad7f68
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/tftp.c
View File

@ -86,10 +86,6 @@
/* The last #include file should be: */ /* The last #include file should be: */
#include "memdebug.h" #include "memdebug.h"
#ifndef MSG_NOSIGNAL
#define MSG_NOSIGNAL 0
#endif
typedef enum { typedef enum {
TFTP_MODE_NETASCII=0, TFTP_MODE_NETASCII=0,
TFTP_MODE_OCTET TFTP_MODE_OCTET
@ -347,7 +343,7 @@ static void tftp_rx(tftp_state_data_t *state, tftp_event_t event)
state->spacket.event = htons(TFTP_EVENT_ACK); state->spacket.event = htons(TFTP_EVENT_ACK);
state->spacket.u.ack.block = htons(state->block); state->spacket.u.ack.block = htons(state->block);
sbytes = sendto(state->sockfd, (void *)&state->spacket, sbytes = sendto(state->sockfd, (void *)&state->spacket,
4, MSG_NOSIGNAL, 4, SEND_4TH_ARG,
(struct sockaddr *)&state->remote_addr, (struct sockaddr *)&state->remote_addr,
state->remote_addrlen); state->remote_addrlen);
if(sbytes < 0) { if(sbytes < 0) {
@ -374,7 +370,7 @@ static void tftp_rx(tftp_state_data_t *state, tftp_event_t event)
} else { } else {
/* Resend the previous ACK */ /* Resend the previous ACK */
sbytes = sendto(state->sockfd, (void *)&state->spacket, sbytes = sendto(state->sockfd, (void *)&state->spacket,
4, MSG_NOSIGNAL, 4, SEND_4TH_ARG,
(struct sockaddr *)&state->remote_addr, (struct sockaddr *)&state->remote_addr,
state->remote_addrlen); state->remote_addrlen);
/* Check all sbytes were sent */ /* Check all sbytes were sent */
@ -440,7 +436,7 @@ static void tftp_tx(tftp_state_data_t *state, tftp_event_t event)
} }
Curl_fillreadbuffer(state->conn, 512, &state->sbytes); Curl_fillreadbuffer(state->conn, 512, &state->sbytes);
sbytes = sendto(state->sockfd, (void *)&state->spacket, sbytes = sendto(state->sockfd, (void *)&state->spacket,
4+state->sbytes, MSG_NOSIGNAL, 4+state->sbytes, SEND_4TH_ARG,
(struct sockaddr *)&state->remote_addr, (struct sockaddr *)&state->remote_addr,
state->remote_addrlen); state->remote_addrlen);
/* Check all sbytes were sent */ /* Check all sbytes were sent */
@ -461,7 +457,7 @@ static void tftp_tx(tftp_state_data_t *state, tftp_event_t event)
} else { } else {
/* Re-send the data packet */ /* Re-send the data packet */
sbytes = sendto(state->sockfd, (void *)&state->spacket, sbytes = sendto(state->sockfd, (void *)&state->spacket,
4+state->sbytes, MSG_NOSIGNAL, 4+state->sbytes, SEND_4TH_ARG,
(struct sockaddr *)&state->remote_addr, (struct sockaddr *)&state->remote_addr,
state->remote_addrlen); state->remote_addrlen);
/* Check all sbytes were sent */ /* Check all sbytes were sent */