From owner-p4-projects@FreeBSD.ORG  Thu Jul 30 22:34:05 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BE0271065696; Thu, 30 Jul 2009 22:34:04 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 79FC7106568A
	for <perforce@FreeBSD.org>; Thu, 30 Jul 2009 22:34:04 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 67F3E8FC23
	for <perforce@FreeBSD.org>; Thu, 30 Jul 2009 22:34:04 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n6UMY4SD041226
	for <perforce@FreeBSD.org>; Thu, 30 Jul 2009 22:34:04 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6UMY4v7041224
	for perforce@freebsd.org; Thu, 30 Jul 2009 22:34:04 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Thu, 30 Jul 2009 22:34:04 GMT
Message-Id: <200907302234.n6UMY4v7041224@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 166841 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Jul 2009 22:34:06 -0000

http://perforce.freebsd.org/chv.cgi?CH=166841

Change 166841 by pgj@petymeg-current on 2009/07/30 22:33:27

	Add header for AH statistics.

Affected files ...

.. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/ah_var.h#2 edit
.. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/xform_ah.c#2 edit

Differences ...

==== //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/ah_var.h#2 (text+ko) ====

@@ -47,6 +47,8 @@
  */
 #define	AH_ALG_MAX	16
 
+#define AHSTAT_VERSION	0x00000001
+
 struct ahstat {
 	u_int32_t	ahs_hdrops;	/* Packet shorter than header shows */
 	u_int32_t	ahs_nopf;	/* Protocol family not supported */

==== //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/xform_ah.c#2 (text+ko) ====

@@ -47,6 +47,7 @@
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <sys/vimage.h>
+#include <sys/sockopt.h>
 
 #include <net/if.h>
 
@@ -55,6 +56,7 @@
 #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>
@@ -102,6 +104,10 @@
 #ifdef VIMAGE_GLOBALS
 int	ah_enable;
 int	ah_cleartos;
+struct	stat_header ahstat_header = {
+	.sth_version = AHSTAT_VERSION,
+	.sth_len = sizeof(struct ahstat)
+};
 struct	ahstat ahstat;
 #endif
 
@@ -110,8 +116,12 @@
 	ah_enable,	CTLFLAG_RW,	ah_enable,	0, "");
 SYSCTL_V_INT(V_NET, vnet_ipsec, _net_inet_ah, OID_AUTO,
 	ah_cleartos,	CTLFLAG_RW,	ah_cleartos,	0, "");
+
 SYSCTL_V_STRUCT(V_NET, vnet_ipsec, _net_inet_ah, IPSECCTL_STATS,
-	stats,		CTLFLAG_RD,	ahstat,	ahstat, "");
+	stats,		CTLFLAG_RW,	ahstat,	ahstat, "");
+
+SYSCTL_V_STRUCT(V_NET, vnet_ipsec, _net_inet_ah, OID_AUTO,
+	stats_header,	CTLFLAG_RD,	ahstat_header,	stat_header, "");
 
 static unsigned char ipseczeroes[256];	/* larger than an ip6 extension hdr */