mirror of
https://github.com/freebsd/freebsd-src
synced 2024-11-05 18:22:52 +00:00
03d4d1c778
This is a first step towards a unification/simplification of ping/ping6
(internally). The end goal is to produce a standardized user-facing
output.
Before (ping6):
PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2
16 bytes from ::1, icmp_seq=0 hlim=64 time=0.168 ms
16 bytes from ::1, icmp_seq=1 hlim=64 time=0.068 ms
--- 2001:db8::2 ping6 statistics ---
round-trip min/avg/max/std-dev = 0.068/0.118/0.168/0.050 ms
After (ping6):
PING(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2
16 bytes from ::1, icmp_seq=0 hlim=64 time=0.168 ms
16 bytes from ::1, icmp_seq=1 hlim=64 time=0.068 ms
--- 2001:db8::2 ping statistics ---
round-trip min/avg/max/stddev = 0.068/0.118/0.168/0.050 ms
This has the nice side-effect of adding units to SIGINFO's statistics,
as printing numbers without units may not be of much help. Also
mentions the fact that these times are round-trip.
Before (ping/ping6 SIGINFO):
2/2 packets received (100.0%) 0.068 min / 0.118 avg / 0.168 max
After (ping/ping6 SIGINFO):
--- <ipv4/ipv6 address> ping statistics ---
2 packets transmitted, 2 packets received, 0.0% packet loss
round-trip min/avg/max/stddev = 0.068/0.118/0.168/0.050 ms
In the case of a SIGINFO, the output will be printed to stderr, for both
ping and ping6.
Reviewed by: markj
MFC after: 1 week
Pull Request: https://github.com/freebsd/freebsd-src/pull/863
Differential Revision: https://reviews.freebsd.org/D39126
79 lines
2.8 KiB
C
79 lines
2.8 KiB
C
/*-
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*
|
|
* Copyright (C) 2019 Jan Sucan <jansucan@FreeBSD.org>
|
|
* 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.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
|
|
*/
|
|
|
|
#ifndef MAIN_H
|
|
#define MAIN_H 1
|
|
|
|
#ifdef IPSEC
|
|
#include <netipsec/ipsec.h>
|
|
#endif /*IPSEC*/
|
|
|
|
#if defined(INET) && defined(IPSEC) && defined(IPSEC_POLICY_IPSEC)
|
|
#define PING4ADDOPTS "P:"
|
|
#else
|
|
#define PING4ADDOPTS
|
|
#endif
|
|
#define PING4OPTS ".::4AaC:c:DdfG:g:Hh:I:i:Ll:M:m:nop:QqRrS:s:T:t:vW:z:" PING4ADDOPTS
|
|
|
|
#if defined(INET6) && defined(IPSEC) && defined(IPSEC_POLICY_IPSEC)
|
|
#define PING6ADDOPTS "P:"
|
|
#elif defined(INET6) && defined(IPSEC) && !defined(IPSEC_POLICY_IPSEC)
|
|
#define PING6ADDOPTS "ZE"
|
|
#else
|
|
#define PING6ADDOPTS
|
|
#endif
|
|
#define PING6OPTS ".::6Aab:C:c:Dde:fHI:i:k:l:m:nNoOp:qS:s:t:uvyYW:z:" PING6ADDOPTS
|
|
|
|
/* various options */
|
|
extern u_int options;
|
|
#define F_HOSTNAME 0x0004
|
|
|
|
extern char *hostname;
|
|
|
|
/* counters */
|
|
extern long nreceived; /* # of packets we got back */
|
|
extern long nrepeats; /* number of duplicates */
|
|
extern long ntransmitted; /* sequence # for outbound packets = #sent */
|
|
extern long nrcvtimeout; /* # of packets we got back after waittime */
|
|
|
|
/* nonzero if we've been told to finish up */
|
|
extern volatile sig_atomic_t seenint;
|
|
extern volatile sig_atomic_t seeninfo;
|
|
|
|
/* timing */
|
|
extern int timing; /* flag to do timing */
|
|
extern double tmin; /* minimum round trip time */
|
|
extern double tmax; /* maximum round trip time */
|
|
extern double tsum; /* sum of all times, for doing average */
|
|
extern double tsumsq; /* sum of all times squared, for std. dev. */
|
|
|
|
void onsignal(int);
|
|
void pr_summary(FILE * __restrict);
|
|
void usage(void) __dead2;
|
|
|
|
#endif
|