Return to netstat.h CVS log

Up to [local] / src / usr.bin / netstat

Remove useless -t

"Make if.c kvm free by fetching the interface stats via sysctl ..."
if.c r1.56 in 2008 neutered the -d and -t flags.

-d functionality was eventually restored with if.c r1.76 in 2015.

-t has been printing zeroes for over fourteen now; this cannot have been
useful to anyone and noone complained about a wrong watchdog timer values.

Remove -t entirely without printing a warning;  `netstat -t ...' now fails.

Feedback jsg
OK jsg bluhm

/*	$OpenBSD: netstat.h,v 1.77 2022/09/08 13:18:47 kn Exp $	*/
/*	$NetBSD: netstat.h,v 1.6 1996/05/07 02:55:05 thorpej Exp $	*/

/*
 * Copyright (c) 1992, 1993
 *	Regents of the University of California.  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. Neither the name of the University nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
 *
 *	from: @(#)netstat.h	8.2 (Berkeley) 1/4/94
 */

#include <kvm.h>

/* What is the max length of a pointer printed with %p (including 0x)? */
#define PLEN	(LONG_BIT / 4 + 2)

/* a bit of magic to print addresses as they should */
#define	FAKE_PTR(p)	(PLEN - ((p) ? 0 : 2)), p, ((p) ? "" : "x0")

extern int	Aflag;		/* show addresses of protocol control block */
extern int	aflag;		/* show all sockets (including servers) */
extern int	Bflag;		/* show TCP send and receive buffer sizes */
extern int	bflag;		/* show bytes instead of packets */
extern int	dflag;		/* show i/f dropped packets */
extern int	Fflag;		/* show routes whose gateways are in specified AF */
extern int	gflag;		/* show group (multicast) routing or stats */
extern int	hflag;		/* print human numbers */
extern int	iflag;		/* show interfaces */
extern int	lflag;		/* show only listening sockets (only servers), */
			/* with -g, show routing table with use and ref */
extern int	mflag;		/* show memory stats */
extern int	nflag;		/* show addresses numerically */
extern int	pflag;		/* show given protocol */
extern int	Pflag;		/* show given PCB */
extern int qflag;		/* only display non-zero values for output */
extern int	rflag;		/* show routing tables (or routing stats) */
extern int	Rflag;		/* show rdomain and rtable summary */
extern int	sflag;		/* show protocol statistics */
extern int	vflag;		/* be verbose */
extern int	Wflag;		/* show net80211 protocol statistics */

extern int	interval;	/* repeat interval for i/f stats */

extern char	*interface;	/* desired i/f for stats, or NULL for all i/fs */

extern int	af;		/* address family */

extern	char *__progname; /* program name, from crt0.o */

int	kread(u_long addr, void *buf, int size);
char	*plural(u_int64_t);
char	*plurales(u_int64_t);
char	*pluralys(u_int64_t);

void	protopr(kvm_t *, u_long, u_int, int);

struct kinfo_file;
void	netdomainpr(struct kinfo_file *, int);
void	unixdomainpr(struct kinfo_file *);

void	socket_dump(u_long);
void	unpcb_dump(u_long);

void	tcp_stats(char *);
void	udp_stats(char *);
void	ip_stats(char *);
void	div_stats(char *);
void	icmp_stats(char *);
void	igmp_stats(char *);
void	pim_stats(char *);
void	ah_stats(char *);
void	ipsec_stats(char *);
void	esp_stats(char *);
void	ipip_stats(char *);
void	carp_stats (char *);
void	pfsync_stats (char *);
void	pflow_stats (char *);
void	etherip_stats(char *);
void	ipcomp_stats(char *);

void	net80211_ifstats(char *);

void	mbpr(void);

void	hostpr(u_long, u_long);
void	impstats(u_long, u_long);

void	rt_stats(void);
void	pr_rthdr(int, int);
void	pr_encaphdr(void);
void	pr_family(int);

void	rdomainpr(void);

void	ip6_stats(char *);
void	icmp6_stats(char *);
void	pim6_stats(char *);
void	div6_stats(char *);
void	rip6_stats(char *);
void	mroute6pr(void);
void	mrt6_stats(void);

struct in6_addr;
struct sockaddr_in6;
void	inet6print(struct in6_addr *, int, const char *);
char	*routename6(struct sockaddr_in6 *);
char	*netname6(struct sockaddr_in6 *, struct sockaddr_in6 *);

size_t	get_sysctl(const int *, u_int, char **);
void	p_rttables(int, u_int);
void	p_flags(int, char *);
void	p_addr(struct sockaddr *, struct sockaddr *, int);
void	p_gwaddr(struct sockaddr *, int);
void	p_sockaddr(struct sockaddr *, struct sockaddr *, int, int);
char	*routename(struct sockaddr *);
char	*routename4(in_addr_t);
char	*netname(struct sockaddr *, struct sockaddr *);
char	*netname4(in_addr_t, in_addr_t);
char	*mpls_op(u_int32_t);
void	routepr(u_long, u_long, u_long, u_int);

void	nsprotopr(u_long, char *);

#define	IF_SHOW_FAIL	0
#define	IF_SHOW_ERRS	1
#define	IF_SHOW_DROP	2

void	intpr(int, int);

void	mroutepr(void);
void	mrt_stats(void);