$NetBSD: patch-ab,v 1.3 2002/06/11 21:56:55 itojun Exp $ --- ttcp.c.orig Fri Feb 28 06:30:23 1997 +++ ttcp.c Wed Jun 12 06:54:28 2002 @@ -55,6 +55,7 @@ #include <arpa/inet.h> #include <netdb.h> #include <sys/time.h> /* struct timeval */ +#include <stdlib.h> #if defined(SYSV) #include <sys/times.h> @@ -151,7 +152,7 @@ int argc; char **argv; { - unsigned long addr_tmp; + in_addr_t addr_tmp; int c; if (argc < 2) goto usage; @@ -263,7 +264,7 @@ if ( (buf = (char *)malloc(buflen+bufalign)) == (char *)NULL) err("malloc"); if (bufalign != 0) - buf +=(bufalign - ((int)buf % bufalign) + bufoffset) % bufalign; + buf +=(bufalign - ((u_long)buf % bufalign) + bufoffset) % bufalign; if (trans) { fprintf(stdout, @@ -285,7 +286,7 @@ err("socket"); mes("socket"); - if (bind(fd, &sinme, sizeof(sinme)) < 0) + if (bind(fd, (struct sockaddr *)&sinme, sizeof(sinme)) < 0) err("bind"); #if defined(SO_SNDBUF) || defined(SO_RCVBUF) @@ -326,7 +327,7 @@ mes("nodelay"); } #endif - if(connect(fd, &sinhim, sizeof(sinhim) ) < 0) + if(connect(fd, (struct sockaddr *)&sinhim, sizeof(sinhim) ) < 0) err("connect"); mes("connect"); } else { @@ -348,11 +349,11 @@ } fromlen = sizeof(frominet); domain = AF_INET; - if((fd=accept(fd, &frominet, &fromlen) ) < 0) + if((fd=accept(fd, (struct sockaddr *)&frominet, &fromlen) ) < 0) err("accept"); { struct sockaddr_in peer; int peerlen = sizeof(peer); - if (getpeername(fd, (struct sockaddr_in *) &peer, + if (getpeername(fd, (struct sockaddr *) &peer, &peerlen) < 0) { err("getpeername"); } @@ -752,7 +753,7 @@ int len = sizeof(from); register int cnt; if( udp ) { - cnt = recvfrom( fd, buf, count, 0, &from, &len ); + cnt = recvfrom( fd, buf, count, 0, (struct sockaddr *)&from, &len ); numCalls++; } else { if( b_flag ) @@ -782,7 +783,7 @@ register int cnt; if( udp ) { again: - cnt = sendto( fd, buf, count, 0, &sinhim, sizeof(sinhim) ); + cnt = sendto( fd, buf, count, 0, (struct sockaddr *)&sinhim, sizeof(sinhim) ); numCalls++; if( cnt<0 && errno == ENOBUFS ) { delay(18000); @@ -803,7 +804,7 @@ tv.tv_sec = 0; tv.tv_usec = us; - (void)select( 1, (char *)0, (char *)0, (char *)0, &tv ); + (void)select( 1, (void *)0, (void *)0, (void *)0, &tv ); } /*