head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.54 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.52 pkgsrc-2012Q4-base:1.6 pkgsrc-2011Q4:1.6.0.50 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q2:1.6.0.48 pkgsrc-2011Q2-base:1.6 pkgsrc-2009Q4:1.6.0.46 pkgsrc-2009Q4-base:1.6 pkgsrc-2008Q4:1.6.0.44 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.42 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.40 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.38 pkgsrc-2008Q2-base:1.6 pkgsrc-2008Q1:1.6.0.36 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.34 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.32 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.30 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.28 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.26 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.6.0.24 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.6.0.22 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.6.0.20 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.6.0.18 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.6.0.16 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.14 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.12 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.10 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.8 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.6.0.6 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.6.0.4 pkgsrc-2004Q1-base:1.6 pkgsrc-2003Q4:1.6.0.2 pkgsrc-2003Q4-base:1.6 buildlink2-base:1.6 netbsd-1-5-RELEASE:1.5 netbsd-1-4-PATCH003:1.5 netbsd-1-4-PATCH002:1.5 comdex-fall-1999:1.4 netbsd-1-4-PATCH001:1.3 netbsd-1-4-RELEASE:1.3 netbsd-1-3-PATCH003:1.3 netbsd-1-3-PATCH002:1.2; locks; strict; comment @# @; 1.6 date 2001.04.17.11.57.43; author tron; state dead; branches; next 1.5; 1.5 date 2000.01.10.01.24.41; author wiz; state Exp; branches; next 1.4; 1.4 date 99.09.07.03.48.20; author abs; state Exp; branches; next 1.3; 1.3 date 98.08.07.11.11.02; author agc; state Exp; branches; next 1.2; 1.2 date 98.01.27.23.40.30; author thorpej; state Exp; branches; next 1.1; 1.1 date 97.12.14.23.59.28; author thorpej; state Exp; branches; next ; desc @@ 1.6 log @Move "ttcp" package to category "benchmarks". @ text @$NetBSD: patch-ab,v 1.5 2000/01/10 01:24:41 wiz Exp $ --- ttcp.c.orig Fri Aug 6 15:30:21 1999 +++ ttcp.c Fri Aug 6 15:30:21 1999 @@@@ -55,6 +55,7 @@@@ #include #include #include /* struct timeval */ +#include #if defined(SYSV) #include @@@@ -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 ); } /* @ 1.5 log @RCS tags added @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Compile under Solaris @ text @d1 1 @ 1.3 log @Add NetBSD RCS Ids. @ text @d1 78 a78 124 $NetBSD$ *** ttcp.c.orig Thu Feb 27 13:30:23 1997 --- ttcp.c Tue Jan 27 13:51:55 1998 *************** *** 55,60 **** --- 55,61 ---- #include #include #include /* struct timeval */ + #include #if defined(SYSV) #include *************** *** 263,269 **** if ( (buf = (char *)malloc(buflen+bufalign)) == (char *)NULL) err("malloc"); if (bufalign != 0) ! buf +=(bufalign - ((int)buf % bufalign) + bufoffset) % bufalign; if (trans) { fprintf(stdout, --- 264,270 ---- if ( (buf = (char *)malloc(buflen+bufalign)) == (char *)NULL) err("malloc"); if (bufalign != 0) ! buf +=(bufalign - ((u_long)buf % bufalign) + bufoffset) % bufalign; if (trans) { fprintf(stdout, *************** *** 285,291 **** err("socket"); mes("socket"); ! if (bind(fd, &sinme, sizeof(sinme)) < 0) err("bind"); #if defined(SO_SNDBUF) || defined(SO_RCVBUF) --- 286,292 ---- err("socket"); mes("socket"); ! if (bind(fd, (struct sockaddr *)&sinme, sizeof(sinme)) < 0) err("bind"); #if defined(SO_SNDBUF) || defined(SO_RCVBUF) *************** *** 326,332 **** mes("nodelay"); } #endif ! if(connect(fd, &sinhim, sizeof(sinhim) ) < 0) err("connect"); mes("connect"); } else { --- 327,333 ---- mes("nodelay"); } #endif ! if(connect(fd, (struct sockaddr *)&sinhim, sizeof(sinhim) ) < 0) err("connect"); mes("connect"); } else { *************** *** 348,358 **** } fromlen = sizeof(frominet); domain = AF_INET; ! if((fd=accept(fd, &frominet, &fromlen) ) < 0) err("accept"); { struct sockaddr_in peer; int peerlen = sizeof(peer); ! if (getpeername(fd, (struct sockaddr_in *) &peer, &peerlen) < 0) { err("getpeername"); } --- 349,359 ---- } fromlen = sizeof(frominet); domain = AF_INET; ! if((fd=accept(fd, (struct sockaddr *)&frominet, &fromlen) ) < 0) err("accept"); { struct sockaddr_in peer; int peerlen = sizeof(peer); ! if (getpeername(fd, (struct sockaddr *) &peer, &peerlen) < 0) { err("getpeername"); } *************** *** 752,758 **** int len = sizeof(from); register int cnt; if( udp ) { ! cnt = recvfrom( fd, buf, count, 0, &from, &len ); numCalls++; } else { if( b_flag ) --- 753,759 ---- int len = sizeof(from); register int cnt; if( udp ) { ! cnt = recvfrom( fd, buf, count, 0, (struct sockaddr *)&from, &len ); numCalls++; } else { if( b_flag ) *************** *** 782,788 **** register int cnt; if( udp ) { again: ! cnt = sendto( fd, buf, count, 0, &sinhim, sizeof(sinhim) ); numCalls++; if( cnt<0 && errno == ENOBUFS ) { delay(18000); --- 783,789 ---- register int cnt; if( udp ) { again: ! cnt = sendto( fd, buf, count, 0, (struct sockaddr *)&sinhim, sizeof(sinhim) ); numCalls++; if( cnt<0 && errno == ENOBUFS ) { delay(18000); @ 1.2 log @Fix warnings on the Alpha. @ text @d1 2 @ 1.1 log @Add a package for TTCP, the canonical TCP testing tool. @ text @d1 29 a29 2 *** ttcp.c.orig Sun Dec 14 18:24:05 1997 --- ttcp.c Sun Dec 14 18:25:43 1997 d39 1 a39 1 --- 285,291 ---- d56 1 a56 1 --- 326,332 ---- d77 1 a77 1 --- 348,358 ---- d98 1 a98 1 --- 752,758 ---- d115 1 a115 1 --- 782,788 ---- @