Date: Wed, 5 May 2010 17:01:32 GMT From: Gabor Pali <pgj@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 177767 for review Message-ID: <201005051701.o45H1WRI044460@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@177767?ac=10 Change 177767 by pgj@csupor on 2010/05/05 17:00:33 Introduce a header file <net/stat.h> for struct stat_header and move it away from <netinet/tcp_var.h> finally. Affected files ... .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_stat.c#28 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/pf/net/if_pfsync.c#4 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/net/route.c#7 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/net/stat.h#1 add .. //depot/projects/soc2009/pgj_libstat/src/sys/netatalk/ddp_input.c#4 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/ip_input.c#9 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_sysctl.c#5 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/tcp_input.c#6 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/tcp_var.h#6 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/ip6_input.c#6 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/raw_ip6.c#7 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/ipsec.c#7 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/keysock.c#4 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/xform_ah.c#4 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/xform_esp.c#5 edit Differences ... ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_stat.c#28 (text+ko) ==== @@ -29,6 +29,7 @@ #include <sys/types.h> #include <sys/sysctl.h> +#include <net/stat.h> #include <netinet/in.h> #include <netinet/ip.h> #include <netinet/ip_var.h> ==== //depot/projects/soc2009/pgj_libstat/src/sys/contrib/pf/net/if_pfsync.c#4 (text+ko) ==== @@ -92,8 +92,7 @@ #include <netinet/tcp_seq.h> #ifdef __FreeBSD__ -#include <sys/sockopt.h> -#include <netinet/tcp_var.h> +#include <net/stat.h> #endif #ifdef INET ==== //depot/projects/soc2009/pgj_libstat/src/sys/net/route.c#7 (text+ko) ==== @@ -65,7 +65,7 @@ #include <netinet/in.h> #include <netinet/in_var.h> #include <netinet/ip_mroute.h> -#include <netinet/tcp_var.h> +#include <net/stat.h> #include <vm/uma.h> ==== //depot/projects/soc2009/pgj_libstat/src/sys/netatalk/ddp_input.c#4 (text+ko) ==== @@ -61,7 +61,7 @@ #include <sys/sysctl.h> #include <net/if.h> #include <net/route.h> -#include <netinet/tcp_var.h> +#include <net/stat.h> #include <netatalk/at.h> #include <netatalk/at_var.h> ==== //depot/projects/soc2009/pgj_libstat/src/sys/netinet/ip_input.c#9 (text+ko) ==== @@ -63,6 +63,7 @@ #include <net/netisr.h> #include <net/vnet.h> #include <net/flowtable.h> +#include <net/stat.h> #include <netinet/in.h> #include <netinet/in_systm.h> @@ -82,7 +83,6 @@ #endif /* IPSEC */ #include <sys/socketvar.h> -#include <netinet/tcp_var.h> #include <security/mac/mac_framework.h> ==== //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_sysctl.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ #include <netinet/sctputil.h> #include <netinet/sctp_output.h> #include <sys/smp.h> -#include <netinet/tcp_var.h> +#include <net/stat.h> /* * sysctl tunable variables ==== //depot/projects/soc2009/pgj_libstat/src/sys/netinet/tcp_input.c#6 (text+ko) ==== @@ -58,6 +58,7 @@ #include <net/if.h> #include <net/route.h> #include <net/vnet.h> +#include <net/stat.h> #define TCPSTATES /* for logging */ ==== //depot/projects/soc2009/pgj_libstat/src/sys/netinet/tcp_var.h#6 (text+ko) ==== @@ -361,12 +361,6 @@ max((tp)->t_rttmin, (((tp)->t_srtt >> (TCP_RTT_SHIFT - TCP_DELTA_SHIFT)) \ + (tp)->t_rttvar) >> TCP_DELTA_SHIFT) -/* XXX: should be moved to somewhere else. */ -struct stat_header { - const u_int32_t sth_version; - const u_int32_t sth_len; -}; - /* * TCP statistics. * Many of these should be kept per connection, ==== //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/ip6_input.c#6 (text+ko) ==== @@ -88,6 +88,7 @@ #include <net/netisr.h> #include <net/pfil.h> #include <net/vnet.h> +#include <net/stat.h> #include <netinet/in.h> #include <netinet/in_systm.h> @@ -104,7 +105,6 @@ #include <netinet6/scope6_var.h> #include <netinet6/in6_ifattach.h> #include <netinet6/nd6.h> -#include <netinet/tcp_var.h> #ifdef IPSEC #include <netipsec/ipsec.h> ==== //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/raw_ip6.c#7 (text+ko) ==== @@ -84,6 +84,7 @@ #include <net/if_types.h> #include <net/route.h> #include <net/vnet.h> +#include <net/stat.h> #include <netinet/in.h> #include <netinet/in_var.h> @@ -99,7 +100,6 @@ #include <netinet6/nd6.h> #include <netinet6/raw_ip6.h> #include <netinet6/scope6_var.h> -#include <netinet/tcp_var.h> #ifdef IPSEC #include <netipsec/ipsec.h> ==== //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/ipsec.c#7 (text+ko) ==== @@ -57,6 +57,7 @@ #include <net/if.h> #include <net/route.h> #include <net/vnet.h> +#include <net/stat.h> #include <netinet/in.h> #include <netinet/in_systm.h> @@ -66,7 +67,6 @@ #include <netinet/udp.h> #include <netinet/udp_var.h> #include <netinet/tcp.h> -#include <netinet/tcp_var.h> #include <netinet/udp.h> #include <netinet/ip6.h> ==== //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/keysock.c#4 (text+ko) ==== @@ -55,9 +55,9 @@ #include <net/raw_cb.h> #include <net/route.h> #include <net/vnet.h> +#include <net/stat.h> #include <netinet/in.h> -#include <netinet/tcp_var.h> #include <net/pfkeyv2.h> #include <netipsec/key.h> ==== //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/xform_ah.c#4 (text+ko) ==== @@ -50,13 +50,13 @@ #include <net/if.h> #include <net/vnet.h> +#include <net/stat.h> #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_ecn.h> #include <netinet/ip6.h> -#include <netinet/tcp_var.h> #include <net/route.h> #include <netipsec/ipsec.h> ==== //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/xform_esp.c#5 (text+ko) ==== @@ -50,13 +50,13 @@ #include <net/if.h> #include <net/vnet.h> +#include <net/stat.h> #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_ecn.h> #include <netinet/ip6.h> -#include <netinet/tcp_var.h> #include <net/route.h> #include <netipsec/ipsec.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005051701.o45H1WRI044460>