PERFORCE change 142233 for review

[Rui Paulo]

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

Change 142233 by rpaulo at 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_ */