From owner-p4-projects@FreeBSD.ORG  Sun May 25 01:18:42 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DA0631065674; Sun, 25 May 2008 01:18:41 +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 835F2106564A
	for <perforce@FreeBSD.org>; Sun, 25 May 2008 01:18:41 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8A9198FC13
	for <perforce@FreeBSD.org>; Sun, 25 May 2008 01:18:41 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4P1IfMU023047
	for <perforce@FreeBSD.org>; Sun, 25 May 2008 01:18:41 GMT
	(envelope-from rpaulo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4P1IfAC023045
	for perforce@freebsd.org; Sun, 25 May 2008 01:18:41 GMT
	(envelope-from rpaulo@FreeBSD.org)
Date: Sun, 25 May 2008 01:18:41 GMT
Message-Id: <200805250118.m4P1IfAC023045@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rpaulo@FreeBSD.org using -f
From: Rui Paulo <rpaulo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 142233 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: Sun, 25 May 2008 01:18:42 -0000

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

Change 142233 by rpaulo@rpaulo_epsilon on 2008/05/25 01:17:43

	Multiple header inclusion protection.

Affected files ...

.. //depot/projects/soc2008/rpaulo-tcpad/debug.h#2 edit
.. //depot/projects/soc2008/rpaulo-tcpad/device.h#2 edit
.. //depot/projects/soc2008/rpaulo-tcpad/handler.h#2 edit
.. //depot/projects/soc2008/rpaulo-tcpad/linkhdr.h#2 edit
.. //depot/projects/soc2008/rpaulo-tcpad/tcpad.h#3 edit

Differences ...

==== //depot/projects/soc2008/rpaulo-tcpad/debug.h#2 (text+ko) ====

@@ -23,11 +23,16 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/soc2008/rpaulo-tcpad/debug.h#1 $
+ * $P4: //depot/projects/soc2008/rpaulo-tcpad/debug.h#2 $
  */
 
+#ifndef _DEBUG_H_
+#define _DEBUG_H_
+
 #ifdef DEBUG
 #define DPRINTF	printf
 #else
 #define DPRINTF
 #endif
+
+#endif /* _DEBUG_H_ */

==== //depot/projects/soc2008/rpaulo-tcpad/device.h#2 (text+ko) ====

@@ -23,8 +23,12 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/soc2008/rpaulo-tcpad/device.h#1 $
+ * $P4: //depot/projects/soc2008/rpaulo-tcpad/device.h#2 $
  */
 
+#ifndef _DEVICE_H_
+#define _DEVICE_H_
+
 void	device_listall(void);
 
+#endif /* _DEVICE_H_ */

==== //depot/projects/soc2008/rpaulo-tcpad/handler.h#2 (text+ko) ====

@@ -23,9 +23,13 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/soc2008/rpaulo-tcpad/handler.h#1 $
+ * $P4: //depot/projects/soc2008/rpaulo-tcpad/handler.h#2 $
  */
 
+#ifndef _HANDLER_H_
+#define _HANDLER_H_
+
 void	tcpad_pcaphandler(unsigned char *user, const struct pcap_pkthdr *h,
     const unsigned char *bytes);
 
+#endif /* _HANDLER_H_ */

==== //depot/projects/soc2008/rpaulo-tcpad/linkhdr.h#2 (text+ko) ====

@@ -23,10 +23,14 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/soc2008/rpaulo-tcpad/linkhdr.h#1 $
+ * $P4: //depot/projects/soc2008/rpaulo-tcpad/linkhdr.h#2 $
  */
 
+#ifndef _LINKHDR_H_
+#define _LINKHDR_H_
+
 int	linkhdr_headerlen(int dlt);
 const unsigned char *
 	linkhdr_remove(const unsigned char *bytes, unsigned int skip);
 
+#endif /* _LINKHDR_H_ */

==== //depot/projects/soc2008/rpaulo-tcpad/tcpad.h#3 (text+ko) ====

@@ -23,9 +23,12 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/soc2008/rpaulo-tcpad/tcpad.h#2 $
+ * $P4: //depot/projects/soc2008/rpaulo-tcpad/tcpad.h#3 $
  */
 
+#ifndef _TCPAD_H_
+#define _TCPAD_H_
+
 #include <netinet/in.h>
 
 typedef struct _conn_t {
@@ -36,6 +39,9 @@
 	unsigned short sport;
 	int tcpstate;		/* TCP FSM state */
 	int isv6;
+	struct dumppkth *pktshead;
 } conn_t;
 
 LIST_HEAD(chead, _conn_t) chead;
+
+#endif /* _TCPAD_H_ */