[src/trunk]: src/sys Make these compile without INET. tcp_input probably nee...

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

details:   https://anonhg.NetBSD.org/src/rev/1808f71bde7d
branches:  trunk
changeset: 565094:1808f71bde7d
user:      atatat <atatat%NetBSD.org@localhost>
date:      Mon Mar 29 04:59:02 2004 +0000

description:
Make these compile without INET.  tcp_input probably needs a lot more
work...

diffstat:

 sys/netinet/tcp_input.c  |  6 ++++--
 sys/netinet/tcp_usrreq.c |  9 +++++----
 sys/netinet6/in6_pcb.c   |  6 +++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diffs (100 lines):

diff -r bd51c78ecb96 -r 1808f71bde7d sys/netinet/tcp_input.c
--- a/sys/netinet/tcp_input.c   Mon Mar 29 04:39:59 2004 +0000
+++ b/sys/netinet/tcp_input.c   Mon Mar 29 04:59:02 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_input.c,v 1.190 2004/03/10 18:50:45 drochner Exp $ */
+/*     $NetBSD: tcp_input.c,v 1.191 2004/03/29 04:59:02 atatat Exp $   */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -148,7 +148,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.190 2004/03/10 18:50:45 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.191 2004/03/29 04:59:02 atatat Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -1356,6 +1356,7 @@
 
 #ifdef IPSEC
                                switch (af) {
+#ifdef INET
                                case AF_INET:
                                        if (ipsec4_in_reject_so(m, so)) {
                                                ipsecstat.in_polvio++;
@@ -1363,6 +1364,7 @@
                                                goto dropwithreset;
                                        }
                                        break;
+#endif
 #ifdef INET6
                                case AF_INET6:
                                        if (ipsec6_in_reject_so(m, so)) {
diff -r bd51c78ecb96 -r 1808f71bde7d sys/netinet/tcp_usrreq.c
--- a/sys/netinet/tcp_usrreq.c  Mon Mar 29 04:39:59 2004 +0000
+++ b/sys/netinet/tcp_usrreq.c  Mon Mar 29 04:59:02 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_usrreq.c,v 1.87 2004/03/24 15:34:54 atatat Exp $   */
+/*     $NetBSD: tcp_usrreq.c,v 1.88 2004/03/29 04:59:03 atatat Exp $   */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -98,7 +98,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.87 2004/03/24 15:34:54 atatat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.88 2004/03/29 04:59:03 atatat Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -1070,10 +1070,8 @@
        struct in6pcb *in6b;
        struct sockaddr_in6 *si6[2];
 #endif /* INET6 */
-       struct in_addr laddr, raddr;
        struct sockaddr_storage sa[2];
        struct socket *sockp;
-       u_int lport, rport;
        size_t sz;
        uid_t uid;
        int error, pf;
@@ -1087,6 +1085,9 @@
        /* old style lookup, ipv4 only */
        if (namelen == 4) {
 #ifdef INET
+               struct in_addr laddr, raddr;
+               u_int lport, rport;
+
                if (pf != PF_INET)
                        return (EPROTONOSUPPORT);
                raddr.s_addr = (uint32_t)name[0];
diff -r bd51c78ecb96 -r 1808f71bde7d sys/netinet6/in6_pcb.c
--- a/sys/netinet6/in6_pcb.c    Mon Mar 29 04:39:59 2004 +0000
+++ b/sys/netinet6/in6_pcb.c    Mon Mar 29 04:59:02 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in6_pcb.c,v 1.61 2004/01/13 06:17:14 itojun Exp $      */
+/*     $NetBSD: in6_pcb.c,v 1.62 2004/03/29 04:59:03 atatat Exp $      */
 /*     $KAME: in6_pcb.c,v 1.84 2001/02/08 18:02:08 itojun Exp $        */
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.61 2004/01/13 06:17:14 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.62 2004/03/29 04:59:03 atatat Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -1009,7 +1009,7 @@
        struct inpcb_hdr *inph;
        struct in6pcb *in6p;
        u_int16_t lport = lport_arg;
-#ifdef INET6
+#ifdef INET
        struct in6_addr zero_mapped;
 #endif