From 537490e391157f47ccf2957e123019d9356dbe94 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Wed, 30 Jul 2008 05:10:42 +0000 Subject: Undo using the sreadfrom() wrapper to replace recvfrom() in our code. --- lib/tftp.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'lib') 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; -- cgit v1.2.3