Changelog
+Yang Tse (21 Jul 2008)
+- Use the sreadfrom() wrapper to replace recvfrom() in our code.
+
Yang Tse (20 Jul 2008)
- when recvfrom prototype uses a void pointer for arguments 2, 5 or 6 this will
now cause the definition, as appropriate, of RECVFROM_TYPE_ARG2_IS_VOID,
#endif /* HAVE_RECVFROM */
+#ifdef RECVFROM_TYPE_ARG6_IS_VOID
+# define RECVFROM_ARG6_T unsigned int
+#else
+# define RECVFROM_ARG6_T RECVFROM_TYPE_ARG6
+#endif
+
+
/*
* Uppercase macro versions of ANSI/ISO is*() functions/macros which
* avoid negative number inputs with argument byte codes > 127.
#endif /* HAVE_RECVFROM */
+#ifdef RECVFROM_TYPE_ARG6_IS_VOID
+# define RECVFROM_ARG6_T unsigned int
+#else
+# define RECVFROM_ARG6_T RECVFROM_TYPE_ARG6
+#endif
+
+
/*
* Uppercase macro versions of ANSI/ISO is*() functions/macros which
* avoid negative number inputs with argument byte codes > 127.
struct Curl_sockaddr_storage local_addr;
struct Curl_sockaddr_storage remote_addr;
socklen_t remote_addrlen;
- int rbytes;
+ ssize_t rbytes;
int sbytes;
tftp_packet_t rpacket;
tftp_packet_t spacket;
}
/* Check if completed (That is, a less than full packet is received) */
- if(state->rbytes < (int)sizeof(state->spacket)){
+ if(state->rbytes < sizeof(state->spacket)){
state->state = TFTP_STATE_FIN;
}
else {
CURLcode code;
int rc;
struct Curl_sockaddr_storage fromaddr;
- socklen_t fromlen;
+ RECVFROM_ARG6_T fromlen;
int check_time = 0;
struct SingleRequest *k = &data->req;
else {
/* Receive the packet */
- fromlen=sizeof(fromaddr);
- state->rbytes = recvfrom(state->sockfd,
- (void *)&state->rpacket, sizeof(state->rpacket),
- 0, (struct sockaddr *)&fromaddr, &fromlen);
+ fromlen = (RECVFROM_ARG6_T)sizeof(fromaddr);
+ state->rbytes = sreadfrom(state->sockfd,
+ &state->rpacket, sizeof(state->rpacket),
+ &fromaddr, &fromlen);
if(state->remote_addrlen==0) {
memcpy(&state->remote_addr, &fromaddr, fromlen);
state->remote_addrlen = fromlen;
static char buf[PKTSIZE];
static char ackbuf[PKTSIZE];
static struct sockaddr_in from;
-static socklen_t fromlen;
+static RECVFROM_ARG6_T fromlen;
struct bf {
int counter; /* size of data in buffer, or flag */
int j = 0;
char rbuf[PKTSIZE];
struct sockaddr_in fromaddr;
- socklen_t fromaddrlen;
+ RECVFROM_ARG6_T fromaddrlen;
while (1) {
#if defined(HAVE_IOCTLSOCKET)
#endif
if (i) {
j++;
- fromaddrlen = sizeof fromaddr;
- (void) recvfrom(f, rbuf, sizeof (rbuf), 0,
- (struct sockaddr *)&fromaddr, &fromaddrlen);
+ fromaddrlen = (RECVFROM_ARG6_T)sizeof(fromaddr);
+ (void)sreadfrom(f, rbuf, sizeof(rbuf), &fromaddr, &fromaddrlen);
}
else
break;
#endif /* ENABLE_IPV6 */
struct tftphdr *tp;
- int n = 0;
+ ssize_t n = 0;
int arg = 1;
char *pidname= (char *)".tftpd.pid";
unsigned short port = DEFAULT_PORT;
, port );
do {
- fromlen = sizeof(from);
- n = recvfrom(sock, buf, sizeof (buf), 0,
- (struct sockaddr *)&from, &fromlen);
+ fromlen = (RECVFROM_ARG6_T)sizeof(from);
+ n = sreadfrom(sock, buf, sizeof(buf), &from, &fromlen);
if (n < 0) {
logmsg("recvfrom:\n");
result = 3;