diff options
author | tedu <tedu@openbsd.org> | 2014-03-12 18:17:26 +0000 |
---|---|---|
committer | tedu <tedu@openbsd.org> | 2014-03-12 18:17:26 +0000 |
commit | 0b54d11d3dc23e2ba1f6f3e2a9f0371d0b309769 (patch) | |
tree | b601209e1f3a1baad38a3cd4f051b74efac06e7b | |
parent | no more rmail in base; ok millert (diff) | |
download | wireguard-openbsd-0b54d11d3dc23e2ba1f6f3e2a9f0371d0b309769.tar.xz wireguard-openbsd-0b54d11d3dc23e2ba1f6f3e2a9f0371d0b309769.zip |
Are they going to help?
No.
Well, then tell them to stay out of the way.
ok deraadt
-rw-r--r-- | etc/inetd.conf | 3 | ||||
-rw-r--r-- | etc/rpc | 3 | ||||
-rw-r--r-- | libexec/Makefile | 4 | ||||
-rw-r--r-- | libexec/rpc.sprayd/Makefile | 12 | ||||
-rw-r--r-- | libexec/rpc.sprayd/rpc.sprayd.8 | 56 | ||||
-rw-r--r-- | libexec/rpc.sprayd/sprayd.c | 152 | ||||
-rw-r--r-- | usr.sbin/Makefile | 4 | ||||
-rw-r--r-- | usr.sbin/spray/Makefile | 8 | ||||
-rw-r--r-- | usr.sbin/spray/spray.8 | 74 | ||||
-rw-r--r-- | usr.sbin/spray/spray.c | 233 |
10 files changed, 6 insertions, 543 deletions
diff --git a/etc/inetd.conf b/etc/inetd.conf index 199e74a68c4..39341516f63 100644 --- a/etc/inetd.conf +++ b/etc/inetd.conf @@ -1,4 +1,4 @@ -# $OpenBSD: inetd.conf,v 1.64 2013/12/15 17:40:45 tedu Exp $ +# $OpenBSD: inetd.conf,v 1.65 2014/03/12 18:17:26 tedu Exp $ # # Internet server configuration database # @@ -40,5 +40,4 @@ daytime stream tcp6 nowait root internal #rstatd/1-3 dgram rpc/udp wait root /usr/libexec/rpc.rstatd rpc.rstatd #rusersd/1-3 dgram rpc/udp wait root /usr/libexec/rpc.rusersd rpc.rusersd #walld/1 dgram rpc/udp wait root /usr/libexec/rpc.rwalld rpc.rwalld -#sprayd/1 dgram rpc/udp wait root /usr/libexec/rpc.sprayd rpc.sprayd #rquotad/1 dgram rpc/udp wait root /usr/libexec/rpc.rquotad rpc.rquotad @@ -1,5 +1,5 @@ # -# $OpenBSD: rpc,v 1.4 2007/04/26 20:28:38 espie Exp $ +# $OpenBSD: rpc,v 1.5 2014/03/12 18:17:26 tedu Exp $ # from: rpc 88/08/01 4.0 RPCSRC; from 1.12 88/02/07 SMI # portmapper 100000 portmap sunrpc @@ -13,7 +13,6 @@ walld 100008 rwall shutdown yppasswdd 100009 yppasswd etherstatd 100010 etherstat rquotad 100011 rquotaprog quota rquota -sprayd 100012 spray 3270_mapper 100013 rje_mapper 100014 selection_svc 100015 selnsvc diff --git a/libexec/Makefile b/libexec/Makefile index cda655eb754..061a40b1810 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.7 (Berkeley) 4/1/91 -# $OpenBSD: Makefile,v 1.54 2013/12/04 20:49:28 deraadt Exp $ +# $OpenBSD: Makefile,v 1.55 2014/03/12 18:17:26 tedu Exp $ .include <bsd.own.mk> @@ -7,7 +7,7 @@ SUBDIR= comsat fingerd ftpd getty ld.so lockspool login_chpass \ login_lchpass login_passwd login_radius login_reject \ login_skey login_tis login_token login_yubikey mail.local \ makewhatis rpc.rquotad rpc.rstatd rpc.rusersd rpc.rwalld \ - rpc.sprayd rshd security spamd spamd-setup spamlogd talkd \ + rshd security spamd spamd-setup spamlogd talkd \ tcpd uucpd .if (${YP:L} == "yes") diff --git a/libexec/rpc.sprayd/Makefile b/libexec/rpc.sprayd/Makefile deleted file mode 100644 index 4246ee01989..00000000000 --- a/libexec/rpc.sprayd/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# $OpenBSD: Makefile,v 1.2 2001/01/28 19:34:32 niklas Exp $ - -PROG = rpc.sprayd -SRCS = sprayd.c -MAN = rpc.sprayd.8 -MLINKS= rpc.sprayd.8 sprayd.8 - -DPADD= ${LIBRPCSVC} -LDADD= -lrpcsvc - -.include <bsd.prog.mk> - diff --git a/libexec/rpc.sprayd/rpc.sprayd.8 b/libexec/rpc.sprayd/rpc.sprayd.8 deleted file mode 100644 index 54e870aec1f..00000000000 --- a/libexec/rpc.sprayd/rpc.sprayd.8 +++ /dev/null @@ -1,56 +0,0 @@ -.\" $OpenBSD: rpc.sprayd.8,v 1.6 2007/05/31 19:19:40 jmc Exp $ -.\" -.\" Copyright (c) 1994 Christos Zoulas -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by Christos Zoulas. -.\" 4. The name of the author may not be used to endorse or promote products -.\" derived from this software without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -.\" -.\" $Id: rpc.sprayd.8,v 1.6 2007/05/31 19:19:40 jmc Exp $ -.\" -.Dd $Mdocdate: May 31 2007 $ -.Dt RPC.SPRAYD 8 -.Os -.Sh NAME -.Nm sprayd , -.Nm rpc.sprayd -.Nd spray server -.Sh SYNOPSIS -.Nm rpc.sprayd -.Sh DESCRIPTION -.Nm rpc.sprayd -is a server which records packets sent by the -.Xr spray 8 -command and sends a traffic report to the originator of the packets. -The -.Nm rpc.sprayd -daemon is normally invoked by -.Xr inetd 8 . -.Pp -.Nm rpc.sprayd -uses an RPC protocol defined in -.Pa /usr/include/rpcsvc/spray.x . -.Sh SEE ALSO -.Xr spray 8 diff --git a/libexec/rpc.sprayd/sprayd.c b/libexec/rpc.sprayd/sprayd.c deleted file mode 100644 index c7f0da7e413..00000000000 --- a/libexec/rpc.sprayd/sprayd.c +++ /dev/null @@ -1,152 +0,0 @@ -/* $OpenBSD: sprayd.c,v 1.10 2009/10/27 23:59:31 deraadt Exp $*/ - -/* - * Copyright (c) 1994 Christos Zoulas - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Christos Zoulas. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#include <sys/types.h> -#include <sys/socket.h> -#include <sys/time.h> -#include <stdio.h> -#include <stdlib.h> -#include <signal.h> -#include <unistd.h> -#include <syslog.h> -#include <rpc/rpc.h> -#include <rpcsvc/spray.h> - -static void spray_service(struct svc_req *, SVCXPRT *); - -static int from_inetd = 1; - -#define TIMEOUT 120 - -static void -cleanup(int signo) -{ - (void) pmap_unset(SPRAYPROG, SPRAYVERS); /* XXX signal race */ - _exit(0); -} - -static void -die(int signo) -{ - _exit(0); -} - -int -main(int argc, char *argv[]) -{ - SVCXPRT *transp; - int sock = 0; - int proto = 0; - struct sockaddr_storage from; - socklen_t fromlen; - - /* - * See if inetd started us - */ - fromlen = sizeof(from); - if (getsockname(0, (struct sockaddr *)&from, &fromlen) < 0) { - from_inetd = 0; - sock = RPC_ANYSOCK; - proto = IPPROTO_UDP; - } - - if (!from_inetd) { - daemon(0, 0); - - (void) pmap_unset(SPRAYPROG, SPRAYVERS); - - (void) signal(SIGINT, cleanup); - (void) signal(SIGTERM, cleanup); - (void) signal(SIGHUP, cleanup); - } else { - (void) signal(SIGALRM, die); - alarm(TIMEOUT); - } - - openlog("rpc.sprayd", LOG_CONS|LOG_PID, LOG_DAEMON); - - transp = svcudp_create(sock); - if (transp == NULL) { - syslog(LOG_ERR, "cannot create udp service."); - return 1; - } - if (!svc_register(transp, SPRAYPROG, SPRAYVERS, spray_service, proto)) { - syslog(LOG_ERR, - "unable to register (SPRAYPROG, SPRAYVERS, %s).", - proto ? "udp" : "(inetd)"); - return 1; - } - - svc_run(); - syslog(LOG_ERR, "svc_run returned"); - return 1; -} - - -static void -spray_service(struct svc_req *rqstp, SVCXPRT *transp) -{ - static struct timeval clear, get; - static spraycumul scum; - - switch (rqstp->rq_proc) { - case SPRAYPROC_CLEAR: - scum.counter = 0; - (void) gettimeofday(&clear, 0); - /*FALLTHROUGH*/ - - case NULLPROC: - (void)svc_sendreply(transp, xdr_void, (char *)NULL); - return; - - case SPRAYPROC_SPRAY: - scum.counter++; - return; - - case SPRAYPROC_GET: - (void) gettimeofday(&get, 0); - timersub(&get, &clear, &get); - scum.clock.sec = get.tv_sec; - scum.clock.usec = get.tv_usec; - break; - - default: - svcerr_noproc(transp); - return; - } - - if (!svc_sendreply(transp, xdr_spraycumul, (caddr_t)&scum)) { - svcerr_systemerr(transp); - syslog(LOG_ERR, "bad svc_sendreply"); - } -} diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 0f4e8656b5f..49c4d850a0f 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.171 2014/01/05 16:03:48 jsing Exp $ +# $OpenBSD: Makefile,v 1.172 2014/03/12 18:17:27 tedu Exp $ .include <bsd.own.mk> @@ -15,7 +15,7 @@ SUBDIR= ac accton acpidump adduser amd apm apmd arp \ quot quotaon rarpd rbootd rdate relayctl relayd repquota rip6query \ ripctl ripd rmt route6d rpc.bootparamd rpc.lockd rpc.statd rtadvd \ rtsold rwhod sa sasyncd sensorsd sliplogin slowcgi slstats smtpd \ - snmpctl snmpd spamdb spray syslogc syslogd sysmerge tcpdrop tcpdump \ + snmpctl snmpd spamdb syslogc syslogd sysmerge tcpdrop tcpdump \ tftp-proxy tftpd tokenadm tokeninit traceroute traceroute6 trpt \ usbdevs user vipw watchdogd wsconscfg wsfontload wsmoused zdump zic \ ztsscale diff --git a/usr.sbin/spray/Makefile b/usr.sbin/spray/Makefile deleted file mode 100644 index 91cf151e46b..00000000000 --- a/usr.sbin/spray/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# $OpenBSD: Makefile,v 1.3 1997/09/21 11:44:26 deraadt Exp $ - -PROG= spray -MAN= spray.8 -LDADD+= -lrpcsvc -DPADD+= ${LIBRPCSVC} - -.include <bsd.prog.mk> diff --git a/usr.sbin/spray/spray.8 b/usr.sbin/spray/spray.8 deleted file mode 100644 index 04789d688af..00000000000 --- a/usr.sbin/spray/spray.8 +++ /dev/null @@ -1,74 +0,0 @@ -.\" $OpenBSD: spray.8,v 1.10 2008/06/02 19:06:17 deraadt Exp $ -.\" -.\" Copyright (c) 1994 James A. Jegers -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. The name of the author may not be used to endorse or promote products -.\" derived from this software without specific prior written permission -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -.\" -.Dd $Mdocdate: June 2 2008 $ -.Dt SPRAY 8 -.Os -.Sh NAME -.Nm spray -.Nd send many packets to host -.Sh SYNOPSIS -.Nm spray -.Op Fl c Ar count -.Op Fl d Ar delay -.Op Fl l Ar length -.Ar host -.Sh DESCRIPTION -.Nm -sends multiple RPC packets to -.Ar host -and records how many of them were correctly received and how long it took. -.Pp -The options are as follows: -.Bl -tag -width Ds -.It Fl c Ar count -Send -.Ar count -packets. -.It Fl d Ar delay -Pause -.Ar delay -microseconds between sending each packet. -.It Fl l Ar length -Set the length of the packet that holds the RPC call message to -.Ar length -bytes. -Not all values of -.Ar length -are possible because RPC data is encoded using XDR. -.Nm -rounds up to the nearest possible value. -.El -.Pp -.Nm -is intended for use in network testing, measurement, and management. -This command -.Bf -emphasis -can be very hard on a network and should be used with caution. -.Ef -.Sh SEE ALSO -.Xr netstat 1 , -.Xr ifconfig 8 , -.Xr ping 8 , -.Xr rpc.sprayd 8 diff --git a/usr.sbin/spray/spray.c b/usr.sbin/spray/spray.c deleted file mode 100644 index df8714cf4ab..00000000000 --- a/usr.sbin/spray/spray.c +++ /dev/null @@ -1,233 +0,0 @@ -/* $OpenBSD: spray.c,v 1.9 2008/06/02 19:06:17 deraadt Exp $ */ - -/* - * Copyright (c) 1993 Winning Strategies, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Winning Strategies, Inc. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id: spray.c,v 1.9 2008/06/02 19:06:17 deraadt Exp $ - */ - -#include <err.h> -#include <errno.h> -#include <limits.h> -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> - -#include <rpc/rpc.h> -#include <rpcsvc/spray.h> - -#ifndef SPRAYOVERHEAD -#define SPRAYOVERHEAD 86 -#endif - -void usage(void); -void print_xferstats(int, int, double); - -/* spray buffer */ -char spray_buffer[SPRAYMAX]; - -/* RPC timeouts */ -struct timeval NO_DEFAULT = { -1, -1 }; -struct timeval ONE_WAY = { 0, 0 }; -struct timeval TIMEOUT = { 25, 0 }; - -int -main(int argc, char *argv[]) -{ - char *progname; - spraycumul host_stats; - sprayarr host_array; - CLIENT *cl; - int c; - int i; - int count = 0; - int delay = 0; - int length = 0; - double xmit_time; /* time to receive data */ - - progname = *argv; - while ((c = getopt(argc, argv, "c:d:l:")) != -1) { - const char *errstr; - - switch (c) { - case 'c': - count = strtonum(optarg, 1, INT_MAX, &errstr); - if (errstr) - errx(1, "number of packets is %s: %s", - errstr, optarg); - break; - case 'd': - delay = strtonum(optarg, 0, INT_MAX, &errstr); - if (errstr) - errx(1, "delay is %s: %s", errstr, optarg); - break; - case 'l': - length = strtonum(optarg, SPRAYOVERHEAD, SPRAYMAX, - &errstr); - if (errstr) - errx(1, "length is %s: %s", errstr, optarg); - break; - default: - usage(); - /* NOTREACHED */ - } - } - argc -= optind; - argv += optind; - - if (argc != 1) { - usage(); - /* NOTREACHED */ - } - - - /* Correct packet length. */ - if (length > SPRAYMAX) { - length = SPRAYMAX; - } else if (length < SPRAYOVERHEAD) { - length = SPRAYOVERHEAD; - } else { - /* The RPC portion of the packet is a multiple of 32 bits. */ - length -= SPRAYOVERHEAD - 3; - length &= ~3; - length += SPRAYOVERHEAD; - } - - - /* - * The default value of count is the number of packets required - * to make the total stream size 100000 bytes. - */ - if (!count) { - count = 100000 / length; - } - - /* Initialize spray argument */ - host_array.sprayarr_len = length - SPRAYOVERHEAD; - host_array.sprayarr_val = spray_buffer; - - /* create connection with server */ - cl = clnt_create(*argv, SPRAYPROG, SPRAYVERS, "udp"); - if (cl == NULL) { - clnt_pcreateerror(progname); - exit(1); - } - - /* - * For some strange reason, RPC 4.0 sets the default timeout, - * thus timeouts specified in clnt_call() are always ignored. - * - * The following (undocumented) hack resets the internal state - * of the client handle. - */ - clnt_control(cl, CLSET_TIMEOUT, (caddr_t)&NO_DEFAULT); - - - /* Clear server statistics */ - if (clnt_call(cl, SPRAYPROC_CLEAR, xdr_void, NULL, xdr_void, NULL, - TIMEOUT) != RPC_SUCCESS) { - clnt_perror(cl, progname); - exit(1); - } - - - /* Spray server with packets */ - printf ("sending %d packets of lnth %d to %s ...", count, length, *argv); - fflush (stdout); - - for (i = 0; i < count; i++) { - clnt_call(cl, SPRAYPROC_SPRAY, xdr_sprayarr, &host_array, - xdr_void, NULL, ONE_WAY); - - if (delay) - usleep(delay); - } - - - /* Collect statistics from server */ - if (clnt_call(cl, SPRAYPROC_GET, xdr_void, NULL, xdr_spraycumul, - &host_stats, TIMEOUT) != RPC_SUCCESS) { - clnt_perror(cl, progname); - exit(1); - } - - xmit_time = host_stats.clock.sec + - (host_stats.clock.usec / 1000000.0); - - printf ("\n\tin %.2f seconds elapsed time\n", xmit_time); - - /* report dropped packets */ - if (host_stats.counter != count) { - int packets_dropped = count - host_stats.counter; - - printf("\t%d packets (%.2f%%) dropped\n", - packets_dropped, - 100.0 * packets_dropped / count ); - } else - printf("\tno packets dropped\n"); - - printf("Sent:"); - print_xferstats(count, length, xmit_time); - - printf("Rcvd:"); - print_xferstats(host_stats.counter, length, xmit_time); - - exit (0); -} - - -void -print_xferstats(int packets, int packetlen, double xfertime) -{ - int datalen; - double pps; /* packets per second */ - double bps; /* bytes per second */ - - datalen = packets * packetlen; - pps = packets / xfertime; - bps = datalen / xfertime; - - printf("\t%.0f packets/sec, ", pps); - - if (bps >= 1024) - printf ("%.1fK ", bps / 1024); - else - printf ("%.0f ", bps); - - printf("bytes/sec\n"); -} - - -void -usage(void) -{ - fprintf(stderr, - "usage: spray [-c count] [-d delay] [-l length] host\n"); - exit(1); -} |