aboutsummaryrefslogtreecommitdiff
path: root/sys/netinet
diff options
context:
space:
mode:
authorGuido van Rooij <guido@FreeBSD.org>2000-02-10 21:29:11 +0000
committerGuido van Rooij <guido@FreeBSD.org>2000-02-10 21:29:11 +0000
commita993ad154a0e38688f39f09663054a5485bee6e8 (patch)
tree5c117ae5bbfb49c036e3224dac3d37e89f47d8e9 /sys/netinet
parent960e15a70b124639b7f5d34174943952d8d50e34 (diff)
Notes
Diffstat (limited to 'sys/netinet')
-rw-r--r--sys/netinet/ip_auth.c3
-rw-r--r--sys/netinet/ip_auth.h1
-rw-r--r--sys/netinet/ip_compat.h1
-rw-r--r--sys/netinet/ip_fil.c3
-rw-r--r--sys/netinet/ip_fil.h6
-rw-r--r--sys/netinet/ip_frag.c3
-rw-r--r--sys/netinet/ip_frag.h1
-rw-r--r--sys/netinet/ip_ftp_pxy.c1
-rw-r--r--sys/netinet/ip_log.c1
-rw-r--r--sys/netinet/ip_nat.c3
-rw-r--r--sys/netinet/ip_nat.h1
-rw-r--r--sys/netinet/ip_proxy.c3
-rw-r--r--sys/netinet/ip_proxy.h1
-rw-r--r--sys/netinet/ip_raudio_pxy.c3
-rw-r--r--sys/netinet/ip_rcmd_pxy.c1
-rw-r--r--sys/netinet/ip_state.c3
-rw-r--r--sys/netinet/ip_state.h1
-rw-r--r--sys/netinet/ipl.h1
18 files changed, 29 insertions, 8 deletions
diff --git a/sys/netinet/ip_auth.c b/sys/netinet/ip_auth.c
index 6b980be07fe7..045edaa72085 100644
--- a/sys/netinet/ip_auth.c
+++ b/sys/netinet/ip_auth.c
@@ -6,7 +6,8 @@
* to the original author and the contributors.
*/
#if !defined(lint)
-static const char rcsid[] = "@(#)$Id: ip_auth.c,v 2.1.2.2 2000/01/16 10:12:14 darrenr Exp $";
+/*static const char rcsid[] = "@(#)$Id: ip_auth.c,v 2.1.2.2 2000/01/16 10:12:14 darrenr Exp $";*/
+static const char rcsid[] = "@(#)$FreeBSD$";
#endif
#include <sys/errno.h>
diff --git a/sys/netinet/ip_auth.h b/sys/netinet/ip_auth.h
index 46b8d92eb667..e6b5a59576fa 100644
--- a/sys/netinet/ip_auth.h
+++ b/sys/netinet/ip_auth.h
@@ -6,6 +6,7 @@
* to the original author and the contributors.
*
* $Id: ip_auth.h,v 2.1 1999/08/04 17:29:54 darrenr Exp $
+ * $FreeBSD$
*
*/
#ifndef __IP_AUTH_H__
diff --git a/sys/netinet/ip_compat.h b/sys/netinet/ip_compat.h
index 318ef2f3ae19..0c8242d6b601 100644
--- a/sys/netinet/ip_compat.h
+++ b/sys/netinet/ip_compat.h
@@ -7,6 +7,7 @@
*
* @(#)ip_compat.h 1.8 1/14/96
* $Id: ip_compat.h,v 2.1.2.3 1999/11/18 13:55:26 darrenr Exp $
+ * $FreeBSD$
*/
#ifndef __IP_COMPAT_H__
diff --git a/sys/netinet/ip_fil.c b/sys/netinet/ip_fil.c
index 2efeabd98a2a..8216537dbbf7 100644
--- a/sys/netinet/ip_fil.c
+++ b/sys/netinet/ip_fil.c
@@ -7,7 +7,8 @@
*/
#if !defined(lint)
static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id: ip_fil.c,v 2.4.2.16 2000/01/16 10:12:42 darrenr Exp $";
+/*static const char rcsid[] = "@(#)$Id: ip_fil.c,v 2.4.2.16 2000/01/16 10:12:42 darrenr Exp $";*/
+static const char rcsid[] = "@(#)$FreeBSD$";
#endif
#ifndef SOLARIS
diff --git a/sys/netinet/ip_fil.h b/sys/netinet/ip_fil.h
index aa42f2fdf14f..8ec87cf99808 100644
--- a/sys/netinet/ip_fil.h
+++ b/sys/netinet/ip_fil.h
@@ -7,6 +7,7 @@
*
* @(#)ip_fil.h 1.35 6/5/96
* $Id: ip_fil.h,v 2.3.2.7 2000/01/27 08:49:41 darrenr Exp $
+ * $FreeBSD$
*/
#ifndef __IP_FIL_H__
@@ -82,8 +83,8 @@
#define SIOCINSFR SIOCINAFR
typedef struct fr_ip {
- u_char fi_v:4; /* IP version */
- u_char fi_fl:4; /* packet flags */
+ u_int fi_v:4; /* IP version */
+ u_int fi_fl:4; /* packet flags */
u_char fi_tos; /* IP packet TOS */
u_char fi_ttl; /* IP packet TTL */
u_char fi_p; /* IP packet protocol */
@@ -427,6 +428,7 @@ typedef struct ipflog {
#ifndef _KERNEL
+struct ifnet;
extern int fr_check __P((ip_t *, int, void *, int, mb_t **));
extern int (*fr_checkp) __P((ip_t *, int, void *, int, mb_t **));
extern int send_reset __P((ip_t *, struct ifnet *));
diff --git a/sys/netinet/ip_frag.c b/sys/netinet/ip_frag.c
index 168368aa3a77..2b343e7be62f 100644
--- a/sys/netinet/ip_frag.c
+++ b/sys/netinet/ip_frag.c
@@ -7,7 +7,8 @@
*/
#if !defined(lint)
static const char sccsid[] = "@(#)ip_frag.c 1.11 3/24/96 (C) 1993-1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id: ip_frag.c,v 2.4.2.4 1999/11/28 04:52:10 darrenr Exp $";
+/*static const char rcsid[] = "@(#)$Id: ip_frag.c,v 2.4.2.4 1999/11/28 04:52:10 darrenr Exp $";*/
+static const char rcsid[] = "@(#)$FreeBSD$";
#endif
#if defined(KERNEL) && !defined(_KERNEL)
diff --git a/sys/netinet/ip_frag.h b/sys/netinet/ip_frag.h
index 1097dec7a978..0494e9c60531 100644
--- a/sys/netinet/ip_frag.h
+++ b/sys/netinet/ip_frag.h
@@ -7,6 +7,7 @@
*
* @(#)ip_frag.h 1.5 3/24/96
* $Id: ip_frag.h,v 2.2 1999/08/06 06:26:38 darrenr Exp $
+ * $FreeBSD$
*/
#ifndef __IP_FRAG_H__
diff --git a/sys/netinet/ip_ftp_pxy.c b/sys/netinet/ip_ftp_pxy.c
index 73c27ce73b63..3ed1853bcf03 100644
--- a/sys/netinet/ip_ftp_pxy.c
+++ b/sys/netinet/ip_ftp_pxy.c
@@ -1,6 +1,7 @@
/*
* Simple FTP transparent proxy for in-kernel use. For use with the NAT
* code.
+ * $FreeBSD$
*/
#if SOLARIS && defined(_KERNEL)
extern kmutex_t ipf_rw;
diff --git a/sys/netinet/ip_log.c b/sys/netinet/ip_log.c
index b71aa7fff1ac..e347047fdb8f 100644
--- a/sys/netinet/ip_log.c
+++ b/sys/netinet/ip_log.c
@@ -6,6 +6,7 @@
* to the original author and the contributors.
*
* $Id: ip_log.c,v 2.1.2.2 1999/09/21 11:55:44 darrenr Exp $
+ * $FreeBSD$
*/
#include <sys/param.h>
#if defined(KERNEL) && !defined(_KERNEL)
diff --git a/sys/netinet/ip_nat.c b/sys/netinet/ip_nat.c
index 5b8a686573b1..fc07ca2e547b 100644
--- a/sys/netinet/ip_nat.c
+++ b/sys/netinet/ip_nat.c
@@ -9,7 +9,8 @@
*/
#if !defined(lint)
static const char sccsid[] = "@(#)ip_nat.c 1.11 6/5/96 (C) 1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id: ip_nat.c,v 2.2.2.12 2000/01/24 12:43:40 darrenr Exp $";
+/*static const char rcsid[] = "@(#)$Id: ip_nat.c,v 2.2.2.12 2000/01/24 12:43:40 darrenr Exp $";*/
+static const char rcsid[] = "@(#)$FreeBSD$";
#endif
#if defined(__FreeBSD__) && defined(KERNEL) && !defined(_KERNEL)
diff --git a/sys/netinet/ip_nat.h b/sys/netinet/ip_nat.h
index c57b4e7959ec..c66df75b2672 100644
--- a/sys/netinet/ip_nat.h
+++ b/sys/netinet/ip_nat.h
@@ -7,6 +7,7 @@
*
* @(#)ip_nat.h 1.5 2/4/96
* $Id: ip_nat.h,v 2.1.2.3 2000/01/24 12:44:24 darrenr Exp $
+ * $FreeBSD$
*/
#ifndef __IP_NAT_H__
diff --git a/sys/netinet/ip_proxy.c b/sys/netinet/ip_proxy.c
index ccf9c127e19c..3a038632148f 100644
--- a/sys/netinet/ip_proxy.c
+++ b/sys/netinet/ip_proxy.c
@@ -6,7 +6,8 @@
* to the original author and the contributors.
*/
#if !defined(lint)
-static const char rcsid[] = "@(#)$Id: ip_proxy.c,v 2.2.2.1 1999/09/19 12:18:19 darrenr Exp $";
+/*static const char rcsid[] = "@(#)$Id: ip_proxy.c,v 2.2.2.1 1999/09/19 12:18:19 darrenr Exp $";*/
+static const char rcsid[] = "@(#)$FreeBSD$";
#endif
#if defined(__FreeBSD__) && defined(KERNEL) && !defined(_KERNEL)
diff --git a/sys/netinet/ip_proxy.h b/sys/netinet/ip_proxy.h
index 08409b05b92b..9ccd46a4c078 100644
--- a/sys/netinet/ip_proxy.h
+++ b/sys/netinet/ip_proxy.h
@@ -6,6 +6,7 @@
* to the original author and the contributors.
*
* $Id: ip_proxy.h,v 2.1.2.1 1999/09/19 12:18:20 darrenr Exp $
+ * $FreeBSD$
*/
#ifndef __IP_PROXY_H__
diff --git a/sys/netinet/ip_raudio_pxy.c b/sys/netinet/ip_raudio_pxy.c
index 6ccf4e42b1cd..611dc2652906 100644
--- a/sys/netinet/ip_raudio_pxy.c
+++ b/sys/netinet/ip_raudio_pxy.c
@@ -1,3 +1,6 @@
+/*
+ * $FreeBSD$
+ */
#if SOLARIS && defined(_KERNEL)
extern kmutex_t ipf_rw;
#endif
diff --git a/sys/netinet/ip_rcmd_pxy.c b/sys/netinet/ip_rcmd_pxy.c
index 2b67ee54435a..c8b15d194dc7 100644
--- a/sys/netinet/ip_rcmd_pxy.c
+++ b/sys/netinet/ip_rcmd_pxy.c
@@ -1,6 +1,7 @@
/*
* Simple RCMD transparent proxy for in-kernel use. For use with the NAT
* code.
+ * $FreeBSD$
*/
#if SOLARIS && defined(_KERNEL)
extern kmutex_t ipf_rw;
diff --git a/sys/netinet/ip_state.c b/sys/netinet/ip_state.c
index 17944caba0f7..253f99885439 100644
--- a/sys/netinet/ip_state.c
+++ b/sys/netinet/ip_state.c
@@ -7,7 +7,8 @@
*/
#if !defined(lint)
static const char sccsid[] = "@(#)ip_state.c 1.8 6/5/96 (C) 1993-1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id: ip_state.c,v 2.3.2.18 2000/01/27 08:51:30 darrenr Exp $";
+/*static const char rcsid[] = "@(#)$Id: ip_state.c,v 2.3.2.18 2000/01/27 08:51:30 darrenr Exp $";*/
+static const char rcsid[] = "@(#)$FreeBSD$";
#endif
#include <sys/errno.h>
diff --git a/sys/netinet/ip_state.h b/sys/netinet/ip_state.h
index b20f286d7674..7b8803fbdfbd 100644
--- a/sys/netinet/ip_state.h
+++ b/sys/netinet/ip_state.h
@@ -7,6 +7,7 @@
*
* @(#)ip_state.h 1.3 1/12/96 (C) 1995 Darren Reed
* $Id: ip_state.h,v 2.1.2.2 2000/01/24 13:13:52 darrenr Exp $
+ * $FreeBSD$
*/
#ifndef __IP_STATE_H__
#define __IP_STATE_H__
diff --git a/sys/netinet/ipl.h b/sys/netinet/ipl.h
index 6eb9b1ad5051..2a09f51803db 100644
--- a/sys/netinet/ipl.h
+++ b/sys/netinet/ipl.h
@@ -6,6 +6,7 @@
* to the original author and the contributors.
*
* @(#)ipl.h 1.21 6/5/96
+ * $FreeBSD$
*/
#ifndef __IPL_H__