head	1.49;
access;
symbols
	RELENG_8_4:1.49.0.2
	RELENG_9_1_0_RELEASE:1.44.2.5.2.2
	RELENG_9_1:1.44.2.5.0.2
	RELENG_9_1_BP:1.44.2.5
	RELENG_8_3_0_RELEASE:1.42.2.2.2.1
	RELENG_8_3:1.42.2.2.0.2
	RELENG_8_3_BP:1.42.2.2
	RELENG_9_0_0_RELEASE:1.44.2.1.2.1
	RELENG_9_0:1.44.2.1.0.2
	RELENG_9_0_BP:1.44.2.1
	RELENG_9:1.44.0.2
	RELENG_9_BP:1.44
	RELENG_7_4_0_RELEASE:1.39.2.2.6.1
	RELENG_8_2_0_RELEASE:1.42.2.1.6.1
	RELENG_7_4:1.39.2.2.0.6
	RELENG_7_4_BP:1.39.2.2
	RELENG_8_2:1.42.2.1.0.6
	RELENG_8_2_BP:1.42.2.1
	RELENG_8_1_0_RELEASE:1.42.2.1.4.1
	RELENG_8_1:1.42.2.1.0.4
	RELENG_8_1_BP:1.42.2.1
	RELENG_7_3_0_RELEASE:1.39.2.2.4.1
	RELENG_7_3:1.39.2.2.0.4
	RELENG_7_3_BP:1.39.2.2
	RELENG_8_0_0_RELEASE:1.42.2.1.2.1
	RELENG_8_0:1.42.2.1.0.2
	RELENG_8_0_BP:1.42.2.1
	RELENG_8:1.42.0.2
	RELENG_8_BP:1.42
	RELENG_7_2_0_RELEASE:1.39.2.2.2.1
	RELENG_7_2:1.39.2.2.0.2
	RELENG_7_2_BP:1.39.2.2
	RELENG_7_1_0_RELEASE:1.39.2.1.2.1
	RELENG_6_4_0_RELEASE:1.26.2.4.4.1
	RELENG_7_1:1.39.2.1.0.2
	RELENG_7_1_BP:1.39.2.1
	RELENG_6_4:1.26.2.4.0.4
	RELENG_6_4_BP:1.26.2.4
	RELENG_7_0_0_RELEASE:1.39
	RELENG_6_3_0_RELEASE:1.26.2.4
	RELENG_7_0:1.39.0.4
	RELENG_7_0_BP:1.39
	RELENG_6_3:1.26.2.4.0.2
	RELENG_6_3_BP:1.26.2.4
	RELENG_7:1.39.0.2
	RELENG_7_BP:1.39
	RELENG_6_2_0_RELEASE:1.26.2.3
	RELENG_6_2:1.26.2.3.0.4
	RELENG_6_2_BP:1.26.2.3
	RELENG_5_5_0_RELEASE:1.23.2.1
	RELENG_5_5:1.23.2.1.0.4
	RELENG_5_5_BP:1.23.2.1
	RELENG_6_1_0_RELEASE:1.26.2.3
	RELENG_6_1:1.26.2.3.0.2
	RELENG_6_1_BP:1.26.2.3
	RELENG_6_0_0_RELEASE:1.26.2.1
	RELENG_6_0:1.26.2.1.0.2
	RELENG_6_0_BP:1.26.2.1
	RELENG_6:1.26.0.2
	RELENG_6_BP:1.26
	RELENG_5_4_0_RELEASE:1.23.2.1
	RELENG_5_4:1.23.2.1.0.2
	RELENG_5_4_BP:1.23.2.1
	RELENG_4_11_0_RELEASE:1.14.2.3
	RELENG_4_11:1.14.2.3.0.16
	RELENG_4_11_BP:1.14.2.3
	RELENG_5_3_0_RELEASE:1.23
	RELENG_5_3:1.23.0.4
	RELENG_5_3_BP:1.23
	RELENG_5:1.23.0.2
	RELENG_5_BP:1.23
	RELENG_4_10_0_RELEASE:1.14.2.3
	RELENG_4_10:1.14.2.3.0.14
	RELENG_4_10_BP:1.14.2.3
	RELENG_5_2_1_RELEASE:1.20
	RELENG_5_2_0_RELEASE:1.20
	RELENG_5_2:1.20.0.4
	RELENG_5_2_BP:1.20
	RELENG_4_9_0_RELEASE:1.14.2.3
	RELENG_4_9:1.14.2.3.0.12
	RELENG_4_9_BP:1.14.2.3
	RELENG_5_1_0_RELEASE:1.20
	RELENG_5_1:1.20.0.2
	RELENG_5_1_BP:1.20
	RELENG_4_8_0_RELEASE:1.14.2.3
	RELENG_4_8:1.14.2.3.0.10
	RELENG_4_8_BP:1.14.2.3
	RELENG_5_0_0_RELEASE:1.19
	RELENG_5_0:1.19.0.2
	RELENG_5_0_BP:1.19
	RELENG_4_7_0_RELEASE:1.14.2.3
	RELENG_4_7:1.14.2.3.0.8
	RELENG_4_7_BP:1.14.2.3
	RELENG_4_6_2_RELEASE:1.14.2.3
	RELENG_4_6_1_RELEASE:1.14.2.3
	RELENG_4_6_0_RELEASE:1.14.2.3
	RELENG_4_6:1.14.2.3.0.6
	RELENG_4_6_BP:1.14.2.3
	RELENG_4_5_0_RELEASE:1.14.2.3
	RELENG_4_5:1.14.2.3.0.4
	RELENG_4_5_BP:1.14.2.3
	RELENG_4_4_0_RELEASE:1.14.2.3
	RELENG_4_4:1.14.2.3.0.2
	RELENG_4_4_BP:1.14.2.3
	RELENG_4_3_0_RELEASE:1.14.2.2
	RELENG_4_3:1.14.2.2.0.2
	RELENG_4_3_BP:1.14.2.2
	RELENG_4_2_0_RELEASE:1.14.2.1
	RELENG_4_1_1_RELEASE:1.14.2.1
	PRE_SMPNG:1.15
	RELENG_4_1_0_RELEASE:1.14.2.1
	RELENG_3_5_0_RELEASE:1.8
	RELENG_4_0_0_RELEASE:1.14
	RELENG_4:1.14.0.2
	RELENG_4_BP:1.14
	RELENG_3_4_0_RELEASE:1.8
	RELENG_3_3_0_RELEASE:1.8
	RELENG_3_2_PAO:1.8.0.4
	RELENG_3_2_PAO_BP:1.8
	RELENG_3_2_0_RELEASE:1.8
	RELENG_3_1_0_RELEASE:1.8
	RELENG_3:1.8.0.2
	RELENG_3_BP:1.8
	RELENG_2_2_8_RELEASE:1.7.2.2
	RELENG_3_0_0_RELEASE:1.8
	RELENG_2_2_7_RELEASE:1.7.2.2
	RELENG_2_2_6_RELEASE:1.7.2.2
	RELENG_2_2_5_RELEASE:1.7
	RELENG_2_2_2_RELEASE:1.7
	RELENG_2_2_1_RELEASE:1.7
	RELENG_2_2_0_RELEASE:1.7
	RELENG_2_1_7_RELEASE:1.1.1.1
	RELENG_2_1_6_1_RELEASE:1.1.1.1
	RELENG_2_1_6_RELEASE:1.1.1.1
	RELENG_2_2:1.7.0.2
	RELENG_2_2_BP:1.7
	RELENG_2_1_5_RELEASE:1.1.1.1
	bsd_44_lite_2:1.1.1.1
	RELENG_2_1_0_RELEASE:1.1.1.1
	RELENG_2_1_0:1.1.1.1.0.6
	RELENG_2_1_0_BP:1.1.1.1
	RELENG_2_0_5_RELEASE:1.1.1.1
	RELENG_2_0_5:1.1.1.1.0.4
	RELENG_2_0_5_BP:1.1.1.1
	RELENG_2_0_5_ALPHA:1.1.1.1
	RELEASE_2_0:1.1.1.1
	BETA_2_0:1.1.1.1
	ALPHA_2_0:1.1.1.1.0.2
	bsd_44_lite:1.1.1.1
	CSRG:1.1.1;
locks; strict;
comment	@# @;


1.49
date	2012.11.17.01.54.27;	author svnexp;	state Exp;
branches
	1.49.2.1;
next	1.48;

1.48
date	2012.07.16.06.43.04;	author tuexen;	state Exp;
branches;
next	1.47;

1.47
date	2012.03.09.20.50.15;	author dim;	state Exp;
branches;
next	1.46;

1.46
date	2012.02.28.18.30.18;	author dim;	state Exp;
branches;
next	1.45;

1.45
date	2011.12.17.22.32.00;	author dim;	state Exp;
branches;
next	1.44;

1.44
date	2011.03.21.09.58.24;	author jeff;	state Exp;
branches
	1.44.2.1;
next	1.43;

1.43
date	2010.02.22.15.57.36;	author rwatson;	state Exp;
branches;
next	1.42;

1.42
date	2009.02.15.16.16.38;	author bms;	state Exp;
branches
	1.42.2.1;
next	1.41;

1.41
date	2008.09.21.22.02.26;	author sam;	state Exp;
branches;
next	1.40;

1.40
date	2007.11.20.02.07.29;	author jb;	state Exp;
branches;
next	1.39;

1.39
date	2007.07.01.12.08.07;	author gnn;	state Exp;
branches
	1.39.2.1;
next	1.38;

1.38
date	2007.06.10.06.18.04;	author ceri;	state Exp;
branches;
next	1.37;

1.37
date	2007.06.10.06.11.03;	author ceri;	state Exp;
branches;
next	1.36;

1.36
date	2007.06.09.13.44.09;	author rrs;	state Exp;
branches;
next	1.35;

1.35
date	2006.07.28.16.16.40;	author yar;	state Exp;
branches;
next	1.34;

1.34
date	2006.07.28.16.09.18;	author yar;	state Exp;
branches;
next	1.33;

1.33
date	2006.07.28.11.09.21;	author yar;	state Exp;
branches;
next	1.32;

1.32
date	2006.03.17.18.54.39;	author ru;	state Exp;
branches;
next	1.31;

1.31
date	2005.12.28.20.36.55;	author kbyanc;	state Exp;
branches;
next	1.30;

1.30
date	2005.09.07.17.35.16;	author csjp;	state Exp;
branches;
next	1.29;

1.29
date	2005.08.05.20.13.09;	author phk;	state Exp;
branches;
next	1.28;

1.28
date	2005.08.05.18.45.49;	author phk;	state Exp;
branches;
next	1.27;

1.27
date	2005.07.18.08.34.15;	author rwatson;	state Exp;
branches;
next	1.26;

1.26
date	2005.01.23.12.29.46;	author delphij;	state Exp;
branches
	1.26.2.1;
next	1.25;

1.25
date	2005.01.22.19.35.48;	author delphij;	state Exp;
branches;
next	1.24;

1.24
date	2004.10.24.15.33.00;	author ru;	state Exp;
branches;
next	1.23;

1.23
date	2004.03.25.09.07.26;	author bms;	state Exp;
branches
	1.23.2.1;
next	1.22;

1.22
date	2004.03.25.08.43.59;	author bms;	state Exp;
branches;
next	1.21;

1.21
date	2003.12.29.04.41.38;	author bde;	state Exp;
branches;
next	1.20;

1.20
date	2003.03.05.19.20.28;	author peter;	state Exp;
branches;
next	1.19;

1.19
date	2002.04.28.12.14.10;	author markm;	state Exp;
branches;
next	1.18;

1.18
date	2001.12.10.21.13.05;	author dwmalone;	state Exp;
branches;
next	1.17;

1.17
date	2001.06.15.00.25.43;	author assar;	state Exp;
branches;
next	1.16;

1.16
date	2001.03.14.20.51.25;	author brian;	state Exp;
branches;
next	1.15;

1.15
date	2000.07.04.16.26.46;	author itojun;	state Exp;
branches;
next	1.14;

1.14
date	2000.01.28.05.10.54;	author shin;	state Exp;
branches
	1.14.2.1;
next	1.13;

1.13
date	2000.01.06.12.40.22;	author shin;	state Exp;
branches;
next	1.12;

1.12
date	99.12.28.02.37.01;	author shin;	state Exp;
branches;
next	1.11;

1.11
date	99.12.15.05.13.22;	author shin;	state Exp;
branches;
next	1.10;

1.10
date	99.12.07.17.38.55;	author shin;	state Exp;
branches;
next	1.9;

1.9
date	99.10.21.09.06.02;	author julian;	state Exp;
branches;
next	1.8;

1.8
date	97.07.13.11.51.36;	author guido;	state Exp;
branches;
next	1.7;

1.7
date	96.09.05.17.14.56;	author bde;	state Exp;
branches
	1.7.2.1;
next	1.6;

1.6
date	96.06.08.00.20.38;	author julian;	state Exp;
branches;
next	1.5;

1.5
date	96.02.13.17.30.30;	author wollman;	state Exp;
branches;
next	1.4;

1.4
date	96.02.06.20.35.57;	author wollman;	state Exp;
branches;
next	1.3;

1.3
date	95.10.27.10.48.24;	author julian;	state Exp;
branches;
next	1.2;

1.2
date	95.10.26.20.31.49;	author julian;	state Exp;
branches;
next	1.1;

1.1
date	94.05.27.12.32.23;	author rgrimes;	state Exp;
branches
	1.1.1.1;
next	;

1.49.2.1
date	2012.11.17.01.54.27;	author svnexp;	state dead;
branches;
next	1.49.2.2;

1.49.2.2
date	2013.03.28.13.06.07;	author svnexp;	state Exp;
branches;
next	;

1.44.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.44.2.1.2.1;
next	1.44.2.2;

1.44.2.2
date	2012.01.01.20.57.38;	author dim;	state Exp;
branches;
next	1.44.2.3;

1.44.2.3
date	2012.03.13.18.39.57;	author dim;	state Exp;
branches;
next	1.44.2.4;

1.44.2.4
date	2012.03.23.10.58.35;	author dim;	state Exp;
branches;
next	1.44.2.5;

1.44.2.5
date	2012.07.19.09.32.59;	author tuexen;	state Exp;
branches
	1.44.2.5.2.1;
next	1.44.2.6;

1.44.2.6
date	2012.11.17.11.37.40;	author svnexp;	state Exp;
branches;
next	;

1.44.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.44.2.1.2.2;

1.44.2.1.2.2
date	2012.11.17.08.37.36;	author svnexp;	state Exp;
branches;
next	;

1.44.2.5.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.44.2.5.2.2;

1.44.2.5.2.2
date	2012.11.17.08.48.28;	author svnexp;	state Exp;
branches;
next	;

1.42.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.42.2.1.2.1
	1.42.2.1.4.1
	1.42.2.1.6.1;
next	1.42.2.2;

1.42.2.2
date	2011.01.15.18.51.45;	author rwatson;	state Exp;
branches
	1.42.2.2.2.1;
next	1.42.2.3;

1.42.2.3
date	2012.11.17.10.37.18;	author svnexp;	state Exp;
branches;
next	1.42.2.4;

1.42.2.4
date	2013.03.08.00.27.44;	author svnexp;	state Exp;
branches;
next	;

1.42.2.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.42.2.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.42.2.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.42.2.2.2.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.42.2.2.2.2;

1.42.2.2.2.2
date	2012.11.17.08.25.51;	author svnexp;	state Exp;
branches;
next	;

1.39.2.1
date	2008.09.01.15.05.19;	author obrien;	state Exp;
branches
	1.39.2.1.2.1;
next	1.39.2.2;

1.39.2.2
date	2009.01.14.18.23.13;	author sam;	state Exp;
branches
	1.39.2.2.2.1
	1.39.2.2.4.1
	1.39.2.2.6.1;
next	1.39.2.3;

1.39.2.3
date	2012.11.17.08.08.36;	author svnexp;	state Exp;
branches;
next	;

1.39.2.1.2.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.39.2.2.2.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.39.2.2.4.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.39.2.2.6.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.39.2.2.6.2;

1.39.2.2.6.2
date	2012.11.17.08.17.43;	author svnexp;	state Exp;
branches;
next	;

1.26.2.1
date	2005.07.28.19.54.55;	author rwatson;	state Exp;
branches;
next	1.26.2.2;

1.26.2.2
date	2005.12.27.23.34.13;	author csjp;	state Exp;
branches;
next	1.26.2.3;

1.26.2.3
date	2006.01.05.03.47.24;	author kbyanc;	state Exp;
branches;
next	1.26.2.4;

1.26.2.4
date	2007.10.03.19.56.17;	author obrien;	state Exp;
branches
	1.26.2.4.4.1;
next	1.26.2.5;

1.26.2.5
date	2012.11.17.07.45.50;	author svnexp;	state Exp;
branches;
next	;

1.26.2.4.4.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.23.2.1
date	2005.02.13.07.23.39;	author obrien;	state Exp;
branches;
next	;

1.14.2.1
date	2000.07.15.07.29.29;	author kris;	state Exp;
branches;
next	1.14.2.2;

1.14.2.2
date	2001.03.22.13.48.42;	author des;	state Exp;
branches;
next	1.14.2.3;

1.14.2.3
date	2001.08.10.09.07.08;	author ru;	state Exp;
branches;
next	1.14.2.4;

1.14.2.4
date	2012.11.17.07.27.43;	author svnexp;	state Exp;
branches;
next	;

1.7.2.1
date	98.01.25.18.23.26;	author adam;	state Exp;
branches;
next	1.7.2.2;

1.7.2.2
date	98.03.08.11.55.50;	author jkh;	state Exp;
branches;
next	;

1.1.1.1
date	94.05.27.12.32.24;	author rgrimes;	state Exp;
branches;
next	;


desc
@@


1.49
log
@Switching exporter and resync
@
text
@#	@@(#)Makefile	8.1 (Berkeley) 6/12/93
# $FreeBSD: head/usr.bin/netstat/Makefile 238514 2012-07-16 06:43:04Z tuexen $

.include <bsd.own.mk>

PROG=	netstat
SRCS=	if.c inet.c main.c mbuf.c mroute.c netisr.c route.c \
	unix.c atalk.c mroute6.c ipsec.c bpf.c pfkey.c sctp.c

WARNS?=	3
CFLAGS+=-fno-strict-aliasing

CFLAGS+=-DIPSEC
CFLAGS+=-DSCTP

.if ${MK_INET_SUPPORT} != "no"
CFLAGS+=-DINET
.endif

.if ${MK_INET6_SUPPORT} != "no"
SRCS+=	inet6.c
CFLAGS+=-DINET6
.endif

.if ${MK_OFED} != "no"
CFLAGS+=-DSDP
.endif

BINGRP=	kmem
BINMODE=2555
DPADD=	${LIBKVM} ${LIBMEMSTAT} ${LIBUTIL}
LDADD=	-lkvm -lmemstat -lutil

.if ${MK_NETGRAPH_SUPPORT} != "no"
SRCS+=	netgraph.c
DPADD+=	${LIBNETGRAPH}
LDADD+=	-lnetgraph
CFLAGS+=-DNETGRAPH
.endif

.if ${MK_IPX_SUPPORT} != "no"
SRCS+=	ipx.c
DPADD+=	${LIBIPX}
LDADD+=	-lipx
CFLAGS+=-DIPX
.endif

.include <bsd.prog.mk>
@


1.49.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:06:07 +0000
@
text
@d1 48
@


1.49.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 44
#	@@(#)Makefile	8.1 (Berkeley) 6/12/93
# $FreeBSD: releng/8.4/usr.bin/netstat/Makefile 247977 2013-03-07 23:48:29Z tuexen $

.include <bsd.own.mk>

PROG=	netstat
SRCS=	if.c inet.c main.c mbuf.c mroute.c netisr.c route.c \
	unix.c atalk.c mroute6.c ipsec.c bpf.c pfkey.c sctp.c

WARNS?=	3
CFLAGS+=-fno-strict-aliasing

CFLAGS+=-DIPSEC
CFLAGS+=-DSCTP

.if ${MK_INET_SUPPORT} != "no"
CFLAGS+=-DINET
.endif

.if ${MK_INET6_SUPPORT} != "no"
SRCS+=	inet6.c
CFLAGS+=-DINET6
.endif

BINGRP=	kmem
BINMODE=2555
DPADD=	${LIBKVM} ${LIBMEMSTAT} ${LIBUTIL}
LDADD=	-lkvm -lmemstat -lutil

.if ${MK_NETGRAPH_SUPPORT} != "no"
SRCS+=	netgraph.c
DPADD+=	${LIBNETGRAPH}
LDADD+=	-lnetgraph
CFLAGS+=-DNETGRAPH
.endif

.if ${MK_IPX_SUPPORT} != "no"
SRCS+=	ipx.c
DPADD+=	${LIBIPX}
LDADD+=	-lipx
CFLAGS+=-DIPX
.endif

.include <bsd.prog.mk>
@


1.48
log
@SVN rev 238514 on 2012-07-16 06:43:04Z by tuexen

Allow netstat to be build if INET is not defined in the kernel.
Thanks to Garrett Cooper for reporting the issue.

MFC after: 3 days
X-MFC: 238501
@
text
@d2 1
a2 1
# $FreeBSD$
@


1.47
log
@SVN rev 232748 on 2012-03-09 20:50:15Z by dim

After r232745, which makes sure __bswap16(), ntohs() and htons() return
__uint16_t, we can partially undo r228668.

Note the remark "Work around a clang false positive with format string
warnings and ntohs macros (see LLVM PR 11313)" was actually incorrect.

Before r232745, on some arches, the ntohs() macros did in fact return
int, not uint16_t, so clang was right in warning about the %hu format
string.

MFC after:	2 weeks
@
text
@d16 4
@


1.46
log
@SVN rev 232263 on 2012-02-28 18:30:18Z by dim

Define several extra macros in bsd.sys.mk and sys/conf/kern.pre.mk, to
get rid of testing explicitly for clang (using ${CC:T:Mclang}) in
individual Makefiles.

Instead, use the following extra macros, for use with clang:
- NO_WERROR.clang       (disables -Werror)
- NO_WCAST_ALIGN.clang  (disables -Wcast-align)
- NO_WFORMAT.clang	(disables -Wformat and friends)
- CLANG_NO_IAS		(disables integrated assembler)
- CLANG_OPT_SMALL	(adds flags for extra small size optimizations)

As a side effect, this enables setting CC/CXX/CPP in src.conf instead of
make.conf!  For clang, use the following:

CC=clang
CXX=clang++
CPP=clang-cpp

MFC after:	2 weeks
@
text
@a10 3
# XXX: Work around a clang false positive with format string warnings
# and ntohs macros (see LLVM PR 11313).
NO_WFORMAT.clang=
@


1.45
log
@SVN rev 228668 on 2011-12-17 22:32:00Z by dim

Revert r228650, and work around the clang false positive with printf
formats in usr.bin/netstat/atalk.c by conditionally adding NO_WFORMAT to
the Makefile instead.

MFC after:	1 week
@
text
@a10 1
.if ${CC:T:Mclang} == "clang"
d13 1
a13 2
NO_WFORMAT=
.endif
@


1.44
log
@SVN rev 219820 on 2011-03-21 09:58:24Z by jeff

 - Merge in OFED 1.5.3 from projects/ofed/head
@
text
@d11 5
@


1.44.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.44.2.2
log
@SVN rev 229205 on 2012-01-01 20:57:38Z by dim

MFC r228650:

  In usr.bin/netstat/atalk.c, work around a clang false positive with
  printf format warnings and conditional operators.

MFC r228668:

  Revert r228650, and work around the clang false positive with printf
  formats in usr.bin/netstat/atalk.c by conditionally adding NO_WFORMAT to
  the Makefile instead.
@
text
@a10 5
.if ${CC:T:Mclang} == "clang"
# XXX: Work around a clang false positive with format string warnings
# and ntohs macros (see LLVM PR 11313).
NO_WFORMAT=
.endif
@


1.44.2.3
log
@SVN rev 232930 on 2012-03-13 18:39:57Z by dim

MFC r232263:

Define several extra macros in bsd.sys.mk and sys/conf/kern.pre.mk, to
get rid of testing explicitly for clang (using ${CC:T:Mclang}) in
individual Makefiles.

Instead, use the following extra macros, for use with clang:
- NO_WERROR.clang       (disables -Werror)
- NO_WCAST_ALIGN.clang  (disables -Wcast-align)
- NO_WFORMAT.clang	(disables -Wformat and friends)
- CLANG_NO_IAS		(disables integrated assembler)
- CLANG_OPT_SMALL	(adds flags for extra small size optimizations)

As a side effect, this enables setting CC/CXX/CPP in src.conf instead of
make.conf!  For clang, use the following:

CC=clang
CXX=clang++
CPP=clang-cpp
@
text
@d11 1
d14 2
a15 1
NO_WFORMAT.clang=
@


1.44.2.4
log
@SVN rev 233350 on 2012-03-23 10:58:35Z by dim

MFC r232748:

After r232745, which makes sure __bswap16(), ntohs() and htons() return
__uint16_t, we can partially undo r228668.

Note the remark "Work around a clang false positive with format string
warnings and ntohs macros (see LLVM PR 11313)" was actually incorrect.

Before r232745, on some arches, the ntohs() macros did in fact return
int, not uint16_t, so clang was right in warning about the %hu format
string.
@
text
@d11 3
@


1.44.2.5
log
@SVN rev 238613 on 2012-07-19 09:32:59Z by tuexen

MFC r238501, r 238514:
Changes which improve compilation if neither INET nor INET6 is defined.

Allow netstat to be build if INET is not defined in the kernel.
Thanks to Garrett Cooper for reporting the issue.

This also fixes a bug where netstat doesn't work correctly for SCTP
on INET only (no INET6) kernels.

Approved by: re@@
@
text
@a15 4
.if ${MK_INET_SUPPORT} != "no"
CFLAGS+=-DINET
.endif

@


1.44.2.6
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d2 1
a2 1
# $FreeBSD: stable/9/usr.bin/netstat/Makefile 238613 2012-07-19 09:32:59Z tuexen $
@


1.44.2.5.2.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.44.2.5.2.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/9.1/usr.bin/netstat/Makefile 238613 2012-07-19 09:32:59Z tuexen $
@


1.44.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.44.2.1.2.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/9.0/usr.bin/netstat/Makefile 219820 2011-03-21 09:58:24Z jeff $
@


1.43
log
@SVN rev 204202 on 2010-02-22 15:57:36Z by rwatson

Teach netstat(1) to print out netisr statistics when given the -Q argument.
Currently supports only reporting on live systems via sysctl, kmem support
needs to be edded.

MFC after:	1 week
Sponsored by:	Juniper Networks
@
text
@d21 4
@


1.42
log
@SVN rev 188649 on 2009-02-15 16:16:38Z by bms

Now that ifmcstat(8) does not suck, retire host-mode netstat -g.
This change will not be back-ported.
@
text
@d7 1
a7 1
SRCS=	if.c inet.c main.c mbuf.c mroute.c route.c \
@


1.42.2.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.42.2.2
log
@SVN rev 217446 on 2011-01-15 18:51:45Z by rwatson

Merge r204202 from head to stable/8:

  Teach netstat(1) to print out netisr statistics when given the -Q argument.
  Currently supports only reporting on live systems via sysctl, kmem support
  needs to be edded.

  Sponsored by:   Juniper Networks
@
text
@d7 1
a7 1
SRCS=	if.c inet.c main.c mbuf.c mroute.c netisr.c route.c \
@


1.42.2.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d2 1
a2 1
# $FreeBSD: stable/8/usr.bin/netstat/Makefile 232552 2012-03-05 17:33:01Z bz $
@


1.42.2.4
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/247977
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d2 1
a2 1
# $FreeBSD: stable/8/usr.bin/netstat/Makefile 247977 2013-03-07 23:48:29Z tuexen $
a15 4
.if ${MK_INET_SUPPORT} != "no"
CFLAGS+=-DINET
.endif

@


1.42.2.2.2.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.42.2.2.2.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/8.3/usr.bin/netstat/Makefile 231501 2012-02-11 01:15:02Z tuexen $
@


1.42.2.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.42.2.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.42.2.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.41
log
@SVN rev 183242 on 2008-09-21 22:02:26Z by sam

add new build knobs and jigger some existing controls to improve
control over the result of buildworld and installworld; this especially
helps packaging systems such as nanobsd

Reviewed by:	various (posted to arch)
MFC after:	1 month
@
text
@d7 1
a7 1
SRCS=	if.c inet.c main.c mbuf.c mcast.c mroute.c route.c \
@


1.40
log
@These are the things that the tinderbox has problems with because it
doesn't use the default CFLAGS which contain -fno-strict-aliasing.

Until the code is cleaned up, just add -fno-strict-aliasing to the
CFLAGS of these for the tinderboxes' sake, allowing the rest of the
tree to have -Werror enabled again.
@
text
@d8 1
a8 1
	unix.c atalk.c netgraph.c mroute6.c ipsec.c bpf.c pfkey.c sctp.c
d23 9
a31 2
DPADD=	${LIBKVM} ${LIBMEMSTAT} ${LIBNETGRAPH} ${LIBUTIL}
LDADD=	-lkvm -lmemstat -lnetgraph -lutil
@


1.39
log
@Commit IPv6 support for FAST_IPSEC to the tree.
This commit includes all remaining changes for the time being including
user space updates.

Submitted by:    bz
Approved by:    re
@
text
@d11 1
@


1.39.2.1
log
@SVN rev 182603 on 2008-09-01 15:05:19Z by obrien

MFC: r182602: Minimize changes CURRENT<->releng7.
@
text
@a10 1
CFLAGS+=-fno-strict-aliasing
@


1.39.2.2
log
@SVN rev 187229 on 2009-01-14 18:23:13Z by sam

bring in bits missed in r187106: sync build infrastructure changes with HEAD

Noticed by:	attilio
@
text
@d8 1
a8 1
	unix.c atalk.c mroute6.c ipsec.c bpf.c pfkey.c sctp.c
d23 2
a24 9
DPADD=	${LIBKVM} ${LIBMEMSTAT} ${LIBUTIL}
LDADD=	-lkvm -lmemstat -lutil

.if ${MK_NETGRAPH_SUPPORT} != "no"
SRCS+=	netgraph.c
DPADD+=	${LIBNETGRAPH}
LDADD+=	-lnetgraph
CFLAGS+=-DNETGRAPH
.endif
@


1.39.2.3
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: stable/7/usr.bin/netstat/Makefile 187229 2009-01-14 18:23:13Z sam $
@


1.39.2.2.6.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.39.2.2.6.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/7.4/usr.bin/netstat/Makefile 187229 2009-01-14 18:23:13Z sam $
@


1.39.2.2.4.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.39.2.2.2.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.39.2.1.2.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.38
log
@Backout mess mistakenly committed with manpage update.
@
text
@a12 1
CFLAGS+=-DFAST_IPSEC
@


1.37
log
@Document SCTP support.
@
text
@d16 4
d26 6
@


1.36
log
@Adds support for SCTP.
@
text
@a15 4
.if ${MK_INET6_SUPPORT} != "no"
SRCS+=	inet6.c
CFLAGS+=-DINET6
.endif
a21 6
.if ${MK_IPX_SUPPORT} != "no"
SRCS+=	ipx.c
DPADD+=	${LIBIPX}
LDADD+=	-lipx
CFLAGS+=-DIPX
.endif
@


1.35
log
@- Achieve WARNS=3 by using sparse initializers or avoiding initializers at all.
- Fix a nlist initialization: it should be terminated by a NULL entry.
- Constify.
- Catch an unused parameter.

Tested on:	i386 amd64 ia64
@
text
@d8 1
a8 1
	unix.c atalk.c netgraph.c mroute6.c ipsec.c bpf.c pfkey.c
d14 1
@


1.34
log
@Achieve WARNS=2 by using uintmax_t to pass around 64-bit quantities,
including to printf().  Using uintmax_t is also robust to further
extensions in both the C language and the bitwidth of kernel counters.

Tested on:	i386 amd64 ia64
@
text
@d10 1
a10 1
WARNS?=	2
@


1.33
log
@Avoid useless work: Do not build inet6.c if INET6 support is off.
This also avoids pretending that netstat includes inet6.c in the
output from ident(1).
@
text
@a10 1
NO_WERROR=
@


1.32
log
@Reimplementation of world/kernel build options.  For details, see:

http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html

The src.conf(5) manpage is to follow in a few days.

Brought to you by:	imp, jhb, kris, phk, ru (all bugs are mine)
@
text
@d7 1
a7 1
SRCS=	if.c inet.c inet6.c main.c mbuf.c mcast.c mroute.c route.c \
d15 1
d17 1
@


1.31
log
@Add support for printing IPSEC protocol stats if the kernel was compiled
with FAST_IPSEC rather than the KAME IPSEC stack.

Note that the output of "netstat -s -p ipsec" differs depending on which
stack is compiled into the kernel since they each keep different stats.
This delta also adds the "esp", "ah", and "ipcomp" protocol stats, which
are also available when the kernel is compiled with the FAST_IPSEC stack
(e.g. "netstat -s -p esp").

Submitted by:	Matt Titus <titus at nttmcl dot com>
MFC after:	3 days
@
text
@d4 2
d15 1
a15 1
.if !defined(NO_INET6)
d24 1
a24 1
.if !defined(NO_IPX)
@


1.30
log
@Merge bpfstat's functionality into the netstat(1) utility. This adds
a -B option which causes bpf peers to be printed. This option can be
used in conjunction with -I if information about specific interfaces
is desired. This is similar to what NetBSD added to their version of
netstat.

$ netstat -B
  Pid  Netif  Flags      Recv      Drop     Match Sblen Hblen Command
 1137    lo0 p--s--         0         0         0     0     0 tcpdump
  205   sis0 -ifs-l     37331         0         1     0     0 dhclient
$

$ netstat -I lo0 -B
  Pid  Netif  Flags      Recv      Drop     Match Sblen Hblen Command
 1174    lo0 p--s--         0         0         0     0     0 tcpdump
$

-Add bpf.c which stores all the code for retrieving and parsing bpf
 related statistics.
-Modify main.c to add support for the -B option and hook it into the
 program logic.
-Add bpf.c to the build.
-Document this new functionality in the man page and bump the revision
 date.
-Add prototype for bpf_stats function.
@
text
@d6 1
a6 1
	unix.c atalk.c netgraph.c mroute6.c ipsec.c bpf.c
d12 1
@


1.29
log
@Don't include -lipx twice.
@
text
@d6 1
a6 1
	unix.c atalk.c netgraph.c mroute6.c ipsec.c
@


1.28
log
@Make IPX support depend on NO_IPX
@
text
@d18 2
a19 2
DPADD=	${LIBKVM} ${LIBIPX} ${LIBMEMSTAT} ${LIBNETGRAPH} ${LIBUTIL}
LDADD=	-lkvm -lipx -lmemstat -lnetgraph -lutil
@


1.27
log
@Modify "netstat -mb" to use libmemstat(3) when acting on a live system,
with a number of positive benefits:

- Start using UMA(9) statistics for mbufs and clusters, which avoids
  using the mbuf allocator statistics which suffer from races under
  load on SMP.  This should eliminate "negative" mbuf counts in
  netstat -mb.

- We are now able to track cached (free) mbufs and clusters and count
  it towards memory allocated by the network stack.

- We are now also able to track memory allocated to mbuf tags since
  libmemstat(3) can also query malloc(9).  We don't print this except
  as part of the total (for now - #if 0).

- We are now able to track mbuf/cluster/packet allocation failures,
  although they are not currently printed (#if 0).

- Don't print out sfbuf statistics when running on a kernel core, as
  currently that code is able only to query sysctl for statistics.

MFC after:	1 week
@
text
@d5 1
a5 1
SRCS=	if.c inet.c inet6.c main.c mbuf.c mcast.c mroute.c ipx.c route.c \
d21 7
@


1.26
log
@According to style.Makefile(5):
	WARNS?= should appear before CFLAGS

Reviewed by:	ru
@
text
@d18 2
a19 2
DPADD=	${LIBKVM} ${LIBIPX} ${LIBNETGRAPH} ${LIBUTIL}
LDADD=	-lkvm -lipx -lnetgraph -lutil
@


1.26.2.1
log
@Merge mbuf.c:1.43,1.44 and Makefile:1.27 from HEAD to RELENG_6:

  Modify "netstat -mb" to use libmemstat(3) when acting on a live system,
  with a number of positive benefits:

  - Start using UMA(9) statistics for mbufs and clusters, which avoids
    using the mbuf allocator statistics which suffer from races under
    load on SMP.  This should eliminate "negative" mbuf counts in
    netstat -mb.

  - We are now able to track cached (free) mbufs and clusters and count
    it towards memory allocated by the network stack.

  - We are now also able to track memory allocated to mbuf tags since
    libmemstat(3) can also query malloc(9).  We don't print this except
    as part of the total (for now - #if 0).

  - We are now able to track mbuf/cluster/packet allocation failures,
    although they are not currently printed (#if 0).

  - Don't print out sfbuf statistics when running on a kernel core, as
    currently that code is able only to query sysctl for statistics.

mbuf.c:1.44:

  Since libmemstat(3) now supports its own error management mechanism,
  use that instead of trying to use errno, in order to produce a
  sensible error message.

Approved by:	re (kensmith)
@
text
@d18 2
a19 2
DPADD=	${LIBKVM} ${LIBIPX} ${LIBMEMSTAT} ${LIBNETGRAPH} ${LIBUTIL}
LDADD=	-lkvm -lipx -lmemstat -lnetgraph -lutil
@


1.26.2.2
log
@MFC bpf stats functionality into netstat
@
text
@d5 1
a5 1
SRCS=	bpf.c if.c inet.c inet6.c main.c mbuf.c mcast.c mroute.c ipx.c route.c \
@


1.26.2.3
log
@MFC:
    kbyanc      2005-12-28 20:36:55 UTC

      FreeBSD src repository

      Modified files:
        usr.bin/netstat      Makefile ipsec.c main.c netstat.h
      Added files:
        usr.bin/netstat      pfkey.c
      Log:
      Add support for printing IPSEC protocol stats if the kernel was
      compiled with FAST_IPSEC rather than the KAME IPSEC stack.

    Note that the output of "netstat -s -p ipsec" differs depending on
    which stack is compiled into the kernel since they each keep different
    stats.  This delta also adds the "esp", "ah", and "ipcomp" protocol
    stats, which are also available when the kernel is compiled with the
    FAST_IPSEC stack (e.g. "netstat -s -p esp").

      Submitted by:   Matt Titus <titus at nttmcl dot com>

      Revision  Changes    Path
      1.31      +2 -1      src/usr.bin/netstat/Makefile
      1.13      +266 -94   src/usr.bin/netstat/ipsec.c
      1.81      +29 -0     src/usr.bin/netstat/main.c
      1.47      +6 -0      src/usr.bin/netstat/netstat.h
      1.1       +184 -0    src/usr.bin/netstat/pfkey.c (new)
@
text
@d6 1
a6 1
	unix.c atalk.c netgraph.c mroute6.c ipsec.c pfkey.c
a13 1
CFLAGS+=-DFAST_IPSEC
@


1.26.2.4
log
@MFC: 2006/07/28 commit achieving WARNS=3
     Also fix nlist 'nl' should be terminated by a NULL entry.
@
text
@d8 2
a9 1
WARNS?=	3
@


1.26.2.5
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: stable/6/usr.bin/netstat/Makefile 172426 2007-10-03 19:56:17Z obrien $
@


1.26.2.4.4.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.25
log
@Make sure that we don't define INET6 when NO_INET6 is defined.
Without this change, when running netstat with a kernel without
INET6 built in, you will get a complain at the end of "netstat -s"
output.

X-MFC:		NO_INET6 was called "NOINET6" on RELENG_5
@
text
@d7 4
a14 2
WARNS?=	2
NO_WERROR=
@


1.24
log
@For variables that are only checked with defined(), don't provide
any fake value.
@
text
@d8 1
d10 1
@


1.23
log
@Sort SRCS in Makefile and document -g option additions.

Nudged by:	ru
@
text
@d10 1
a10 1
NO_WERROR?=
@


1.23.2.1
log
@MFC: For variables that are only checked with defined(), don't provide
     any fake value.
@
text
@d10 1
a10 1
NO_WERROR=
@


1.22
log
@Teach netstat(1) how to print the multicast group memberships present
within the running system.

Sponsored by:	Ralf the Wonder Llama
@
text
@d5 1
a5 1
SRCS=	if.c inet.c inet6.c main.c mbuf.c mroute.c mcast.c ipx.c route.c \
@


1.21
log
@Fixed missing declaration of pluralies().  This showed up as strange
printf format warnings for inet6.c (pluralies() was implicit int, but
the context requires a "char *").

Added WARNS?=2 to the Makefile so that such errors don't come back.
Added NO_WERROR?= to the Makefile because I haven't checked that setting
WARNS doesn't uncover more bugs except on i386's.
@
text
@d5 1
a5 1
SRCS=	if.c inet.c inet6.c main.c mbuf.c mroute.c ipx.c route.c \
@


1.20
log
@Kill #ifdef NS and some leftover #ifdef ISO code.  Re-pack the nlist[]
array, it isn't likely to find any ARPAnet IMP drivers in FreeBSD.
@
text
@d9 2
@


1.19
log
@Remove GCC-specific flags and commented out cruft.
@
text
@d6 1
a6 1
	unix.c atalk.c netgraph.c mroute6.c ipsec.c # iso.c ns.c tp_astring.c 
@


1.18
log
@Style improvements recommended by Bruce as a follow up to some
of the recent WARNS commits. The idea is:

1) FreeBSD id tags should follow vendor tags.
2) Vendor tags should not be compiled (though copyrights probably should).
3) There should be no blank line between including cdefs and __FBSDIF.
@
text
@a6 1
CFLAGS+=-Wall
a9 2
#CFLAGS+=-g
#.PATH:	${.CURDIR}/../../sys/netiso
@


1.17
log
@add the option -S for printing port numbers symbolically but addresses
numerically.  clean up the CFLAGS in Makefile.
@
text
@a0 1
# $FreeBSD: src/usr.bin/netstat/Makefile,v 1.16 2001/03/14 20:51:25 brian Exp $
d2 1
@


1.16
log
@MAXHOSTNAMELEN includes space for a NUL.
Don't roll our own version of trimdomain(), use the one in libutil.

Not objected to by: freebsd-audit
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.bin/netstat/Makefile,v 1.15 2000/07/04 16:26:46 itojun Exp $
d9 1
a16 1
CFLAGS+=-DINET6 -DIPSEC
@


1.15
log
@sync with latest kame netstat.  basically, more statistics
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.bin/netstat/Makefile,v 1.14 2000/01/28 05:10:54 shin Exp $
d14 2
a15 2
DPADD=	${LIBKVM} ${LIBIPX} ${LIBNETGRAPH}
LDADD=	-lkvm -lipx -lnetgraph
@


1.14
log
@IPv6 multicast routing.
  kernel IPv6 multicast routing support.
  pim6 dense mode daemon
  pim6 sparse mode daemon
  netstat support of IPv6 multicast routing statistics

  Merging to the current and testing with other existing multicast routers
  is done by Tatsuya Jinmei <jinmei@@kame.net>, who writes and maintainances
  the base code in KAME distribution.

  Make world check and kernel build check was also successful.
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.bin/netstat/Makefile,v 1.13 2000/01/06 12:40:22 shin Exp $
d6 1
a6 1
	unix.c atalk.c netgraph.c mroute6.c # iso.c ns.c tp_astring.c
d8 1
@


1.14.2.1
log
@MFC: Merge KAME 2000/07 code.
@
text
@d1 1
a1 1
# $FreeBSD$
d6 1
a6 1
	unix.c atalk.c netgraph.c mroute6.c ipsec.c # iso.c ns.c tp_astring.c 
a7 1
CFLAGS+=-DIPSEC
@


1.14.2.2
log
@MFC: most changes (-W option, trimdomain -> libutil, queue.h cleanup)
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.bin/netstat/Makefile,v 1.14.2.1 2000/07/15 07:29:29 kris Exp $
d14 2
a15 2
DPADD=	${LIBKVM} ${LIBIPX} ${LIBNETGRAPH} ${LIBUTIL}
LDADD=	-lkvm -lipx -lnetgraph -lutil
@


1.14.2.3
log
@MFC all recent bugfixes and features.

This also includes Assar's "K&R support removal" and "fixage of
almost all warnings".

Approved by:	re

Following is the list of original changes in chronological order.

> ru          2001/06/08 08:44:18 PDT
>
>   Modified files:
>     usr.bin/netstat      route.c
>   Log:
>   Always print at least 2 bytes for IN_CLASSB_NET networks.
>   Always print at least 3 bytes for IN_CLASSC_NET networks.
>
>   The standard 193.0.0 class C network for example, will now
>   be displayed as "193.0.0" as opposed to the confusing 193.
>
>   PR:		bin/21546
>   MFC after:	1 week
>
>   Revision  Changes    Path
>   1.49      +30 -11    src/usr.bin/netstat/route.c

> ru          2001/06/12 07:00:40 PDT
>
>   Modified files:
>     usr.bin/netstat      atalk.c
>   Log:
>   Fixed printing of netatalk statistics WRT the -s flag.
>
>   PR:		bin/6994
>   Submitted by:	Zahemszky Gabor <zgabor@@zg.CoDe.hu>
>   MFC after:	1 week
>
>   Revision  Changes    Path
>   1.14      +3 -3      src/usr.bin/netstat/atalk.c

> ru          2001/06/14 07:15:44 PDT
>
>   Modified files:
>     usr.bin/netstat      main.c
>   Log:
>   Really delete the -h option.
>
>   CSRG revision 5.33 deleted -h option from getopt(), but not
>   from usage().  Revision 8.3 restored it in getopt().
>
>   Revision  Changes    Path
>   1.41      +3 -3      src/usr.bin/netstat/main.c

> ru          2001/06/14 07:21:12 PDT
>
>   Modified files:
>     usr.bin/netstat      netstat.1
>   Log:
>   Removed -h option.
>
>   Revision  Changes    Path
>   1.30      +2 -6      src/usr.bin/netstat/netstat.1

> ru          2001/06/14 08:45:10 PDT
>
>   Modified files:
>     usr.bin/netstat      main.c mbuf.c netstat.1 netstat.h
>   Log:
>   Restore -M -N support for -m.
>
>   PR:		20808
>
>   Revision  Changes    Path
>   1.42      +20 -4     src/usr.bin/netstat/main.c
>   1.21      +46 -29    src/usr.bin/netstat/mbuf.c
>   1.31      +6 -2      src/usr.bin/netstat/netstat.1
>   1.22      +2 -2      src/usr.bin/netstat/netstat.h

> ru          2001/06/15 11:25:42 PDT
>
>   Modified files:
>     usr.bin/netstat      if.c main.c netstat.1 netstat.h
>   Log:
>   First round of netstat(1) cleanup.
>
>   Removed the ambiguity in -s, -f, -p and -i flags handling.
>   Basically, there are four displays (except others):
>
>   1.  PCB display.
>   2.  Protocol statistics display. (-s)
>   3.  Interface statistics display. (-i)
>   4.  Per-interface protocol statistics display. (-i -s)
>
>   All of the above except 3) can be limited to a particular
>   protocol family (-f) or a single protocol (-p).
>
>   Some examples:
>
>   1.  netstat -f inet    -- show PCBs of all INET protocols
>   2.  netstat -p udp     -- show PCB of UDP protocol only (NEW!)
>   3.  netstat -s         -- show protocol statistics for all families
>   4.  netstat -s -f inet -- show INET protocols statistics
>   5.  netstat -s -p icmp -- show ICMP protocol statistics
>
>   This is a work in progress.  Manpage has been fixed slightly,
>   but is still incomplete.
>
>   Revision  Changes    Path
>   1.42      +2 -2      src/usr.bin/netstat/if.c
>   1.45      +22 -27    src/usr.bin/netstat/main.c
>   1.33      +31 -38    src/usr.bin/netstat/netstat.1
>   1.25      +1 -2      src/usr.bin/netstat/netstat.h

> imp         2001/06/15 13:47:01 PDT
>
>   Modified files:
>     usr.bin/netstat      atalk.c
>   Log:
>   Print symbolic names for appletalk ports.  Also some very minor style 9 issues.
>
>   PR: bin/4157
>   Submitted by: Denny Gentry <denny1@@home.com>
>
>   Revision  Changes    Path
>   1.16      +16 -3     src/usr.bin/netstat/atalk.c

> ru          2001/06/23 02:18:57 PDT
>
>   Modified files:
>     usr.bin/netstat      netstat.1 route.c
>   Log:
>   Honor -s -s (don't show zero stats) with -r, untangle SYNOPSIS further.
>   (usage() still is not synchronized with SYNOPSIS, intentionally.)
>
>   Revision  Changes    Path
>   1.34      +16 -3     src/usr.bin/netstat/netstat.1
>   1.59      +11 -11    src/usr.bin/netstat/route.c

> ru          2001/06/29 01:37:13 PDT
>
>   Modified files:
>     usr.bin/netstat      route.c
>   Log:
>   Fixed bogon in revision 1.37.  Don't bogusly print a radix node's
>   duped key marker (``=>'') for routes with non-positive rmx_expire
>   metric, such as ethernet interface routes.
>
>   MFC after:	1 week
>
>   Revision  Changes    Path
>   1.60      +4 -9      src/usr.bin/netstat/route.c

> ru          2001/06/29 02:08:25 PDT
>
>   Modified files:
>     usr.bin/netstat      main.c netstat.h route.c
>   Log:
>   Make `rttrash' variable (#routes not in table but not freed) visible
>   through ``netstat -rs''.
>
>   Revision  Changes    Path
>   1.52      +4 -2      src/usr.bin/netstat/main.c
>   1.31      +2 -2      src/usr.bin/netstat/netstat.h
>   1.61      +14 -4     src/usr.bin/netstat/route.c
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.bin/netstat/Makefile,v 1.14.2.2 2001/03/22 13:48:42 des Exp $
a8 1
CFLAGS+=-DINET6
d16 1
@


1.14.2.4
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/usr.bin/netstat/Makefile 81402 2001-08-10 09:07:09Z ru $
@


1.13
log
@libipsec and IPsec related apps. (and some KAME related man pages)

Reviewed by: freebsd-arch, cvs-committers
Obtained from: KAME project
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.bin/netstat/Makefile,v 1.12 1999/12/28 02:37:01 shin Exp $
d6 1
a6 1
	unix.c atalk.c netgraph.c # iso.c ns.c tp_astring.c
@


1.12
log
@Getaddrinfo(), getnameinfo(), and etc support in libc/net.
Several udp and raw apps IPv6 support.

Reviewed by: freebsd-arch, cvs-committers
Obtained from: KAME project
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.bin/netstat/Makefile,v 1.11 1999/12/15 05:13:22 shin Exp $
d15 1
a15 1
CFLAGS+=-DINET6
@


1.11
log
@Enable INET6 by default.
This should be OK on non INET6 enabled kernel.
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.bin/netstat/Makefile,v 1.10 1999/12/07 17:38:55 shin Exp $
d15 1
a15 1
CFLAGS+=	-DINET6
@


1.10
log
@udp IPv6 support, IPv6/IPv4 tunneling support in kernel,
packet divert at kernel for IPv6/IPv4 translater daemon

This includes queue related patch submitted by jburkhol@@home.com.

Submitted by: queue related patch from jburkhol@@home.com
Reviewed by: freebsd-arch, cvs-committers
Obtained from: KAME project
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.bin/netstat/Makefile,v 1.9 1999/10/21 09:06:02 julian Exp $
d15 1
a15 1
#CFLAGS+=	-DINET6
@


1.9
log
@Whistle's Netgraph link-layer (sometimes more) networking infrastructure.
Been in production for 3 years now. Gives Instant Frame relay to if_sr
and if_ar drivers, and PPPOE support soon. See:
ftp://ftp.whistle.com/pub/archie/netgraph/index.html
for on-line manual pages.

Reviewed by: Doug Rabson (dfr@@freebsd.org)
Obtained from:  Whistle CVS tree
@
text
@d1 1
a1 1
# $FreeBSD$
d5 1
a5 1
SRCS=	if.c inet.c main.c mbuf.c mroute.c ipx.c route.c \
d15 1
@


1.8
log
@Remove -I/sys
@
text
@d1 1
d6 2
a7 1
	unix.c atalk.c # iso.c ns.c tp_astring.c
d13 2
a14 2
DPADD=	${LIBKVM} ${LIBIPX}
LDADD=	-lkvm -lipx
@


1.7
log
@Fixed DPADD.
@
text
@d7 1
a7 1
CFLAGS+=-I/sys # -g
@


1.7.2.1
log
@-I/sys --> -I${.CURDIR}/../../sys
so this compiles under other versions such as 3.0.
Suggested by: bde
@
text
@d7 1
a7 1
CFLAGS+=-I${.CURDIR}/../../sys # -g
@


1.7.2.2
log
@MFC: eliminate gratuitous -I
@
text
@d7 1
a7 1
#CFLAGS+=-g
@


1.6
log
@patches to allow netstat to monitor appletalk sockets openned using the
/sys/netatalk protocol stack

more cleanups and fixes are likely
@
text
@d11 1
a12 1
DPADD=	${LIBKVM}
@


1.5
log
@XNS sort-of-support is no more.
@
text
@d5 2
a6 1
	unix.c # iso.c ns.c tp_astring.c
@


1.4
log
@Remove support for OSI networking in user-land (#ifdef OSI aor CCITT)
in preparation for its removal from the kernel source tree.  NB: because
a function was deleted, libc is now at version 3.0 (was 2.2 previously).
@
text
@d4 2
a5 2
SRCS=	if.c inet.c main.c mbuf.c mroute.c ipx.c ns.c route.c \
	unix.c # iso.c tp_astring.c
@


1.3
log
@Submitted by:	john hay

patches to merge the two IPX packages to work with each other and to
not break make-world :)

IPXrouted should be working now, (or at least compiling) :)
@
text
@d4 2
a5 2
SRCS=	if.c inet.c iso.c main.c mbuf.c mroute.c ipx.c ns.c route.c \
	tp_astring.c unix.c
d7 1
a7 1
.PATH:	${.CURDIR}/../../sys/netiso
@


1.2
log
@Reviewed by:	julian and jhay@@mikom.csir.co.za
Submitted by:	Mike Mitchell, supervisor@@alb.asctmd.com

This is a bulk mport of Mike's IPX/SPX protocol stacks and all the
related gunf that goes with it..
it is not guaranteed to work 100% correctly at this time
but as we had several people trying to work on it
I figured it would be better to get it checked in so
they could all get teh same thing to work on..

Mikes been using it for a year or so
but on 2.0

more changes and stuff will be merged in from other developers now that this is in.

Mike Mitchell, Network Engineer
AMTECH Systems Corporation, Technology and Manufacturing
8600 Jefferson Street, Albuquerque, New Mexico 87113 (505) 856-8000
supervisor@@alb.asctmd.com
@
text
@d10 1
a10 1
LDADD=	-lkvm
@


1.1
log
@Initial revision
@
text
@d4 1
a4 1
SRCS=	if.c inet.c iso.c main.c mbuf.c mroute.c ns.c route.c \
d6 1
a6 1
CFLAGS+=-I/sys
@


1.1.1.1
log
@BSD 4.4 Lite Usr.bin Sources
@
text
@@
