Module Name: src Committed By: snj Date: Sun Feb 11 21:17:35 UTC 2018
Modified Files: src/distrib/sets/lists/base [netbsd-8]: shl.mi src/distrib/sets/lists/comp [netbsd-8]: mi shl.mi src/distrib/sets/lists/debug [netbsd-8]: mi shl.mi src/distrib/sets/lists/man [netbsd-8]: mi src/distrib/sets/lists/tests [netbsd-8]: mi src/etc/mtree [netbsd-8]: NetBSD.dist.tests src/share/man/man4 [netbsd-8]: Makefile ipsec.4 src/sys/arch/amd64/conf [netbsd-8]: ALL GENERIC src/sys/conf [netbsd-8]: files src/sys/net [netbsd-8]: Makefile files.net if.c if.h if_gif.c if_l2tp.c if_types.h src/sys/netinet [netbsd-8]: in.c in.h in_gif.c ip_var.h src/sys/netinet6 [netbsd-8]: in6.c in6.h in6_gif.c ip6_var.h src/sys/netipsec [netbsd-8]: Makefile files.netipsec ipsec.h key.c key.h src/sys/rump/net [netbsd-8]: Makefile.rumpnetcomp src/tests/net [netbsd-8]: Makefile Added Files: src/share/man/man4 [netbsd-8]: ipsecif.4 src/sys/net [netbsd-8]: if_ipsec.c if_ipsec.h src/sys/netipsec [netbsd-8]: ipsecif.c ipsecif.h src/sys/rump/net/lib/libipsec [netbsd-8]: IPSEC.ioconf Makefile ipsec_component.c src/tests/net/if_ipsec [netbsd-8]: Makefile t_ipsec.sh Log Message: Pull up following revision(s) (requested by ozaki-r in ticket #536): distrib/sets/lists/base/shl.mi: 1.825 distrib/sets/lists/comp/mi: 1.2168-1.2169 distrib/sets/lists/comp/shl.mi: 1.310 distrib/sets/lists/debug/mi: 1.234 distrib/sets/lists/debug/shl.mi: 1.188 distrib/sets/lists/man/mi: 1.1570 distrib/sets/lists/tests/mi: 1.772 etc/mtree/NetBSD.dist.tests: 1.150 share/man/man4/Makefile: 1.650 share/man/man4/ipsec.4: 1.42-1.43 share/man/man4/ipsecif.4: 1.1-1.5 sys/arch/amd64/conf/ALL: 1.77 sys/arch/amd64/conf/GENERIC: 1.480 sys/conf/files: 1.1191 sys/net/Makefile: 1.34 sys/net/files.net: 1.14 sys/net/if.c: 1.404 sys/net/if.h: 1.248 sys/net/if_gif.c: 1.135 sys/net/if_ipsec.c: 1.1-1.3 sys/net/if_ipsec.h: 1.1 sys/net/if_l2tp.c: 1.16 sys/net/if_types.h: 1.28 sys/netinet/in.c: 1.214 sys/netinet/in.h: 1.103 sys/netinet/in_gif.c: 1.92 sys/netinet/ip_var.h: 1.122 sys/netinet6/in6.c: 1.257 sys/netinet6/in6.h: 1.88 sys/netinet6/in6_gif.c: 1.90 sys/netinet6/ip6_var.h: 1.75 sys/netipsec/Makefile: 1.6 sys/netipsec/files.netipsec: 1.13 sys/netipsec/ipsec.h: 1.62 sys/netipsec/ipsecif.c: 1.1 sys/netipsec/ipsecif.h: 1.1 sys/netipsec/key.c: 1.246-1.247 sys/netipsec/key.h: 1.34 sys/rump/net/Makefile.rumpnetcomp: 1.20 sys/rump/net/lib/libipsec/IPSEC.ioconf: 1.1 sys/rump/net/lib/libipsec/Makefile: 1.1 sys/rump/net/lib/libipsec/ipsec_component.c: 1.1 tests/net/Makefile: 1.34 tests/net/if_ipsec/Makefile: 1.1 tests/net/if_ipsec/t_ipsec.sh: 1.1-1.2 Don't touch an SP without a reference to it unify processing to check nesting count for some tunnel protocols. add ipsec(4) interface, which is used for route-based VPN. man and ATF are added later, please see man for details. reviewed by christos@n.o, joerg@n.o and ozaki-r@n.o, thanks. https://mail-index.netbsd.org/tech-net/2017/12/18/msg006557.html ipsec(4) interface supports rump now. add ipsec(4) interface ATF. add ipsec(4) interface man as ipsecif.4. add ipsec(4) interface to amd64/GENERIC and amd64/ALL configs. apply in{,6}_tunnel_validate() to gif(4). Spell IPsec that way. Simplify macro usage. Sort SEE ALSO. Bump date for previous. Improve wording and macro use. Some parts are not clear to me, so someone with knowledge of ipsecif(4) should improve this some more. Improve ipsecif.4. Default port ipsec(4) NAT-T is tested now. pointed out by wiz@n.o and suggested by ozaki-r@n.o, thanks. Change the prefix of test names to ipsecif_ to distinguish from tests for ipsec(4) New sentence, new line. Remove empty macro. Fix PR kern/52920. Pointed out by David Binderman, thanks. Improve wording, and put a new drawing, from me and Kengo Nakahara. apply a little more #ifdef INET/INET6. fixes !INET6 builds. To generate a diff of this commit: cvs rdiff -u -r1.817.2.3 -r1.817.2.4 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.2138.2.4 -r1.2138.2.5 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.306.2.2 -r1.306.2.3 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.216.2.8 -r1.216.2.9 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.176.2.5 -r1.176.2.6 src/distrib/sets/lists/debug/shl.mi cvs rdiff -u -r1.1557.2.1 -r1.1557.2.2 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.752.2.8 -r1.752.2.9 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.147.2.2 -r1.147.2.3 src/etc/mtree/NetBSD.dist.tests cvs rdiff -u -r1.637 -r1.637.2.1 src/share/man/man4/Makefile cvs rdiff -u -r1.41 -r1.41.2.1 src/share/man/man4/ipsec.4 cvs rdiff -u -r0 -r1.5.2.2 src/share/man/man4/ipsecif.4 cvs rdiff -u -r1.59.2.2 -r1.59.2.3 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.459.2.4 -r1.459.2.5 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.1173.2.3 -r1.1173.2.4 src/sys/conf/files cvs rdiff -u -r1.33 -r1.33.6.1 src/sys/net/Makefile cvs rdiff -u -r1.13 -r1.13.6.1 src/sys/net/files.net cvs rdiff -u -r1.394.2.7 -r1.394.2.8 src/sys/net/if.c cvs rdiff -u -r1.239.2.3 -r1.239.2.4 src/sys/net/if.h cvs rdiff -u -r1.126.2.7 -r1.126.2.8 src/sys/net/if_gif.c cvs rdiff -u -r0 -r1.3.2.2 src/sys/net/if_ipsec.c cvs rdiff -u -r0 -r1.1.2.2 src/sys/net/if_ipsec.h cvs rdiff -u -r1.11.2.3 -r1.11.2.4 src/sys/net/if_l2tp.c cvs rdiff -u -r1.27 -r1.27.6.1 src/sys/net/if_types.h cvs rdiff -u -r1.203.2.7 -r1.203.2.8 src/sys/netinet/in.c cvs rdiff -u -r1.100.6.1 -r1.100.6.2 src/sys/netinet/in.h cvs rdiff -u -r1.87.8.3 -r1.87.8.4 src/sys/netinet/in_gif.c cvs rdiff -u -r1.119.6.1 -r1.119.6.2 src/sys/netinet/ip_var.h cvs rdiff -u -r1.245.2.6 -r1.245.2.7 src/sys/netinet6/in6.c cvs rdiff -u -r1.87 -r1.87.10.1 src/sys/netinet6/in6.h cvs rdiff -u -r1.85.6.3 -r1.85.6.4 src/sys/netinet6/in6_gif.c cvs rdiff -u -r1.74.6.1 -r1.74.6.2 src/sys/netinet6/ip6_var.h cvs rdiff -u -r1.5 -r1.5.40.1 src/sys/netipsec/Makefile cvs rdiff -u -r1.12 -r1.12.26.1 src/sys/netipsec/files.netipsec cvs rdiff -u -r1.50.2.1 -r1.50.2.2 src/sys/netipsec/ipsec.h cvs rdiff -u -r0 -r1.1.2.2 src/sys/netipsec/ipsecif.c \ src/sys/netipsec/ipsecif.h cvs rdiff -u -r1.163.2.5 -r1.163.2.6 src/sys/netipsec/key.c cvs rdiff -u -r1.19.2.2 -r1.19.2.3 src/sys/netipsec/key.h cvs rdiff -u -r1.19 -r1.19.2.1 src/sys/rump/net/Makefile.rumpnetcomp cvs rdiff -u -r0 -r1.1.2.2 src/sys/rump/net/lib/libipsec/IPSEC.ioconf \ src/sys/rump/net/lib/libipsec/Makefile \ src/sys/rump/net/lib/libipsec/ipsec_component.c cvs rdiff -u -r1.33 -r1.33.2.1 src/tests/net/Makefile cvs rdiff -u -r0 -r1.1.2.2 src/tests/net/if_ipsec/Makefile cvs rdiff -u -r0 -r1.3.2.2 src/tests/net/if_ipsec/t_ipsec.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.