From owner-cvs-all Mon Jun 11 5:39:57 2001 Delivered-To: cvs-all@freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 79A0237B403; Mon, 11 Jun 2001 05:39:30 -0700 (PDT) (envelope-from ume@FreeBSD.org) Received: (from ume@localhost) by freefall.freebsd.org (8.11.3/8.11.3) id f5BCdUg44076; Mon, 11 Jun 2001 05:39:30 -0700 (PDT) (envelope-from ume) Message-Id: <200106111239.f5BCdUg44076@freefall.freebsd.org> From: Hajimu UMEMOTO Date: Mon, 11 Jun 2001 05:39:29 -0700 (PDT) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/etc rc.network rc.network6 src/lib/libipsec ipsec_set_policy.3 ipsec_strerror.3 ipsec_strerror.c ipsec_strerror.h libpfkey.h pfkey.c pfkey_dump.c policy_token.l test-policy.c src/sbin/ifconfig ifconfig.8 ifconfig.c ... X-FreeBSD-CVS-Branch: HEAD Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG ume 2001/06/11 05:39:29 PDT Modified files: etc rc.network rc.network6 lib/libipsec ipsec_set_policy.3 ipsec_strerror.3 ipsec_strerror.c ipsec_strerror.h libpfkey.h pfkey.c pfkey_dump.c policy_token.l test-policy.c sbin/ifconfig ifconfig.8 ifconfig.c sbin/ping6 ping6.8 ping6.c sbin/route route.c sbin/rtsol Makefile share/doc/IPv6 IMPLEMENTATION share/examples/IPv6 USAGE share/man/man4 faith.4 gif.4 inet6.4 ip6.4 ipsec.4 kame.4 stf.4 sys/conf files sys/crypto md5.c sha1.c sys/crypto/blowfish bf_enc.c bf_locl.h bf_skey.c blowfish.h sys/crypto/cast128 cast128.c cast128.h sys/crypto/des des.h des_ecb.c des_locl.h des_setkey.c sys/crypto/rijndael boxes-fst.dat rijndael-alg-fst.c rijndael-alg-fst.h rijndael-api-fst.c rijndael-api-fst.h rijndael_local.h sys/kern uipc_domain.c uipc_mbuf.c uipc_mbuf2.c sys/net if.c if_faith.c if_gif.c if_gif.h if_loop.c if_sppp.h if_spppsubr.c if_stf.c net_osdep.c net_osdep.h pfkeyv2.h ppp_defs.h rtsock.c sys/netinet icmp6.h in.c in_gif.c in_pcb.c in_pcb.h in_proto.c ip6.h ip_ecn.c ip_ecn.h ip_encap.c ip_icmp.c ip_input.c ip_output.c ip_var.h raw_ip.c tcp_input.c tcp_output.c tcp_subr.c tcp_usrreq.c udp_usrreq.c sys/netinet6 ah.h ah6.h ah_core.c ah_input.c ah_output.c dest6.c esp.h esp6.h esp_core.c esp_input.c esp_output.c frag6.c icmp6.c in6.c in6.h in6_cksum.c in6_gif.c in6_ifattach.c in6_ifattach.h in6_pcb.c in6_pcb.h in6_prefix.c in6_prefix.h in6_proto.c in6_rmx.c in6_src.c in6_var.h ip6_ecn.h ip6_forward.c ip6_fw.c ip6_fw.h ip6_input.c ip6_mroute.c ip6_mroute.h ip6_output.c ip6_var.h ip6protosw.h ipcomp.h ipcomp6.h ipcomp_core.c ipcomp_input.c ipcomp_output.c ipsec.c ipsec.h ipsec6.h mld6.c nd6.c nd6.h nd6_nbr.c nd6_rtr.c raw_ip6.c route6.c scope6.c udp6_output.c udp6_usrreq.c sys/netkey key.c key.h key_debug.c key_debug.h key_var.h keydb.h keysock.c sys/netsmb smb_crypt.c sys/sys mbuf.h protosw.h socket.h sockio.h usr.bin/netstat inet.c inet6.c ipsec.c main.c mroute6.c netstat.h route.c usr.sbin/faithd Makefile README faithd.8 faithd.c faithd.h ftp.c rsh.c tcp.c usr.sbin/gifconfig gifconfig.8 gifconfig.c usr.sbin/ifmcstat ifmcstat.8 ifmcstat.c usr.sbin/mld6query mld6.c mld6query.8 usr.sbin/ndp ndp.8 ndp.c usr.sbin/prefix Makefile usr.sbin/rip6query rip6query.8 rip6query.c usr.sbin/route6d route6d.8 route6d.c route6d.h usr.sbin/rrenumd lexer.l parser.y rrenumd.8 rrenumd.c rrenumd.conf.5 rrenumd.h usr.sbin/rtadvd advcap.c advcap.h config.c config.h dump.c dump.h if.c if.h pathnames.h rrenum.c rrenum.h rtadvd.8 rtadvd.c rtadvd.conf.5 rtadvd.h timer.c timer.h usr.sbin/rtsold Makefile dump.c if.c probe.c rtsol.c rtsold.8 rtsold.c rtsold.h usr.sbin/setkey parse.y scriptdump.pl setkey.8 setkey.c token.l usr.sbin/traceroute6 traceroute6.8 traceroute6.c Added files: sys/crypto/sha2 sha2.c sha2.h sys/net if_faith.h sys/netinet6 esp_rijndael.c esp_rijndael.h raw_ip6.h usr.sbin/faithd prefix.c prefix.h usr.sbin/prefix prefix.sh usr.sbin/rtsold rtsock.c Removed files: sys/crypto/blowfish bf_cbc.c bf_cbc_m.c sys/crypto/cast128 cast128_cbc.c sys/crypto/des des_3cbc.c des_cbc.c sys/crypto/rc5 rc5.c rc5.h rc5_cbc.c usr.sbin/prefix prefix.c Log: Sync with recent KAME. This work was based on kame-20010528-freebsd43-snap.tgz and some critical problem after the snap was out were fixed. There are many many changes since last KAME merge. TODO: - The definitions of SADB_* in sys/net/pfkeyv2.h are still different from RFC2407/IANA assignment because of binary compatibility issue. It should be fixed under 5-CURRENT. - ip6po_m member of struct ip6_pktopts is no longer used. But, it is still there because of binary compatibility issue. It should be removed under 5-CURRENT. Reviewed by: itojun Obtained from: KAME MFC after: 3 weeks Revision Changes Path 1.98 +2 -2 src/etc/rc.network 1.20 +7 -21 src/etc/rc.network6 1.8 +28 -11 src/lib/libipsec/ipsec_set_policy.3 1.7 +15 -14 src/lib/libipsec/ipsec_strerror.3 1.3 +5 -5 src/lib/libipsec/ipsec_strerror.c 1.3 +3 -3 src/lib/libipsec/ipsec_strerror.h 1.2 +15 -2 src/lib/libipsec/libpfkey.h 1.3 +643 -130 src/lib/libipsec/pfkey.c 1.3 +103 -33 src/lib/libipsec/pfkey_dump.c 1.5 +3 -3 src/lib/libipsec/policy_token.l 1.4 +23 -6 src/lib/libipsec/test-policy.c 1.42 +14 -1 src/sbin/ifconfig/ifconfig.8 1.63 +220 -13 src/sbin/ifconfig/ifconfig.c 1.10 +50 -17 src/sbin/ping6/ping6.8 1.9 +1167 -434 src/sbin/ping6/ping6.c 1.48 +114 -120 src/sbin/route/route.c 1.4 +2 -4 src/sbin/rtsol/Makefile 1.3 +498 -161 src/share/doc/IPv6/IMPLEMENTATION 1.3 +197 -331 src/share/examples/IPv6/USAGE 1.10 +36 -41 src/share/man/man4/faith.4 1.9 +36 -86 src/share/man/man4/gif.4 1.8 +40 -53 src/share/man/man4/inet6.4 1.8 +21 -19 src/share/man/man4/ip6.4 1.9 +3 -3 src/share/man/man4/ipsec.4 1.8 +6 -1 src/share/man/man4/kame.4 1.8 +61 -11 src/share/man/man4/stf.4 1.534 +6 -9 src/sys/conf/files 1.4 +2 -2 src/sys/crypto/md5.c 1.7 +2 -2 src/sys/crypto/sha1.c 1.4 +64 -64 src/sys/crypto/blowfish/bf_enc.c 1.4 +36 -28 src/sys/crypto/blowfish/bf_locl.h 1.4 +47 -50 src/sys/crypto/blowfish/bf_skey.c 1.4 +8 -43 src/sys/crypto/blowfish/blowfish.h 1.4 +2 -2 src/sys/crypto/cast128/cast128.c 1.4 +2 -6 src/sys/crypto/cast128/cast128.h 1.4 +14 -195 src/sys/crypto/des/des.h 1.4 +4 -2 src/sys/crypto/des/des_ecb.c 1.5 +2 -105 src/sys/crypto/des/des_locl.h 1.4 +5 -7 src/sys/crypto/des/des_setkey.c 1.2 +59 -17 src/sys/crypto/rijndael/boxes-fst.dat 1.2 +51 -6 src/sys/crypto/rijndael/rijndael-alg-fst.c 1.2 +2 -1 src/sys/crypto/rijndael/rijndael-alg-fst.h 1.2 +8 -44 src/sys/crypto/rijndael/rijndael-api-fst.c 1.2 +7 -2 src/sys/crypto/rijndael/rijndael-api-fst.h 1.3 +1 -3 src/sys/crypto/rijndael/rijndael_local.h 1.24 +27 -1 src/sys/kern/uipc_domain.c 1.82 +1 -10 src/sys/kern/uipc_mbuf.c 1.8 +105 -43 src/sys/kern/uipc_mbuf2.c 1.109 +16 -7 src/sys/net/if.c 1.5 +235 -8 src/sys/net/if_faith.c 1.10 +131 -55 src/sys/net/if_gif.c 1.4 +2 -4 src/sys/net/if_gif.h 1.61 +18 -13 src/sys/net/if_loop.c 1.17 +11 -5 src/sys/net/if_sppp.h 1.68 +774 -23 src/sys/net/if_spppsubr.c 1.7 +63 -32 src/sys/net/if_stf.c 1.4 +14 -6 src/sys/net/net_osdep.c 1.5 +100 -13 src/sys/net/net_osdep.h 1.6 +29 -19 src/sys/net/pfkeyv2.h 1.7 +3 -1 src/sys/net/ppp_defs.h 1.52 +12 -5 src/sys/net/rtsock.c 1.4 +83 -34 src/sys/netinet/icmp6.h 1.54 +4 -21 src/sys/netinet/in.c 1.10 +26 -37 src/sys/netinet/in_gif.c 1.84 +9 -10 src/sys/netinet/in_pcb.c 1.38 +18 -16 src/sys/netinet/in_pcb.h 1.56 +18 -11 src/sys/netinet/in_proto.c 1.5 +25 -13 src/sys/netinet/ip6.h 1.4 +7 -16 src/sys/netinet/ip_ecn.c 1.4 +8 -4 src/sys/netinet/ip_ecn.h 1.4 +14 -2 src/sys/netinet/ip_encap.c 1.57 +1 -10 src/sys/netinet/ip_icmp.c 1.171 +54 -14 src/sys/netinet/ip_input.c 1.126 +180 -135 src/sys/netinet/ip_output.c 1.56 +5 -1 src/sys/netinet/ip_var.h 1.78 +26 -5 src/sys/netinet/raw_ip.c 1.132 +80 -31 src/sys/netinet/tcp_input.c 1.50 +7 -3 src/sys/netinet/tcp_output.c 1.103 +29 -38 src/sys/netinet/tcp_subr.c 1.60 +9 -6 src/sys/netinet/tcp_usrreq.c 1.89 +6 -4 src/sys/netinet/udp_usrreq.c 1.5 +10 -6 src/sys/netinet6/ah.h 1.4 +5 -3 src/sys/netinet6/ah6.h 1.8 +513 -34 src/sys/netinet6/ah_core.c 1.7 +147 -59 src/sys/netinet6/ah_input.c 1.7 +33 -11 src/sys/netinet6/ah_output.c 1.6 +18 -11 src/sys/netinet6/dest6.c 1.4 +22 -14 src/sys/netinet6/esp.h 1.4 +4 -2 src/sys/netinet6/esp6.h 1.5 +719 -874 src/sys/netinet6/esp_core.c 1.7 +229 -37 src/sys/netinet6/esp_input.c 1.5 +107 -79 src/sys/netinet6/esp_output.c 1.8 +16 -13 src/sys/netinet6/frag6.c 1.11 +652 -395 src/sys/netinet6/icmp6.c 1.12 +983 -556 src/sys/netinet6/in6.c 1.13 +119 -66 src/sys/netinet6/in6.h 1.4 +6 -6 src/sys/netinet6/in6_cksum.c 1.5 +32 -43 src/sys/netinet6/in6_gif.c 1.6 +386 -370 src/sys/netinet6/in6_ifattach.c 1.3 +5 -2 src/sys/netinet6/in6_ifattach.h 1.15 +80 -67 src/sys/netinet6/in6_pcb.c 1.4 +3 -8 src/sys/netinet6/in6_pcb.h 1.7 +31 -16 src/sys/netinet6/in6_prefix.c 1.5 +5 -2 src/sys/netinet6/in6_prefix.h 1.14 +75 -165 src/sys/netinet6/in6_proto.c 1.4 +2 -19 src/sys/netinet6/in6_rmx.c 1.4 +24 -15 src/sys/netinet6/in6_src.c 1.8 +35 -11 src/sys/netinet6/in6_var.h 1.4 +3 -3 src/sys/netinet6/ip6_ecn.h 1.11 +55 -38 src/sys/netinet6/ip6_forward.c 1.11 +9 -8 src/sys/netinet6/ip6_fw.c 1.11 +2 -2 src/sys/netinet6/ip6_fw.h 1.27 +560 -283 src/sys/netinet6/ip6_input.c 1.7 +132 -114 src/sys/netinet6/ip6_mroute.c 1.4 +4 -4 src/sys/netinet6/ip6_mroute.h 1.25 +560 -248 src/sys/netinet6/ip6_output.c 1.7 +78 -12 src/sys/netinet6/ip6_var.h 1.6 +24 -2 src/sys/netinet6/ip6protosw.h 1.2 +7 -3 src/sys/netinet6/ipcomp.h 1.2 +2 -2 src/sys/netinet6/ipcomp6.h 1.2 +131 -91 src/sys/netinet6/ipcomp_core.c 1.2 +57 -105 src/sys/netinet6/ipcomp_input.c 1.2 +41 -87 src/sys/netinet6/ipcomp_output.c 1.12 +621 -391 src/sys/netinet6/ipsec.c 1.8 +41 -10 src/sys/netinet6/ipsec.h 1.5 +6 -3 src/sys/netinet6/ipsec6.h 1.7 +32 -29 src/sys/netinet6/mld6.c 1.9 +510 -322 src/sys/netinet6/nd6.c 1.7 +88 -19 src/sys/netinet6/nd6.h 1.9 +158 -94 src/sys/netinet6/nd6_nbr.c 1.7 +904 -535 src/sys/netinet6/nd6_rtr.c 1.11 +68 -42 src/sys/netinet6/raw_ip6.c 1.4 +22 -6 src/sys/netinet6/route6.c 1.2 +3 -2 src/sys/netinet6/scope6.c 1.3 +52 -17 src/sys/netinet6/udp6_output.c 1.15 +41 -51 src/sys/netinet6/udp6_usrreq.c 1.25 +733 -244 src/sys/netkey/key.c 1.7 +7 -2 src/sys/netkey/key.h 1.14 +3 -6 src/sys/netkey/key_debug.c 1.7 +9 -2 src/sys/netkey/key_debug.h 1.4 +38 -3 src/sys/netkey/key_var.h 1.6 +6 -9 src/sys/netkey/keydb.h 1.6 +10 -11 src/sys/netkey/keysock.c 1.2 +3 -3 src/sys/netsmb/smb_crypt.c 1.79 +26 -1 src/sys/sys/mbuf.h 1.33 +3 -1 src/sys/sys/protosw.h 1.54 +20 -8 src/sys/sys/socket.h 1.17 +3 -1 src/sys/sys/sockio.h 1.42 +2 -1 src/usr.bin/netstat/inet.c 1.10 +56 -1 src/usr.bin/netstat/inet6.c 1.2 +59 -43 src/usr.bin/netstat/ipsec.c 1.40 +3 -1 src/usr.bin/netstat/main.c 1.5 +2 -1 src/usr.bin/netstat/mroute6.c 1.21 +2 -1 src/usr.bin/netstat/netstat.h 1.50 +10 -3 src/usr.bin/netstat/route.c 1.6 +2 -2 src/usr.sbin/faithd/Makefile 1.4 +34 -18 src/usr.sbin/faithd/README 1.9 +113 -40 src/usr.sbin/faithd/faithd.8 1.7 +140 -51 src/usr.sbin/faithd/faithd.c 1.3 +7 -6 src/usr.sbin/faithd/faithd.h 1.5 +4 -3 src/usr.sbin/faithd/ftp.c 1.5 +2 -2 src/usr.sbin/faithd/rsh.c 1.3 +6 -5 src/usr.sbin/faithd/tcp.c 1.6 +7 -4 src/usr.sbin/gifconfig/gifconfig.8 1.4 +49 -13 src/usr.sbin/gifconfig/gifconfig.c 1.3 +27 -15 src/usr.sbin/ifmcstat/ifmcstat.8 1.7 +7 -1 src/usr.sbin/ifmcstat/ifmcstat.c 1.2 +6 -3 src/usr.sbin/mld6query/mld6.c 1.2 +3 -1 src/usr.sbin/mld6query/mld6query.8 1.6 +12 -11 src/usr.sbin/ndp/ndp.8 1.6 +328 -38 src/usr.sbin/ndp/ndp.c 1.4 +4 -3 src/usr.sbin/prefix/Makefile 1.4 +3 -2 src/usr.sbin/rip6query/rip6query.8 1.5 +7 -3 src/usr.sbin/rip6query/rip6query.c 1.6 +7 -4 src/usr.sbin/route6d/route6d.8 1.9 +649 -355 src/usr.sbin/route6d/route6d.c 1.3 +4 -2 src/usr.sbin/route6d/route6d.h 1.3 +12 -3 src/usr.sbin/rrenumd/lexer.l 1.3 +30 -22 src/usr.sbin/rrenumd/parser.y 1.6 +21 -7 src/usr.sbin/rrenumd/rrenumd.8 1.4 +47 -19 src/usr.sbin/rrenumd/rrenumd.c 1.10 +74 -35 src/usr.sbin/rrenumd/rrenumd.conf.5 1.3 +2 -2 src/usr.sbin/rrenumd/rrenumd.h 1.4 +5 -5 src/usr.sbin/rtadvd/advcap.c 1.4 +3 -3 src/usr.sbin/rtadvd/advcap.h 1.7 +318 -80 src/usr.sbin/rtadvd/config.c 1.4 +2 -2 src/usr.sbin/rtadvd/config.h 1.3 +36 -8 src/usr.sbin/rtadvd/dump.c 1.3 +2 -2 src/usr.sbin/rtadvd/dump.h 1.6 +3 -14 src/usr.sbin/rtadvd/if.c 1.4 +19 -20 src/usr.sbin/rtadvd/if.h 1.5 +2 -2 src/usr.sbin/rtadvd/pathnames.h 1.5 +84 -14 src/usr.sbin/rtadvd/rrenum.c 1.4 +4 -5 src/usr.sbin/rtadvd/rrenum.h 1.8 +37 -10 src/usr.sbin/rtadvd/rtadvd.8 1.6 +169 -42 src/usr.sbin/rtadvd/rtadvd.c 1.6 +104 -2 src/usr.sbin/rtadvd/rtadvd.conf.5 1.4 +24 -3 src/usr.sbin/rtadvd/rtadvd.h 1.4 +2 -2 src/usr.sbin/rtadvd/timer.c 1.4 +2 -2 src/usr.sbin/rtadvd/timer.h 1.6 +2 -4 src/usr.sbin/rtsold/Makefile 1.4 +2 -2 src/usr.sbin/rtsold/dump.c 1.5 +9 -2 src/usr.sbin/rtsold/if.c 1.5 +2 -2 src/usr.sbin/rtsold/probe.c 1.4 +2 -2 src/usr.sbin/rtsold/rtsol.c 1.5 +24 -20 src/usr.sbin/rtsold/rtsold.8 1.4 +28 -7 src/usr.sbin/rtsold/rtsold.c 1.4 +6 -2 src/usr.sbin/rtsold/rtsold.h 1.3 +60 -29 src/usr.sbin/setkey/parse.y 1.3 +3 -3 src/usr.sbin/setkey/scriptdump.pl 1.14 +115 -46 src/usr.sbin/setkey/setkey.8 1.3 +75 -5 src/usr.sbin/setkey/setkey.c 1.5 +22 -16 src/usr.sbin/setkey/token.l 1.7 +3 -1 src/usr.sbin/traceroute6/traceroute6.8 1.8 +67 -25 src/usr.sbin/traceroute6/traceroute6.c To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message