aboutsummaryrefslogtreecommitdiff
path: root/lib/tftp.c
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2008-07-30 05:10:42 +0000
committerYang Tse <yangsita@gmail.com>2008-07-30 05:10:42 +0000
commit537490e391157f47ccf2957e123019d9356dbe94 (patch)
tree57fb44831f4d147c24e1deb358ba84b95441ebfd /lib/tftp.c
parentde8e362d4a31b707c81420536a3da3efa72903cb (diff)
Undo using the sreadfrom() wrapper to replace recvfrom() in our code.
Diffstat (limited to 'lib/tftp.c')
-rw-r--r--lib/tftp.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/tftp.c b/lib/tftp.c
index 449a2b3d2..8478fd6f9 100644
--- a/lib/tftp.c
+++ b/lib/tftp.c
@@ -717,7 +717,7 @@ static CURLcode tftp_do(struct connectdata *conn, bool *done)
CURLcode code;
int rc;
struct Curl_sockaddr_storage fromaddr;
- RECVFROM_ARG6_T fromlen;
+ socklen_t fromlen;
int check_time = 0;
struct SingleRequest *k = &data->req;
@@ -764,10 +764,13 @@ static CURLcode tftp_do(struct connectdata *conn, bool *done)
else {
/* Receive the packet */
- fromlen = (RECVFROM_ARG6_T)sizeof(fromaddr);
- state->rbytes = sreadfrom(state->sockfd,
- &state->rpacket, sizeof(state->rpacket),
- &fromaddr, &fromlen);
+ fromlen = sizeof(fromaddr);
+ state->rbytes = (ssize_t)recvfrom(state->sockfd,
+ (void *)&state->rpacket,
+ sizeof(state->rpacket),
+ 0,
+ (struct sockaddr *)&fromaddr,
+ &fromlen);
if(state->remote_addrlen==0) {
memcpy(&state->remote_addr, &fromaddr, fromlen);
state->remote_addrlen = fromlen;