/* Can't allocate iovecs; just send the first request. */
sendreq = server->qhead;
- scount = send(server->tcp_socket, (void *)sendreq->data,
- sendreq->len, 0);
-
+ scount = swrite(server->tcp_socket, sendreq->data, sendreq->len);
if (scount < 0)
{
if (!try_again(GET_ERRNO()))
/* We haven't yet read a length word, so read that (or
* what's left to read of it).
*/
- count = recv(server->tcp_socket,
- (void *)(server->tcp_lenbuf + server->tcp_lenbuf_pos),
- 2 - server->tcp_lenbuf_pos, 0);
+ count = sread(server->tcp_socket,
+ server->tcp_lenbuf + server->tcp_lenbuf_pos,
+ 2 - server->tcp_lenbuf_pos);
if (count <= 0)
{
if (!(count == -1 && try_again(GET_ERRNO())))
else
{
/* Read data into the allocated buffer. */
- count = recv(server->tcp_socket,
- (void *)(server->tcp_buffer + server->tcp_buffer_pos),
- server->tcp_length - server->tcp_buffer_pos, 0);
+ count = sread(server->tcp_socket,
+ server->tcp_buffer + server->tcp_buffer_pos,
+ server->tcp_length - server->tcp_buffer_pos);
if (count <= 0)
{
if (!(count == -1 && try_again(GET_ERRNO())))
!FD_ISSET(server->udp_socket, read_fds))
continue;
- count = recv(server->udp_socket, (void *)buf, sizeof(buf), 0);
+ count = sread(server->udp_socket, buf, sizeof(buf));
if (count == -1 && try_again(GET_ERRNO()))
continue;
else if (count <= 0)
return;
}
}
- if (send(server->udp_socket, (void *)query->qbuf,
- query->qlen, 0) == -1)
+ if (swrite(server->udp_socket, query->qbuf, query->qlen) == -1)
{
/* FIXME: Handle EAGAIN here since it likely can happen. */
query->skip_server[query->server] = 1;
struct tftphdr *dp;
struct tftphdr *ap; /* ack packet */
unsigned short block = 1;
- int size, n;
+ int size;
+ ssize_t n;
#if defined(HAVE_ALARM) && defined(SIGALRM)
mysignal(SIGALRM, timer);
#endif
(void) sigsetjmp(timeoutbuf, 1);
#endif
send_data:
- if (send(peer, dp, size + 4, 0) != size + 4) {
+ if (swrite(peer, dp, size + 4) != size + 4) {
logmsg("write\n");
return;
}
#ifdef HAVE_ALARM
alarm(rexmtval); /* read the ack */
#endif
- n = recv(peer, ackbuf, sizeof (ackbuf), 0);
+ n = sread(peer, ackbuf, sizeof (ackbuf));
#ifdef HAVE_ALARM
alarm(0);
#endif
(void) sigsetjmp(timeoutbuf, 1);
#endif
send_ack:
- if (send(peer, ackbuf, 4, 0) != 4) {
+ if (swrite(peer, ackbuf, 4) != 4) {
logmsg("write: fail\n");
goto abort;
}
#ifdef HAVE_ALARM
alarm(rexmtval);
#endif
- n = recv(peer, dp, PKTSIZE, 0);
+ n = sread(peer, dp, PKTSIZE);
#ifdef HAVE_ALARM
alarm(0);
#endif
ap->th_opcode = htons((u_short)ACK); /* send the "final" ack */
ap->th_block = htons((u_short)(block));
- (void) send(peer, ackbuf, 4, 0);
+ (void) swrite(peer, ackbuf, 4);
#if defined(HAVE_ALARM) && defined(SIGALRM)
mysignal(SIGALRM, justquit); /* just quit on timeout */
alarm(rexmtval);
#endif
- n = recv(peer, buf, sizeof (buf), 0); /* normally times out and quits */
+ n = sread(peer, buf, sizeof(buf)); /* normally times out and quits */
#ifdef HAVE_ALARM
alarm(0);
#endif
if (n >= 4 && /* if read some data */
dp->th_opcode == DATA && /* and got a data block */
block == dp->th_block) { /* then my last ack was lost */
- (void) send(peer, ackbuf, 4, 0); /* resend final ack */
+ (void) swrite(peer, ackbuf, 4); /* resend final ack */
}
abort:
return;
length = (int)strlen(pe->e_msg);
tp->th_msg[length] = '\0';
length += 5;
- if (send(peer, buf, length, 0) != length)
+ if (swrite(peer, buf, length) != length)
logmsg("nak: fail\n");
}