[src/trunk]: src/sys/netinet Fix compilation problems

[martti <martti%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ba4ea2efedce
branches:  trunk
changeset: 526353:ba4ea2efedce
user:      martti <martti%NetBSD.org@localhost>
date:      Thu May 02 17:13:27 2002 +0000

description:
Fix compilation problems

diffstat:

 sys/netinet/fil.c        |  8 ++++++--
 sys/netinet/ip_auth.c    |  5 +++--
 sys/netinet/ip_fil.c     |  5 +++--
 sys/netinet/ip_frag.c    |  5 +++--
 sys/netinet/ip_ftp_pxy.c |  8 ++++++--
 sys/netinet/ip_nat.c     |  5 +++--
 sys/netinet/ip_proxy.c   |  7 ++-----
 sys/netinet/ip_state.c   |  5 +++--
 8 files changed, 29 insertions(+), 19 deletions(-)

diffs (201 lines):

diff -r 4c622b2acf8f -r ba4ea2efedce sys/netinet/fil.c
--- a/sys/netinet/fil.c Thu May 02 17:11:37 2002 +0000
+++ b/sys/netinet/fil.c Thu May 02 17:13:27 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fil.c,v 1.54 2002/05/02 17:12:02 martti Exp $  */
+/*     $NetBSD: fil.c,v 1.55 2002/05/02 17:13:27 martti Exp $  */
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
@@ -100,11 +100,12 @@
 #if !defined(lint)
 #if defined(__NetBSD__)
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.54 2002/05/02 17:12:02 martti Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.55 2002/05/02 17:13:27 martti Exp $");
 #else
 static const char sccsid[] = "@(#)fil.c        1.36 6/5/96 (C) 1993-2000 Darren Reed";
 static const char rcsid[] = "@(#)Id: fil.c,v 2.35.2.60 2002/04/26 10:20:34 darrenr Exp";
 #endif
+#endif
 
 #ifndef        _KERNEL
 # include "ipf.h"
@@ -151,6 +152,9 @@
 #ifdef _KERNEL
 static void    frsynclist __P((frentry_t *));
 #endif
+#ifndef        _KERNEL
+int            mbuflen(mb_t *);
+#endif
 
 
 /*
diff -r 4c622b2acf8f -r ba4ea2efedce sys/netinet/ip_auth.c
--- a/sys/netinet/ip_auth.c     Thu May 02 17:11:37 2002 +0000
+++ b/sys/netinet/ip_auth.c     Thu May 02 17:13:27 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_auth.c,v 1.26 2002/05/02 17:12:03 martti Exp $      */
+/*     $NetBSD: ip_auth.c,v 1.27 2002/05/02 17:13:28 martti Exp $      */
 
 /*
  * Copyright (C) 1998-2001 by Darren Reed & Guido van Rooij.
@@ -108,10 +108,11 @@
 #if !defined(lint)
 #if defined(__NetBSD__)
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_auth.c,v 1.26 2002/05/02 17:12:03 martti Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_auth.c,v 1.27 2002/05/02 17:13:28 martti Exp $");
 #else
 static const char rcsid[] = "@(#)Id: ip_auth.c,v 2.11.2.19 2002/04/23 14:57:27 darrenr Exp";
 #endif
+#endif
 
 
 #if (SOLARIS || defined(__sgi)) && defined(_KERNEL)
diff -r 4c622b2acf8f -r ba4ea2efedce sys/netinet/ip_fil.c
--- a/sys/netinet/ip_fil.c      Thu May 02 17:11:37 2002 +0000
+++ b/sys/netinet/ip_fil.c      Thu May 02 17:13:27 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_fil.c,v 1.78 2002/05/02 17:12:03 martti Exp $       */
+/*     $NetBSD: ip_fil.c,v 1.79 2002/05/02 17:13:28 martti Exp $       */
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
@@ -123,11 +123,12 @@
 #if !defined(lint)
 #if defined(__NetBSD__)
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_fil.c,v 1.78 2002/05/02 17:12:03 martti Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_fil.c,v 1.79 2002/05/02 17:13:28 martti Exp $");
 #else
 static const char sccsid[] = "@(#)ip_fil.c     2.41 6/5/96 (C) 1993-2000 Darren Reed";
 static const char rcsid[] = "@(#)Id: ip_fil.c,v 2.42.2.55 2002/03/26 15:54:39 darrenr Exp";
 #endif
+#endif
 
 
 extern struct  protosw inetsw[];
diff -r 4c622b2acf8f -r ba4ea2efedce sys/netinet/ip_frag.c
--- a/sys/netinet/ip_frag.c     Thu May 02 17:11:37 2002 +0000
+++ b/sys/netinet/ip_frag.c     Thu May 02 17:13:27 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_frag.c,v 1.29 2002/05/02 17:12:04 martti Exp $      */
+/*     $NetBSD: ip_frag.c,v 1.30 2002/05/02 17:13:29 martti Exp $      */
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
@@ -93,11 +93,12 @@
 #if !defined(lint)
 #if defined(__NetBSD__)
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_frag.c,v 1.29 2002/05/02 17:12:04 martti Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_frag.c,v 1.30 2002/05/02 17:13:29 martti Exp $");
 #else
 static const char sccsid[] = "@(#)ip_frag.c    1.11 3/24/96 (C) 1993-2000 Darren Reed";
 static const char rcsid[] = "@(#)Id: ip_frag.c,v 2.10.2.21 2002/04/10 04:56:10 darrenr Exp";
 #endif
+#endif
 
 
 static ipfr_t  *ipfr_heads[IPFT_SIZE];
diff -r 4c622b2acf8f -r ba4ea2efedce sys/netinet/ip_ftp_pxy.c
--- a/sys/netinet/ip_ftp_pxy.c  Thu May 02 17:11:37 2002 +0000
+++ b/sys/netinet/ip_ftp_pxy.c  Thu May 02 17:13:27 2002 +0000
@@ -1,7 +1,7 @@
-/*     $NetBSD: ip_ftp_pxy.c,v 1.23 2002/05/02 17:12:04 martti Exp $   */
+/*     $NetBSD: ip_ftp_pxy.c,v 1.24 2002/05/02 17:13:29 martti Exp $   */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: ip_ftp_pxy.c,v 1.23 2002/05/02 17:12:04 martti Exp $");
+__KERNEL_RCSID(1, "$NetBSD: ip_ftp_pxy.c,v 1.24 2002/05/02 17:13:29 martti Exp $");
 
 /*
  * Simple FTP transparent proxy for in-kernel use.  For use with the NAT
@@ -44,6 +44,10 @@
 #define        FTPXY_PASS_2    14
 #define        FTPXY_PAOK_2    15
 
+#ifndef        _KERNEL
+extern int mbuflen(mb_t *);
+#endif
+
 int ippr_ftp_client __P((fr_info_t *, ip_t *, nat_t *, ftpinfo_t *, int));
 int ippr_ftp_complete __P((char *, size_t));
 int ippr_ftp_in __P((fr_info_t *, ip_t *, ap_session_t *, nat_t *));
diff -r 4c622b2acf8f -r ba4ea2efedce sys/netinet/ip_nat.c
--- a/sys/netinet/ip_nat.c      Thu May 02 17:11:37 2002 +0000
+++ b/sys/netinet/ip_nat.c      Thu May 02 17:13:27 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_nat.c,v 1.47 2002/05/02 17:12:05 martti Exp $       */
+/*     $NetBSD: ip_nat.c,v 1.48 2002/05/02 17:13:29 martti Exp $       */
 
 /*
  * Copyright (C) 1995-2001 by Darren Reed.
@@ -112,11 +112,12 @@
 #if !defined(lint)
 #if defined(__NetBSD__)
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_nat.c,v 1.47 2002/05/02 17:12:05 martti Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_nat.c,v 1.48 2002/05/02 17:13:29 martti Exp $");
 #else
 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.37.2.67 2002/04/27 15:23:39 darrenr Exp";
 #endif
+#endif
 
 nat_t  **nat_table[2] = { NULL, NULL },
        *nat_instances = NULL;
diff -r 4c622b2acf8f -r ba4ea2efedce sys/netinet/ip_proxy.c
--- a/sys/netinet/ip_proxy.c    Thu May 02 17:11:37 2002 +0000
+++ b/sys/netinet/ip_proxy.c    Thu May 02 17:13:27 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_proxy.c,v 1.32 2002/05/02 17:12:06 martti Exp $     */
+/*     $NetBSD: ip_proxy.c,v 1.33 2002/05/02 17:13:29 martti Exp $     */
 
 /*
  * Copyright (C) 1997-2002 by Darren Reed.
@@ -79,7 +79,7 @@
 #if !defined(lint)
 #if defined(__NetBSD__)
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_proxy.c,v 1.32 2002/05/02 17:12:06 martti Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_proxy.c,v 1.33 2002/05/02 17:13:29 martti Exp $");
 #else
 static const char rcsid[] = "@(#)Id: ip_proxy.c,v 2.9.2.22 2002/04/26 10:23:17 darrenr Exp";
 #endif
@@ -103,11 +103,8 @@
 #include "netinet/ip_rcmd_pxy.c"
 #include "netinet/ip_raudio_pxy.c"
 #include "netinet/ip_netbios_pxy.c"
-#if 0
-/* H.323 proxy code is buggy in IPFilter 3.4.25 */
 #include "netinet/ip_h323_pxy.c"
 #endif
-#endif
 #include "netinet/ip_ipsec_pxy.c"
 
 ap_session_t   *ap_sess_tab[AP_SESS_SIZE];
diff -r 4c622b2acf8f -r ba4ea2efedce sys/netinet/ip_state.c
--- a/sys/netinet/ip_state.c    Thu May 02 17:11:37 2002 +0000
+++ b/sys/netinet/ip_state.c    Thu May 02 17:13:27 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_state.c,v 1.37 2002/05/02 17:12:06 martti Exp $     */
+/*     $NetBSD: ip_state.c,v 1.38 2002/05/02 17:13:30 martti Exp $     */
 
 /*
  * Copyright (C) 1995-2002 by Darren Reed.
@@ -96,11 +96,12 @@
 #if !defined(lint)
 #if defined(__NetBSD__)
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_state.c,v 1.37 2002/05/02 17:12:06 martti Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_state.c,v 1.38 2002/05/02 17:13:30 martti Exp $");
 #else
 static const char sccsid[] = "@(#)ip_state.c   1.8 6/5/96 (C) 1993-2000 Darren Reed";
 static const char rcsid[] = "@(#)Id: ip_state.c,v 2.30.2.70 2002/04/27 16:06:15 darrenr Exp";
 #endif
+#endif
 
 #ifndef        MIN
 # define       MIN(a,b)        (((a)<(b))?(a):(b))