Move "ttcp" package to category "benchmarks".

6 files changed, 132 insertions, 0 deletions

diff --git a/benchmarks/ttcp/Makefile b/benchmarks/ttcp/Makefile
new file mode 100644
index 00000000000..3fecb350900
--- /dev/null
+++ b/benchmarks/ttcp/Makefile
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.1 2001/04/17 11:57:41 tron Exp $
+
+DISTNAME=	ttcp
+PKGNAME=	${DISTNAME}-1.12
+CATEGORIES=	benchmarks net
+MASTER_SITES=	http://www.ccci.com/tools/ttcp/
+EXTRACT_SUFX=	.tar.Z
+
+MAINTAINER=	thorpej@netbsd.org
+HOMEPAGE=	http://www.ccci.com/tools/ttcp/
+COMMENT=	TCP testing and performance measuring tool
+
+.include "../../mk/bsd.prefs.mk"
+
+MANCOMPRESSED_IF_MANZ=	YES
+WRKSRC=			${WRKDIR}
+
+.if (${OPSYS} == SunOS)
+do-build:
+	cd ${WRKSRC} && \
+	${CC} ttcp.c ${CFLAGS} $(LDFLAGS) -lsocket -lnsl -o ttcp && \
+	nroff -man ttcp.1 >ttcp.cat1
+.endif
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/ttcp/distinfo b/benchmarks/ttcp/distinfo
new file mode 100644
index 00000000000..59c317b1400
--- /dev/null
+++ b/benchmarks/ttcp/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2001/04/17 11:57:41 tron Exp $
+
+MD5 (ttcp.tar.Z) = 3688ca186d5da6fd83ade7c6a0150b1d
+SHA1 (patch-aa) = 19d81ba1e6bfaf6527eb8fce29f2276c89f9a35e
+SHA1 (patch-ab) = 888878128e67dfb88d9898a27af765334264e6ef
diff --git a/benchmarks/ttcp/patches/patch-aa b/benchmarks/ttcp/patches/patch-aa
new file mode 100644
index 00000000000..90734063da1
--- /dev/null
+++ b/benchmarks/ttcp/patches/patch-aa
@@ -0,0 +1,14 @@
+$NetBSD: patch-aa,v 1.1 2001/04/17 11:57:42 tron Exp $
+
+--- Makefile.orig	Sat Mar  7 13:39:48 1998
++++ Makefile	Sat Mar  7 13:40:07 1998
+@@ -0,0 +1,9 @@
++
++PROG=	ttcp
++
++BINDIR=${PREFIX}/bin
++MANDIR=${PREFIX}/man
++
++MANINSTALL=	maninstall catinstall
++
++.include <bsd.prog.mk>
diff --git a/benchmarks/ttcp/patches/patch-ab b/benchmarks/ttcp/patches/patch-ab
new file mode 100644
index 00000000000..66a084b75c9
--- /dev/null
+++ b/benchmarks/ttcp/patches/patch-ab
@@ -0,0 +1,79 @@
+$NetBSD: patch-ab,v 1.1 2001/04/17 11:57:42 tron 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 <arpa/inet.h>
+ #include <netdb.h>
+ #include <sys/time.h>		/* struct timeval */
++#include <stdlib.h>
+ 
+ #if defined(SYSV)
+ #include <sys/times.h>
+@@ -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 );
+ }
+ 
+ /*
diff --git a/benchmarks/ttcp/pkg/DESCR b/benchmarks/ttcp/pkg/DESCR
new file mode 100644
index 00000000000..9db116e1eb5
--- /dev/null
+++ b/benchmarks/ttcp/pkg/DESCR
@@ -0,0 +1,5 @@
+Ttcp (test TCP) times the transmission and reception of data  between two
+systems  using  the UDP or TCP protocols.  It differs from common ``blast''
+tests, which  tend  to  measure  the remote inetd as much as the network
+performance, and which usually do not allow measurements at the remote end
+of a UDP transmission.
diff --git a/benchmarks/ttcp/pkg/PLIST b/benchmarks/ttcp/pkg/PLIST
new file mode 100644
index 00000000000..1ef63850a48
--- /dev/null
+++ b/benchmarks/ttcp/pkg/PLIST
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1 2001/04/17 11:57:42 tron Exp $
+bin/ttcp
+man/cat1/ttcp.0
+man/man1/ttcp.1