Module Name: src
Committed By: drochner
Date: Mon Dec 19 16:10:08 UTC 2011
Modified Files:
src/sys/conf: files
src/sys/dist/ipf/netinet: ip_fil_netbsd.c
src/sys/dist/pf/net: if_pfsync.c pf.c
Log Message:
do missing ipsec->kame_ipsec renames
To generate a diff of this commit:
cvs rdiff -u -r1.1033 -r1.1034 src/sys/conf/files
cvs rdiff -u -r1.56 -r1.57 src/sys/dist/ipf/netinet/ip_fil_netbsd.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dist/pf/net/if_pfsync.c
cvs rdiff -u -r1.67 -r1.68 src/sys/dist/pf/net/pf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1033 src/sys/conf/files:1.1034
--- src/sys/conf/files:1.1033 Sat Dec 17 20:05:38 2011
+++ src/sys/conf/files Mon Dec 19 16:10:07 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1033 2011/12/17 20:05:38 tls Exp $
+# $NetBSD: files,v 1.1034 2011/12/19 16:10:07 drochner Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20100430
@@ -1676,7 +1676,7 @@ file net/route.c
file net/rtbl.c
file net/rtsock.c
file net/slcompress.c sl | ppp | strip | (irip & irip_vj)
-file net/zlib.c (ppp & ppp_deflate) | ipsec | opencrypto | vnd_compression
+file net/zlib.c (ppp & ppp_deflate) | kame_ipsec | opencrypto | vnd_compression
file netinet/accf_data.c accf_data
file netinet/accf_http.c accf_http
file netinet/cpu_in_cksum.c (inet | inet6) & !cpu_in_cksum
@@ -1686,7 +1686,7 @@ file netinet/in4_cksum.c inet
file netinet/in_cksum.c inet
file netinet/in_gif.c gif & inet
file netinet/ip_carp.c carp & (inet | inet6) needs-flag
-file netinet/ip_ecn.c ipsec | fast_ipsec | gif | stf
+file netinet/ip_ecn.c kame_ipsec | fast_ipsec | gif | stf
file netinet/ip_encap.c inet | inet6
file netinet/ip_etherip.c etherip & inet
file netinet6/ip6_etherip.c etherip & inet6
Index: src/sys/dist/ipf/netinet/ip_fil_netbsd.c
diff -u src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.56 src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.57
--- src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.56 Sun Sep 5 12:36:46 2010
+++ src/sys/dist/ipf/netinet/ip_fil_netbsd.c Mon Dec 19 16:10:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_fil_netbsd.c,v 1.56 2010/09/05 12:36:46 mlelstv Exp $ */
+/* $NetBSD: ip_fil_netbsd.c,v 1.57 2011/12/19 16:10:07 drochner Exp $ */
/*
* Copyright (C) 1993-2003 by Darren Reed.
@@ -8,7 +8,7 @@
#if !defined(lint)
#if defined(__NetBSD__)
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.56 2010/09/05 12:36:46 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.57 2011/12/19 16:10:07 drochner 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_netbsd.c,v 2.55.2.67 2009/12/19 05:41:08 darrenr Exp";
@@ -986,7 +986,7 @@ mb_t *m, **mpp;
default :
return EINVAL;
}
-#ifdef IPSEC
+#ifdef KAME_IPSEC
m->m_pkthdr.rcvif = NULL;
#endif
Index: src/sys/dist/pf/net/if_pfsync.c
diff -u src/sys/dist/pf/net/if_pfsync.c:1.7 src/sys/dist/pf/net/if_pfsync.c:1.8
--- src/sys/dist/pf/net/if_pfsync.c:1.7 Fri Nov 5 01:35:58 2010
+++ src/sys/dist/pf/net/if_pfsync.c Mon Dec 19 16:10:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pfsync.c,v 1.7 2010/11/05 01:35:58 rmind Exp $ */
+/* $NetBSD: if_pfsync.c,v 1.8 2011/12/19 16:10:07 drochner Exp $ */
/* $OpenBSD: if_pfsync.c,v 1.83 2007/06/26 14:44:12 mcbride Exp $ */
/*
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pfsync.c,v 1.7 2010/11/05 01:35:58 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pfsync.c,v 1.8 2011/12/19 16:10:07 drochner Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -361,7 +361,7 @@ pfsync_input(struct mbuf *m, ...)
struct pfsync_state_clr *cp;
struct pfsync_state_upd_req *rup;
struct pfsync_state_bus *bus;
-#ifdef IPSEC
+#ifdef KAME_IPSEC
struct pfsync_tdb *pt;
#endif
struct in_addr src;
@@ -849,7 +849,7 @@ pfsync_input(struct mbuf *m, ...)
break;
}
break;
-#ifdef IPSEC
+#ifdef KAME_IPSEC
case PFSYNC_ACT_TDB_UPD:
if ((mp = m_pulldown(m, iplen + sizeof(*ph),
count * sizeof(*pt), &offp)) == NULL) {
@@ -1624,7 +1624,7 @@ pfsync_sendout_mbuf(struct pfsync_softc
return (0);
}
-#ifdef IPSEC
+#ifdef KAME_IPSEC
/* Update an in-kernel tdb. Silently fail if no tdb is found. */
void
pfsync_update_net_tdb(struct pfsync_tdb *pt)
Index: src/sys/dist/pf/net/pf.c
diff -u src/sys/dist/pf/net/pf.c:1.67 src/sys/dist/pf/net/pf.c:1.68
--- src/sys/dist/pf/net/pf.c:1.67 Sat Nov 19 22:51:24 2011
+++ src/sys/dist/pf/net/pf.c Mon Dec 19 16:10:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pf.c,v 1.67 2011/11/19 22:51:24 tls Exp $ */
+/* $NetBSD: pf.c,v 1.68 2011/12/19 16:10:07 drochner Exp $ */
/* $OpenBSD: pf.c,v 1.552.2.1 2007/11/27 16:37:57 henning Exp $ */
/*
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pf.c,v 1.67 2011/11/19 22:51:24 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pf.c,v 1.68 2011/12/19 16:10:07 drochner Exp $");
#include "pflog.h"
@@ -5237,9 +5237,9 @@ pf_route(struct mbuf **m, struct pf_rule
struct pf_addr naddr;
struct pf_src_node *sn = NULL;
int error = 0;
-#ifdef IPSEC
+#ifdef KAME_IPSEC
struct m_tag *mtag;
-#endif /* IPSEC */
+#endif /* KAME_IPSEC */
#ifdef __NetBSD__
struct pf_mtag *pf_mtag;
#endif /* __NetBSD__ */
@@ -5342,7 +5342,7 @@ pf_route(struct mbuf **m, struct pf_rule
}
/* Copied from ip_output. */
-#ifdef IPSEC
+#ifdef KAME_IPSEC
/*
* If deferred crypto processing is needed, check that the
* interface supports it.
@@ -5353,7 +5353,7 @@ pf_route(struct mbuf **m, struct pf_rule
ipsp_skipcrypto_unmark((struct tdb_ident *)(mtag + 1));
goto bad;
}
-#endif /* IPSEC */
+#endif /* KAME_IPSEC */
/* Catch routing changes wrt. hardware checksumming for TCP or UDP. */
#ifdef __NetBSD__
