The NetBSD Project

CVS log for src/sys/netipsec/xform_ipip.c

[BACK] Up to [cvs.NetBSD.org] / src / sys / netipsec

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.78 / (download) - annotate - [select for diffs], Sun May 22 11:39:08 2022 UTC (22 months, 3 weeks ago) by riastradh
Branch: MAIN
CVS Tags: thorpej-ifq-base, thorpej-ifq, thorpej-altq-separation-base, thorpej-altq-separation, netbsd-10-base, netbsd-10-0-RELEASE, netbsd-10-0-RC6, netbsd-10-0-RC5, netbsd-10-0-RC4, netbsd-10-0-RC3, netbsd-10-0-RC2, netbsd-10-0-RC1, netbsd-10, bouyer-sunxi-drm-base, bouyer-sunxi-drm, HEAD
Changes since 1.77: +3 -4 lines
Diff to previous 1.77 (colored)

netipsec: Nothing uses xf_zeroize return value.  Nix it.

Revision 1.74.2.2 / (download) - annotate - [select for diffs], Mon Apr 13 08:05:17 2020 UTC (4 years ago) by martin
Branch: phil-wifi
Changes since 1.74.2.1: +20 -20 lines
Diff to previous 1.74.2.1 (colored) to branchpoint 1.74 (colored) next main 1.75 (colored)

Mostly merge changes from HEAD upto 20200411

Revision 1.77 / (download) - annotate - [select for diffs], Fri Nov 1 04:23:21 2019 UTC (4 years, 5 months ago) by knakahara
Branch: MAIN
CVS Tags: thorpej-i2c-spi-conf2-base, thorpej-i2c-spi-conf2, thorpej-i2c-spi-conf-base, thorpej-i2c-spi-conf, thorpej-futex2-base, thorpej-futex2, thorpej-futex-base, thorpej-futex, thorpej-cfargs2-base, thorpej-cfargs2, thorpej-cfargs-base, thorpej-cfargs, phil-wifi-20200421, phil-wifi-20200411, phil-wifi-20200406, phil-wifi-20191119, is-mlppp-base, is-mlppp, cjep_sun2x-base1, cjep_sun2x-base, cjep_sun2x, cjep_staticlib_x-base1, cjep_staticlib_x-base, cjep_staticlib_x, bouyer-xenpvh-base2, bouyer-xenpvh-base1, bouyer-xenpvh-base, bouyer-xenpvh, ad-namecache-base3, ad-namecache-base2, ad-namecache-base1, ad-namecache-base, ad-namecache
Changes since 1.76: +3 -3 lines
Diff to previous 1.76 (colored)

Fix ipsecif(4) IPV6_MINMTU does not work correctly.

Revision 1.76 / (download) - annotate - [select for diffs], Wed Jun 12 22:23:50 2019 UTC (4 years, 10 months ago) by christos
Branch: MAIN
CVS Tags: netbsd-9-base, netbsd-9-3-RELEASE, netbsd-9-2-RELEASE, netbsd-9-1-RELEASE, netbsd-9-0-RELEASE, netbsd-9-0-RC2, netbsd-9-0-RC1, netbsd-9
Changes since 1.75: +19 -19 lines
Diff to previous 1.75 (colored)

make DPRINTF use varyadic cpp macros, and merge with IPSECLOG.

Revision 1.74.2.1 / (download) - annotate - [select for diffs], Mon Jun 10 22:09:48 2019 UTC (4 years, 10 months ago) by christos
Branch: phil-wifi
Changes since 1.74: +2 -2 lines
Diff to previous 1.74 (colored)

Sync with HEAD

Revision 1.75 / (download) - annotate - [select for diffs], Sun Jan 27 02:08:48 2019 UTC (5 years, 2 months ago) by pgoyette
Branch: MAIN
CVS Tags: phil-wifi-20190609, isaki-audio2-base, isaki-audio2
Changes since 1.74: +2 -2 lines
Diff to previous 1.74 (colored)

Merge the [pgoyette-compat] branch

Revision 1.63.2.3 / (download) - annotate - [select for diffs], Mon May 21 04:36:16 2018 UTC (5 years, 10 months ago) by pgoyette
Branch: pgoyette-compat
CVS Tags: pgoyette-compat-merge-20190127
Changes since 1.63.2.2: +56 -47 lines
Diff to previous 1.63.2.2 (colored) to branchpoint 1.63 (colored) next main 1.64 (colored)

Sync with HEAD

Revision 1.74 / (download) - annotate - [select for diffs], Mon May 7 09:33:51 2018 UTC (5 years, 11 months ago) by maxv
Branch: MAIN
CVS Tags: phil-wifi-base, pgoyette-compat-20190127, pgoyette-compat-20190118, pgoyette-compat-1226, pgoyette-compat-1126, pgoyette-compat-1020, pgoyette-compat-0930, pgoyette-compat-0906, pgoyette-compat-0728, pgoyette-compat-0625, pgoyette-compat-0521
Branch point for: phil-wifi
Changes since 1.73: +10 -9 lines
Diff to previous 1.73 (colored)

Remove a dummy reference to XF_IP4, explain briefly why we don't use
ipe4_xformsw, and remove unused includes.

Revision 1.73 / (download) - annotate - [select for diffs], Mon May 7 09:25:04 2018 UTC (5 years, 11 months ago) by maxv
Branch: MAIN
Changes since 1.72: +3 -4 lines
Diff to previous 1.72 (colored)

Remove now unused 'isr', 'skip' and 'protoff' arguments from ipip_output.

Revision 1.72 / (download) - annotate - [select for diffs], Mon May 7 09:16:46 2018 UTC (5 years, 11 months ago) by maxv
Branch: MAIN
Changes since 1.71: +3 -3 lines
Diff to previous 1.71 (colored)

Remove unused 'mp' argument from all the xf_output functions. Also clean
up xform.h a bit.

Revision 1.71 / (download) - annotate - [select for diffs], Mon May 7 09:08:06 2018 UTC (5 years, 11 months ago) by maxv
Branch: MAIN
Changes since 1.70: +47 -38 lines
Diff to previous 1.70 (colored)

Clarify IPIP: ipe4_xformsw is not allowed to call ipip_output, so replace
the pointer by ipe4_output, which just panics. Group the ipe4_* functions
together. Localify other functions.

ok ozaki-r@

Revision 1.63.2.2 / (download) - annotate - [select for diffs], Wed May 2 07:20:24 2018 UTC (5 years, 11 months ago) by pgoyette
Branch: pgoyette-compat
Changes since 1.63.2.1: +5 -10 lines
Diff to previous 1.63.2.1 (colored) to branchpoint 1.63 (colored)

Synch with HEAD

Revision 1.70 / (download) - annotate - [select for diffs], Sun Apr 29 14:35:35 2018 UTC (5 years, 11 months ago) by maxv
Branch: MAIN
CVS Tags: pgoyette-compat-0502
Changes since 1.69: +2 -6 lines
Diff to previous 1.69 (colored)

Remove obsolete/dead code, the IP-in-IP encapsulation doesn't work this
way anymore (XF_IP4 partly dropped by FAST_IPSEC).

Revision 1.69 / (download) - annotate - [select for diffs], Sat Apr 28 15:45:16 2018 UTC (5 years, 11 months ago) by maxv
Branch: MAIN
Changes since 1.68: +2 -3 lines
Diff to previous 1.68 (colored)

Remove IPSEC_SPLASSERT_SOFTNET, it has always been a no-op.

Revision 1.68 / (download) - annotate - [select for diffs], Tue Apr 24 08:07:06 2018 UTC (5 years, 11 months ago) by maxv
Branch: MAIN
Changes since 1.67: +3 -3 lines
Diff to previous 1.67 (colored)

Remove the M_AUTHIPDGM flag. It is equivalent to M_AUTHIPHDR, both
are set in IPsec-AH, and they are always handled together.

Revision 1.67 / (download) - annotate - [select for diffs], Sun Apr 22 10:25:40 2018 UTC (5 years, 11 months ago) by maxv
Branch: MAIN
Changes since 1.66: +4 -4 lines
Diff to previous 1.66 (colored)

Rename ipip_allow->ipip_spoofcheck, and add net.inet.ipsec.ipip_spoofcheck.
Makes it simpler, and also fixes PR/39919.

Revision 1.63.2.1 / (download) - annotate - [select for diffs], Sun Apr 22 07:20:28 2018 UTC (5 years, 11 months ago) by pgoyette
Branch: pgoyette-compat
Changes since 1.63: +20 -24 lines
Diff to previous 1.63 (colored)

Sync with HEAD

Revision 1.66 / (download) - annotate - [select for diffs], Thu Apr 19 08:27:39 2018 UTC (5 years, 11 months ago) by maxv
Branch: MAIN
CVS Tags: pgoyette-compat-0422
Changes since 1.65: +3 -3 lines
Diff to previous 1.65 (colored)

Remove extra long file paths from the headers.

Revision 1.65 / (download) - annotate - [select for diffs], Thu Apr 19 08:16:44 2018 UTC (5 years, 11 months ago) by maxv
Branch: MAIN
Changes since 1.64: +10 -14 lines
Diff to previous 1.64 (colored)

Remove unused typedef, remove unused arguments from _ipip_input, sync
comment with reality, and change panic message.

Revision 1.64 / (download) - annotate - [select for diffs], Wed Apr 18 06:43:10 2018 UTC (5 years, 11 months ago) by maxv
Branch: MAIN
Changes since 1.63: +11 -11 lines
Diff to previous 1.63 (colored)

style

Revision 1.28.8.2 / (download) - annotate - [select for diffs], Tue Mar 13 17:18:15 2018 UTC (6 years, 1 month ago) by snj
Branch: netbsd-6
Changes since 1.28.8.1: +4 -3 lines
Diff to previous 1.28.8.1 (colored) to branchpoint 1.28 (colored) next main 1.29 (colored)

Pull up following revision(s) (requested by maxv in ticket #1532):
	sys/netipsec/xform_ah.c: 1.77 via patch
	sys/netipsec/xform_esp.c: 1.73 via patch
	sys/netipsec/xform_ipip.c: 1.56-1.57 via patch
Reinforce and clarify.
--
Add missing NULL check. Normally that's not triggerable remotely, since we
are guaranteed that 8 bytes are valid at mbuf+skip.
--
Fix use-after-free. There is a path where the mbuf gets pulled up without
a proper mtod afterwards:
218     ipo = mtod(m, struct ip *);
281     m = m_pullup(m, hlen);
232     ipo->ip_src.s_addr
Found by Mootja.
Meanwhile it seems to me that 'ipo' should be set to NULL if the inner
packet is IPv6, but I'll revisit that later.
--
As I said in my last commit in this file, ipo should be set to NULL;
otherwise the 'local address spoofing' check below is always wrong on
IPv6.

Revision 1.28.22.2 / (download) - annotate - [select for diffs], Tue Mar 13 17:18:14 2018 UTC (6 years, 1 month ago) by snj
Branch: netbsd-6-1
Changes since 1.28.22.1: +4 -3 lines
Diff to previous 1.28.22.1 (colored) to branchpoint 1.28 (colored) next main 1.29 (colored)

Pull up following revision(s) (requested by maxv in ticket #1532):
	sys/netipsec/xform_ah.c: 1.77 via patch
	sys/netipsec/xform_esp.c: 1.73 via patch
	sys/netipsec/xform_ipip.c: 1.56-1.57 via patch
Reinforce and clarify.
--
Add missing NULL check. Normally that's not triggerable remotely, since we
are guaranteed that 8 bytes are valid at mbuf+skip.
--
Fix use-after-free. There is a path where the mbuf gets pulled up without
a proper mtod afterwards:
218     ipo = mtod(m, struct ip *);
281     m = m_pullup(m, hlen);
232     ipo->ip_src.s_addr
Found by Mootja.
Meanwhile it seems to me that 'ipo' should be set to NULL if the inner
packet is IPv6, but I'll revisit that later.
--
As I said in my last commit in this file, ipo should be set to NULL;
otherwise the 'local address spoofing' check below is always wrong on
IPv6.

Revision 1.28.14.2 / (download) - annotate - [select for diffs], Tue Mar 13 17:18:12 2018 UTC (6 years, 1 month ago) by snj
Branch: netbsd-6-0
Changes since 1.28.14.1: +4 -3 lines
Diff to previous 1.28.14.1 (colored) to branchpoint 1.28 (colored) next main 1.29 (colored)

Pull up following revision(s) (requested by maxv in ticket #1532):
	sys/netipsec/xform_ah.c: 1.77 via patch
	sys/netipsec/xform_esp.c: 1.73 via patch
	sys/netipsec/xform_ipip.c: 1.56-1.57 via patch
Reinforce and clarify.
--
Add missing NULL check. Normally that's not triggerable remotely, since we
are guaranteed that 8 bytes are valid at mbuf+skip.
--
Fix use-after-free. There is a path where the mbuf gets pulled up without
a proper mtod afterwards:
218     ipo = mtod(m, struct ip *);
281     m = m_pullup(m, hlen);
232     ipo->ip_src.s_addr
Found by Mootja.
Meanwhile it seems to me that 'ipo' should be set to NULL if the inner
packet is IPv6, but I'll revisit that later.
--
As I said in my last commit in this file, ipo should be set to NULL;
otherwise the 'local address spoofing' check below is always wrong on
IPv6.

Revision 1.31.6.2 / (download) - annotate - [select for diffs], Thu Feb 15 17:52:52 2018 UTC (6 years, 1 month ago) by martin
Branch: netbsd-7-0
Changes since 1.31.6.1: +4 -3 lines
Diff to previous 1.31.6.1 (colored) to branchpoint 1.31 (colored) next main 1.32 (colored)

Pull up following revision(s) (requested by maxv in ticket #1569):
	sys/netipsec/xform_ah.c: revision 1.77, 1.81 (via patch)
	sys/netipsec/xform_esp.c: revision 1.73 (via patch)
	sys/netipsec/xform_ipip.c: revision 1.56, 1.57 (via patch)

Fix use-after-free. There is a path where the mbuf gets pulled up without
a proper mtod afterwards:

218     ipo = mtod(m, struct ip *);
281     m = m_pullup(m, hlen);
232     ipo->ip_src.s_addr

Found by Mootja.

Meanwhile it seems to me that 'ipo' should be set to NULL if the inner
packet is IPv6, but I'll revisit that later.

Reinforce and clarify.

Add missing NULL check. Normally that's not triggerable remotely, since we
are guaranteed that 8 bytes are valid at mbuf+skip.

As I said in my last commit in this file, ipo should be set to NULL;
otherwise the 'local address spoofing' check below is always wrong on
IPv6.

Make sure the Authentication Header fits the mbuf chain, otherwise panic.

Revision 1.31.10.2 / (download) - annotate - [select for diffs], Thu Feb 15 17:51:38 2018 UTC (6 years, 1 month ago) by martin
Branch: netbsd-7-1
CVS Tags: netbsd-7-1-2-RELEASE
Changes since 1.31.10.1: +4 -3 lines
Diff to previous 1.31.10.1 (colored) to branchpoint 1.31 (colored) next main 1.32 (colored)

Pull up following revision(s) (requested by maxv in ticket #1569):
	sys/netipsec/xform_ah.c: revision 1.77, 1.81 (via patch)
	sys/netipsec/xform_esp.c: revision 1.73 (via patch)
	sys/netipsec/xform_ipip.c: revision 1.56, 1.57 (via patch)

Fix use-after-free. There is a path where the mbuf gets pulled up without
a proper mtod afterwards:

218     ipo = mtod(m, struct ip *);
281     m = m_pullup(m, hlen);
232     ipo->ip_src.s_addr

Found by Mootja.

Meanwhile it seems to me that 'ipo' should be set to NULL if the inner
packet is IPv6, but I'll revisit that later.

Reinforce and clarify.

Add missing NULL check. Normally that's not triggerable remotely, since we
are guaranteed that 8 bytes are valid at mbuf+skip.

As I said in my last commit in this file, ipo should be set to NULL;
otherwise the 'local address spoofing' check below is always wrong on
IPv6.

Make sure the Authentication Header fits the mbuf chain, otherwise panic.

Revision 1.31.2.2 / (download) - annotate - [select for diffs], Thu Feb 15 17:01:42 2018 UTC (6 years, 1 month ago) by martin
Branch: netbsd-7
CVS Tags: netbsd-7-2-RELEASE
Changes since 1.31.2.1: +4 -3 lines
Diff to previous 1.31.2.1 (colored) to branchpoint 1.31 (colored) next main 1.32 (colored)

Pull up following revision(s) (requested by maxv in ticket #1569):
	sys/netipsec/xform_ah.c: revision 1.77, 1.81 (via patch)
	sys/netipsec/xform_esp.c: revision 1.73 (via patch)
	sys/netipsec/xform_ipip.c: revision 1.56, 1.57 (via patch)

Fix use-after-free. There is a path where the mbuf gets pulled up without
a proper mtod afterwards:

218     ipo = mtod(m, struct ip *);
281     m = m_pullup(m, hlen);
232     ipo->ip_src.s_addr

Found by Mootja.

Meanwhile it seems to me that 'ipo' should be set to NULL if the inner
packet is IPv6, but I'll revisit that later.

Reinforce and clarify.

Add missing NULL check. Normally that's not triggerable remotely, since we
are guaranteed that 8 bytes are valid at mbuf+skip.

As I said in my last commit in this file, ipo should be set to NULL;
otherwise the 'local address spoofing' check below is always wrong on
IPv6.

Make sure the Authentication Header fits the mbuf chain, otherwise panic.

Revision 1.28.14.1 / (download) - annotate - [select for diffs], Thu Feb 15 14:51:44 2018 UTC (6 years, 1 month ago) by martin
Branch: netbsd-6-0
Changes since 1.28: +3 -3 lines
Diff to previous 1.28 (colored)

Pull up following revision(s) (requested by maxv in ticket #1529):
	sys/netipsec/xform_ipip.c: revision 1.44 via patch

PR/52161: Ryota Ozaki: Fix AH tunnel ipsec for ipv6. Compute plen right,
don't forget to subtract the ipv6 header length.

Revision 1.28.22.1 / (download) - annotate - [select for diffs], Thu Feb 15 14:50:17 2018 UTC (6 years, 1 month ago) by martin
Branch: netbsd-6-1
Changes since 1.28: +3 -3 lines
Diff to previous 1.28 (colored)

Pull up following revision(s) (requested by maxv in ticket #1529):
	sys/netipsec/xform_ipip.c: revision 1.44 via patch

PR/52161: Ryota Ozaki: Fix AH tunnel ipsec for ipv6. Compute plen right,
don't forget to subtract the ipv6 header length.

Revision 1.28.8.1 / (download) - annotate - [select for diffs], Thu Feb 15 14:49:00 2018 UTC (6 years, 1 month ago) by martin
Branch: netbsd-6
Changes since 1.28: +3 -3 lines
Diff to previous 1.28 (colored)

Pull up following revision(s) (requested by maxv in ticket #1529):
	sys/netipsec/xform_ipip.c: revision 1.44 via patch

PR/52161: Ryota Ozaki: Fix AH tunnel ipsec for ipv6. Compute plen right,
don't forget to subtract the ipv6 header length.

Revision 1.31.6.1 / (download) - annotate - [select for diffs], Thu Feb 15 14:43:12 2018 UTC (6 years, 1 month ago) by martin
Branch: netbsd-7-0
Changes since 1.31: +3 -3 lines
Diff to previous 1.31 (colored)

Pull up following revision(s) (requested by maxv in ticket #1567):
	sys/netipsec/xform_ipip.c: revision 1.44
PR/52161: Ryota Ozaki: Fix AH tunnel ipsec for ipv6. Compute plen right,
don't forget to subtract the ipv6 header length.

Revision 1.31.10.1 / (download) - annotate - [select for diffs], Thu Feb 15 14:41:57 2018 UTC (6 years, 1 month ago) by martin
Branch: netbsd-7-1
Changes since 1.31: +3 -3 lines
Diff to previous 1.31 (colored)

Pull up following revision(s) (requested by maxv in ticket #1567):
	sys/netipsec/xform_ipip.c: revision 1.44
PR/52161: Ryota Ozaki: Fix AH tunnel ipsec for ipv6. Compute plen right,
don't forget to subtract the ipv6 header length.

Revision 1.31.2.1 / (download) - annotate - [select for diffs], Thu Feb 15 14:39:43 2018 UTC (6 years, 1 month ago) by martin
Branch: netbsd-7
Changes since 1.31: +3 -3 lines
Diff to previous 1.31 (colored)

Pull up following revision(s) (requested by maxv in ticket #1567):
	sys/netipsec/xform_ipip.c: revision 1.44
PR/52161: Ryota Ozaki: Fix AH tunnel ipsec for ipv6. Compute plen right,
don't forget to subtract the ipv6 header length.

Revision 1.49.2.3 / (download) - annotate - [select for diffs], Thu Feb 15 14:28:38 2018 UTC (6 years, 1 month ago) by martin
Branch: netbsd-8
CVS Tags: netbsd-8-2-RELEASE, netbsd-8-1-RELEASE, netbsd-8-1-RC1, netbsd-8-0-RELEASE, netbsd-8-0-RC2, netbsd-8-0-RC1
Changes since 1.49.2.2: +72 -174 lines
Diff to previous 1.49.2.2 (colored) to branchpoint 1.49 (colored) next main 1.50 (colored)

Pull up following revision(s) (requested by maxv in ticket #551):
	sys/netipsec/xform_ipip.c: revision 1.56-1.63

Fix use-after-free. There is a path where the mbuf gets pulled up without
a proper mtod afterwards:

218     ipo = mtod(m, struct ip *);
281     m = m_pullup(m, hlen);
232     ipo->ip_src.s_addr

Found by Mootja.

Meanwhile it seems to me that 'ipo' should be set to NULL if the inner
packet is IPv6, but I'll revisit that later.
As I said in my last commit in this file, ipo should be set to NULL;
otherwise the 'local address spoofing' check below is always wrong on
IPv6.

Style and remove dead code.

dedup

Fix the IPIP_STAT_IBYTES stats; we did m_adj(m, iphlen) which substracted
iphlen, so no need to re-substract it again.

Remove broken MROUTING code, rename ipo->ip4, and simplify.

Revision 1.63 / (download) - annotate - [select for diffs], Thu Feb 15 10:41:51 2018 UTC (6 years, 1 month ago) by maxv
Branch: MAIN
CVS Tags: pgoyette-compat-base, pgoyette-compat-0415, pgoyette-compat-0407, pgoyette-compat-0330, pgoyette-compat-0322, pgoyette-compat-0315
Branch point for: pgoyette-compat
Changes since 1.62: +9 -26 lines
Diff to previous 1.62 (colored)

Remove broken MROUTING code, rename ipo->ip4, and simplify.

Revision 1.62 / (download) - annotate - [select for diffs], Thu Feb 15 10:28:49 2018 UTC (6 years, 1 month ago) by maxv
Branch: MAIN
Changes since 1.61: +4 -4 lines
Diff to previous 1.61 (colored)

Fix the IPIP_STAT_IBYTES stats; we did m_adj(m, iphlen) which substracted
iphlen, so no need to re-substract it again.

Revision 1.61 / (download) - annotate - [select for diffs], Thu Feb 15 10:21:39 2018 UTC (6 years, 1 month ago) by maxv
Branch: MAIN
Changes since 1.60: +4 -17 lines
Diff to previous 1.60 (colored)

dedup again

Revision 1.60 / (download) - annotate - [select for diffs], Thu Feb 15 10:09:53 2018 UTC (6 years, 1 month ago) by maxv
Branch: MAIN
Changes since 1.59: +12 -28 lines
Diff to previous 1.59 (colored)

dedup

Revision 1.59 / (download) - annotate - [select for diffs], Thu Feb 15 10:04:43 2018 UTC (6 years, 1 month ago) by maxv
Branch: MAIN
Changes since 1.58: +46 -103 lines
Diff to previous 1.58 (colored)

Style and remove dead code.

Revision 1.58 / (download) - annotate - [select for diffs], Wed Jan 24 14:39:14 2018 UTC (6 years, 2 months ago) by maxv
Branch: MAIN
Changes since 1.57: +12 -12 lines
Diff to previous 1.57 (colored)

style

Revision 1.57 / (download) - annotate - [select for diffs], Wed Jan 24 14:37:34 2018 UTC (6 years, 2 months ago) by maxv
Branch: MAIN
Changes since 1.56: +4 -4 lines
Diff to previous 1.56 (colored)

As I said in my last commit in this file, ipo should be set to NULL;
otherwise the 'local address spoofing' check below is always wrong on
IPv6.

Revision 1.56 / (download) - annotate - [select for diffs], Sun Jan 14 16:36:04 2018 UTC (6 years, 2 months ago) by maxv
Branch: MAIN
Changes since 1.55: +4 -3 lines
Diff to previous 1.55 (colored)

Fix use-after-free. There is a path where the mbuf gets pulled up without
a proper mtod afterwards:

218     ipo = mtod(m, struct ip *);
281     m = m_pullup(m, hlen);
232     ipo->ip_src.s_addr

Found by Mootja.

Meanwhile it seems to me that 'ipo' should be set to NULL if the inner
packet is IPv6, but I'll revisit that later.

Revision 1.49.2.2 / (download) - annotate - [select for diffs], Sun Dec 10 09:41:32 2017 UTC (6 years, 4 months ago) by snj
Branch: netbsd-8
Changes since 1.49.2.1: +4 -4 lines
Diff to previous 1.49.2.1 (colored) to branchpoint 1.49 (colored)

Pull up following revision(s) (requested by knakahara in ticket #419):
	sys/net/if_stf.c: revision 1.103
	sys/net/if_stf.h: revision 1.8
	sys/netinet/in_gif.c: revision 1.89
	sys/netinet/in_gif.h: revision 1.17
	sys/netinet/in_l2tp.c: revision 1.4
	sys/netinet/ip_encap.c: revision 1.66
	sys/netinet/ip_encap.h: revision 1.23
	sys/netinet/ip_mroute.c: revision 1.148
	sys/netinet6/in6_gif.c: revision 1.87
	sys/netinet6/in6_gif.h: revision 1.16
	sys/netinet6/in6_l2tp.c: revision 1.7
	sys/netipsec/xform.h: revision 1.13
	sys/netipsec/xform_ipip.c: revision 1.55
Add argument to encapsw->pr_input() instead of m_tag.

Revision 1.28.12.3 / (download) - annotate - [select for diffs], Sun Dec 3 11:39:05 2017 UTC (6 years, 4 months ago) by jdolecek
Branch: tls-maxphys
Changes since 1.28.12.2: +83 -133 lines
Diff to previous 1.28.12.2 (colored) to branchpoint 1.28 (colored) next main 1.29 (colored)

update from HEAD

Revision 1.55 / (download) - annotate - [select for diffs], Wed Nov 15 10:42:41 2017 UTC (6 years, 4 months ago) by knakahara
Branch: MAIN
CVS Tags: tls-maxphys-base-20171202
Changes since 1.54: +4 -4 lines
Diff to previous 1.54 (colored)

Add argument to encapsw->pr_input() instead of m_tag.

Revision 1.49.2.1 / (download) - annotate - [select for diffs], Sat Oct 21 19:43:54 2017 UTC (6 years, 5 months ago) by snj
Branch: netbsd-8
CVS Tags: matt-nb8-mediatek-base, matt-nb8-mediatek
Changes since 1.49: +14 -12 lines
Diff to previous 1.49 (colored)

Pull up following revision(s) (requested by ozaki-r in ticket #300):
	crypto/dist/ipsec-tools/src/setkey/parse.y: 1.19
	crypto/dist/ipsec-tools/src/setkey/token.l: 1.20
	distrib/sets/lists/tests/mi: 1.754, 1.757, 1.759
	doc/TODO.smpnet: 1.12-1.13
	sys/net/pfkeyv2.h: 1.32
	sys/net/raw_cb.c: 1.23-1.24, 1.28
	sys/net/raw_cb.h: 1.28
	sys/net/raw_usrreq.c: 1.57-1.58
	sys/net/rtsock.c: 1.228-1.229
	sys/netinet/in_proto.c: 1.125
	sys/netinet/ip_input.c: 1.359-1.361
	sys/netinet/tcp_input.c: 1.359-1.360
	sys/netinet/tcp_output.c: 1.197
	sys/netinet/tcp_var.h: 1.178
	sys/netinet6/icmp6.c: 1.213
	sys/netinet6/in6_proto.c: 1.119
	sys/netinet6/ip6_forward.c: 1.88
	sys/netinet6/ip6_input.c: 1.181-1.182
	sys/netinet6/ip6_output.c: 1.193
	sys/netinet6/ip6protosw.h: 1.26
	sys/netipsec/ipsec.c: 1.100-1.122
	sys/netipsec/ipsec.h: 1.51-1.61
	sys/netipsec/ipsec6.h: 1.18-1.20
	sys/netipsec/ipsec_input.c: 1.44-1.51
	sys/netipsec/ipsec_netbsd.c: 1.41-1.45
	sys/netipsec/ipsec_output.c: 1.49-1.64
	sys/netipsec/ipsec_private.h: 1.5
	sys/netipsec/key.c: 1.164-1.234
	sys/netipsec/key.h: 1.20-1.32
	sys/netipsec/key_debug.c: 1.18-1.21
	sys/netipsec/key_debug.h: 1.9
	sys/netipsec/keydb.h: 1.16-1.20
	sys/netipsec/keysock.c: 1.59-1.62
	sys/netipsec/keysock.h: 1.10
	sys/netipsec/xform.h: 1.9-1.12
	sys/netipsec/xform_ah.c: 1.55-1.74
	sys/netipsec/xform_esp.c: 1.56-1.72
	sys/netipsec/xform_ipcomp.c: 1.39-1.53
	sys/netipsec/xform_ipip.c: 1.50-1.54
	sys/netipsec/xform_tcp.c: 1.12-1.16
	sys/rump/librump/rumpkern/Makefile.rumpkern: 1.170
	sys/rump/librump/rumpnet/net_stub.c: 1.27
	sys/sys/protosw.h: 1.67-1.68
	tests/net/carp/t_basic.sh: 1.7
	tests/net/if_gif/t_gif.sh: 1.11
	tests/net/if_l2tp/t_l2tp.sh: 1.3
	tests/net/ipsec/Makefile: 1.7-1.9
	tests/net/ipsec/algorithms.sh: 1.5
	tests/net/ipsec/common.sh: 1.4-1.6
	tests/net/ipsec/t_ipsec_ah_keys.sh: 1.2
	tests/net/ipsec/t_ipsec_esp_keys.sh: 1.2
	tests/net/ipsec/t_ipsec_gif.sh: 1.6-1.7
	tests/net/ipsec/t_ipsec_l2tp.sh: 1.6-1.7
	tests/net/ipsec/t_ipsec_misc.sh: 1.8-1.18
	tests/net/ipsec/t_ipsec_sockopt.sh: 1.1-1.2
	tests/net/ipsec/t_ipsec_tcp.sh: 1.1-1.2
	tests/net/ipsec/t_ipsec_transport.sh: 1.5-1.6
	tests/net/ipsec/t_ipsec_tunnel.sh: 1.9
	tests/net/ipsec/t_ipsec_tunnel_ipcomp.sh: 1.1-1.2
	tests/net/ipsec/t_ipsec_tunnel_odd.sh: 1.3
	tests/net/mcast/t_mcast.sh: 1.6
	tests/net/net/t_ipaddress.sh: 1.11
	tests/net/net_common.sh: 1.20
	tests/net/npf/t_npf.sh: 1.3
	tests/net/route/t_flags.sh: 1.20
	tests/net/route/t_flags6.sh: 1.16
	usr.bin/netstat/fast_ipsec.c: 1.22
Do m_pullup before mtod

It may fix panicks of some tests on anita/sparc and anita/GuruPlug.
---
KNF
---
Enable DEBUG for babylon5
---
Apply C99-style struct initialization to xformsw
---
Tweak outputs of netstat -s for IPsec

- Get rid of "Fast"
- Use ipsec and ipsec6 for titles to clarify protocol
- Indent outputs of sub protocols

Original outputs were organized like this:

(Fast) IPsec:
IPsec ah:
IPsec esp:
IPsec ipip:
IPsec ipcomp:
(Fast) IPsec:
IPsec ah:
IPsec esp:
IPsec ipip:
IPsec ipcomp:

New outputs are organized like this:

ipsec:
	ah:
	esp:
	ipip:
	ipcomp:
ipsec6:
	ah:
	esp:
	ipip:
	ipcomp:
---
Add test cases for IPComp
---
Simplify IPSEC_OSTAT macro (NFC)
---
KNF; replace leading whitespaces with hard tabs
---
Introduce and use SADB_SASTATE_USABLE_P
---
KNF
---
Add update command for testing

Updating an SA (SADB_UPDATE) requires that a process issuing
SADB_UPDATE is the same as a process issued SADB_ADD (or SADB_GETSPI).
This means that update command must be used with add command in a
configuration of setkey. This usage is normally meaningless but
useful for testing (and debugging) purposes.
---
Add test cases for updating SA/SP

The tests require newly-added udpate command of setkey.
---
PR/52346: Frank Kardel: Fix checksumming for NAT-T
See XXX for improvements.
---
Remove codes for PACKET_TAG_IPSEC_IN_CRYPTO_DONE

It seems that PACKET_TAG_IPSEC_IN_CRYPTO_DONE is for network adapters
that have IPsec accelerators; a driver sets the mtag to a packet
when its device has already encrypted the packet.

Unfortunately no driver implements such offload features for long
years and seems unlikely to implement them soon. (Note that neither
FreeBSD nor Linux doesn't have such drivers.) Let's remove related
(unused) codes and simplify the IPsec code.
---
Fix usages of sadb_msg_errno
---
Avoid updating sav directly

On SADB_UPDATE a target sav was updated directly, which was unsafe.
Instead allocate another sav, copy variables of the old sav to
the new one and replace the old one with the new one.
---
Simplify; we can assume sav->tdb_xform cannot be NULL while it's valid
---
Rename key_alloc* functions (NFC)

We shouldn't use the term "alloc" for functions that just look up
data and actually don't allocate memory.
---
Use explicit_memset to surely zero-clear key_auth and key_enc
---
Make sure to clear keys on error paths of key_setsaval
---
Add missing KEY_FREESAV
---
Make sure a sav is inserted to a sah list after its initialization completes
---
Remove unnecessary zero-clearing codes from key_setsaval

key_setsaval is now used only for a newly-allocated sav. (It was
used to reset variables of an existing sav.)
---
Correct wrong assumption of sav->refcnt in key_delsah

A sav in a list is basically not to be sav->refcnt == 0. And also
KEY_FREESAV assumes sav->refcnt > 0.
---
Let key_getsavbyspi take a reference of a returning sav
---
Use time_mono_to_wall (NFC)
---
Separate sending message routine (NFC)
---
Simplify; remove unnecessary zero-clears

key_freesaval is used only when a target sav is being destroyed.
---
Omit NULL checks for sav->lft_c

sav->lft_c can be NULL only when initializing or destroying sav.
---
Omit unnecessary NULL checks for sav->sah
---
Omit unnecessary check of sav->state

key_allocsa_policy picks a sav of either MATURE or DYING so we
don't need to check its state again.
---
Simplify; omit unnecessary saidx passing

- ipsec_nextisr returns a saidx but no caller uses it
- key_checkrequest is passed a saidx but it can be gotton by
  another argument (isr)
---
Fix splx isn't called on some error paths
---
Fix header size calculation of esp where sav is NULL
---
Fix header size calculation of ah in the case sav is NULL

This fix was also needed for esp.
---
Pass sav directly to opencrypto callback

In a callback, use a passed sav as-is by default and look up a sav
only if the passed sav is dead.
---
Avoid examining freshness of sav on packet processing

If a sav list is sorted (by lft_c->sadb_lifetime_addtime) in advance,
we don't need to examine each sav and also don't need to delete one
on the fly and send up a message. Fortunately every sav lists are sorted
as we need.

Added key_validate_savlist validates that each sav list is surely sorted
(run only if DEBUG because it's not cheap).
---
Add test cases for SAs with different SPIs
---
Prepare to stop using isr->sav

isr is a shared resource and using isr->sav as a temporal storage
for each packet processing is racy. And also having a reference from
isr to sav makes the lifetime of sav non-deterministic; such a reference
is removed when a packet is processed and isr->sav is overwritten by
new one. Let's have a sav locally for each packet processing instead of
using shared isr->sav.

However this change doesn't stop using isr->sav yet because there are
some users of isr->sav. isr->sav will be removed after the users find
a way to not use isr->sav.
---
Fix wrong argument handling
---
fix printf format.
---
Don't validate sav lists of LARVAL or DEAD states

We don't sort the lists so the validation will always fail.

Fix PR kern/52405
---
Make sure to sort the list when changing the state by key_sa_chgstate
---
Rename key_allocsa_policy to key_lookup_sa_bysaidx
---
Separate test files
---
Calculate ah_max_authsize on initialization as well as esp_max_ivlen
---
Remove m_tag_find(PACKET_TAG_IPSEC_PENDING_TDB) because nobody sets the tag
---
Restore a comment removed in previous

The comment is valid for the below code.
---
Make tests more stable

sleep command seems to wait longer than expected on anita so
use polling to wait for a state change.
---
Add tests that explicitly delete SAs instead of waiting for expirations
---
Remove invalid M_AUTHIPDGM check on ESP isr->sav

M_AUTHIPDGM flag is set to a mbuf in ah_input_cb. An sav of ESP can
have AH authentication as sav->tdb_authalgxform. However, in that
case esp_input and esp_input_cb are used to do ESP decryption and
AH authentication and M_AUTHIPDGM never be set to a mbuf. So
checking M_AUTHIPDGM of a mbuf on isr->sav of ESP is meaningless.
---
Look up sav instead of relying on unstable sp->req->sav

This code is executed only in an error path so an additional lookup
doesn't matter.
---
Correct a comment
---
Don't release sav if calling crypto_dispatch again
---
Remove extra KEY_FREESAV from ipsec_process_done

It should be done by the caller.
---
Don't bother the case of crp->crp_buf == NULL in callbacks
---
Hold a reference to an SP during opencrypto processing

An SP has a list of isr (ipsecrequest) that represents a sequence
of IPsec encryption/authentication processing. One isr corresponds
to one opencrypto processing. The lifetime of an isr follows its SP.

We pass an isr to a callback function of opencrypto to continue
to a next encryption/authentication processing. However nobody
guaranteed that the isr wasn't freed, i.e., its SP wasn't destroyed.

In order to avoid such unexpected destruction of isr, hold a reference
to its SP during opencrypto processing.
---
Don't make SAs expired on tests that delete SAs explicitly
---
Fix a debug message
---
Dedup error paths (NFC)
---
Use pool to allocate tdb_crypto

For ESP and AH, we need to allocate an extra variable space in addition
to struct tdb_crypto. The fixed size of pool items may be larger than
an actual requisite size of a buffer, but still the performance
improvement by replacing malloc with pool wins.
---
Don't use unstable isr->sav for header size calculations

We may need to optimize to not look up sav here for users that
don't need to know an exact size of headers (e.g., TCP segmemt size
caclulation).
---
Don't use sp->req->sav when handling NAT-T ESP fragmentation

In order to do this we need to look up a sav however an additional
look-up degrades performance. A sav is later looked up in
ipsec4_process_packet so delay the fragmentation check until then
to avoid an extra look-up.
---
Don't use key_lookup_sp that depends on unstable sp->req->sav

It provided a fast look-up of SP. We will provide an alternative
method in the future (after basic MP-ification finishes).
---
Stop setting isr->sav on looking up sav in key_checkrequest
---
Remove ipsecrequest#sav
---
Stop setting mtag of PACKET_TAG_IPSEC_IN_DONE because there is no users anymore
---
Skip ipsec_spi_*_*_preferred_new_timeout when running on qemu

Probably due to PR 43997
---
Add localcount to rump kernels
---
Remove unused macro
---
Fix key_getcomb_setlifetime

The fix adjusts a soft limit to be 80% of a corresponding hard limit.

I'm not sure the fix is really correct though, at least the original
code is wrong. A passed comb is zero-cleared before calling
key_getcomb_setlifetime, so
  comb->sadb_comb_soft_addtime = comb->sadb_comb_soft_addtime * 80 / 100;
is meaningless.
---
Provide and apply key_sp_refcnt (NFC)

It simplifies further changes.
---
Fix indentation

Pointed out by knakahara@
---
Use pslist(9) for sptree
---
Don't acquire global locks for IPsec if NET_MPSAFE

Note that the change is just to make testing easy and IPsec isn't MP-safe yet.
---
Let PF_KEY socks hold their own lock instead of softnet_lock

Operations on SAD and SPD are executed via PF_KEY socks. The operations
include deletions of SAs and SPs that will use synchronization mechanisms
such as pserialize_perform to wait for references to SAs and SPs to be
released. It is known that using such mechanisms with holding softnet_lock
causes a dead lock. We should avoid the situation.
---
Make IPsec SPD MP-safe

We use localcount(9), not psref(9), to make the sptree and secpolicy (SP)
entries MP-safe because SPs need to be referenced over opencrypto
processing that executes a callback in a different context.

SPs on sockets aren't managed by the sptree and can be destroyed in softint.
localcount_drain cannot be used in softint so we delay the destruction of
such SPs to a thread context. To do so, a list to manage such SPs is added
(key_socksplist) and key_timehandler_spd deletes dead SPs in the list.

For more details please read the locking notes in key.c.

Proposed on tech-kern@ and tech-net@
---
Fix updating ipsec_used

- key_update_used wasn't called in key_api_spddelete2 and key_api_spdflush
- key_update_used wasn't called if an SP had been added/deleted but
  a reply to userland failed
---
Fix updating ipsec_used; turn on when SPs on sockets are added
---
Add missing IPsec policy checks to icmp6_rip6_input

icmp6_rip6_input is quite similar to rip6_input and the same checks exist
in rip6_input.
---
Add test cases for setsockopt(IP_IPSEC_POLICY)
---
Don't use KEY_NEWSP for dummy SP entries

By the change KEY_NEWSP is now not called from softint anymore
and we can use kmem_zalloc with KM_SLEEP for KEY_NEWSP.
---
Comment out unused functions
---
Add test cases that there are SPs but no relevant SAs
---
Don't allow sav->lft_c to be NULL

lft_c of an sav that was created by SADB_GETSPI could be NULL.
---
Clean up clunky eval strings

- Remove unnecessary \ at EOL
  - This allows to omit ; too
- Remove unnecessary quotes for arguments of atf_set
- Don't expand $DEBUG in eval
  - We expect it's expanded on execution

Suggested by kre@
---
Remove unnecessary KEY_FREESAV in an error path

sav should be freed (unreferenced) by the caller.
---
Use pslist(9) for sahtree
---
Use pslist(9) for sah->savtree
---
Rename local variable newsah to sah

It may not be new.
---
MP-ify SAD slightly

- Introduce key_sa_mtx and use it for some list operations
- Use pserialize for some list iterations
---
Introduce KEY_SA_UNREF and replace KEY_FREESAV with it where sav will never be actually freed in the future

KEY_SA_UNREF is still key_freesav so no functional change for now.

This change reduces diff of further changes.
---
Remove out-of-date log output

Pointed out by riastradh@
---
Use KDASSERT instead of KASSERT for mutex_ownable

Because mutex_ownable is too heavy to run in a fast path
even for DIAGNOSTIC + LOCKDEBUG.

Suggested by riastradh@
---
Assemble global lists and related locks into cache lines (NFCI)

Also rename variable names from *tree to *list because they are
just lists, not trees.

Suggested by riastradh@
---
Move locking notes
---
Update the locking notes

- Add locking order
- Add locking notes for misc lists such as reglist
- Mention pserialize, key_sp_ref and key_sp_unref on SP operations

Requested by riastradh@
---
Describe constraints of key_sp_ref and key_sp_unref

Requested by riastradh@
---
Hold key_sad.lock on SAVLIST_WRITER_INSERT_TAIL
---
Add __read_mostly to key_psz

Suggested by riastradh@
---
Tweak wording (pserialize critical section => pserialize read section)

Suggested by riastradh@
---
Add missing mutex_exit
---
Fix setkey -D -P outputs

The outputs were tweaked (by me), but I forgot updating libipsec
in my local ATF environment...
---
MP-ify SAD (key_sad.sahlist and sah entries)

localcount(9) is used to protect key_sad.sahlist and sah entries
as well as SPD (and will be used for SAD sav).

Please read the locking notes of SAD for more details.
---
Introduce key_sa_refcnt and replace sav->refcnt with it (NFC)
---
Destroy sav only in the loop for DEAD sav
---
Fix KASSERT(solocked(sb->sb_so)) failure in sbappendaddr that is called eventually from key_sendup_mbuf

If key_sendup_mbuf isn't passed a socket, the assertion fails.
Originally in this case sb->sb_so was softnet_lock and callers
held softnet_lock so the assertion was magically satisfied.
Now sb->sb_so is key_so_mtx and also softnet_lock isn't always
held by callers so the assertion can fail.

Fix it by holding key_so_mtx if key_sendup_mbuf isn't passed a socket.

Reported by knakahara@
Tested by knakahara@ and ozaki-r@
---
Fix locking notes of SAD
---
Fix deadlock between key_sendup_mbuf called from key_acquire and localcount_drain

If we call key_sendup_mbuf from key_acquire that is called on packet
processing, a deadlock can happen like this:
- At key_acquire, a reference to an SP (and an SA) is held
- key_sendup_mbuf will try to take key_so_mtx
- Some other thread may try to localcount_drain to the SP with
  holding key_so_mtx in say key_api_spdflush
- In this case localcount_drain never return because key_sendup_mbuf
  that has stuck on key_so_mtx never release a reference to the SP

Fix the deadlock by deferring key_sendup_mbuf to the timer
(key_timehandler).
---
Fix that prev isn't cleared on retry
---
Limit the number of mbufs queued for deferred key_sendup_mbuf

It's easy to be queued hundreds of mbufs on the list under heavy
network load.
---
MP-ify SAD (savlist)

localcount(9) is used to protect savlist of sah. The basic design is
similar to MP-ifications of SPD and SAD sahlist. Please read the
locking notes of SAD for more details.
---
Simplify ipsec_reinject_ipstack (NFC)
---
Add per-CPU rtcache to ipsec_reinject_ipstack

It reduces route lookups and also reduces rtcache lock contentions
when NET_MPSAFE is enabled.
---
Use pool_cache(9) instead of pool(9) for tdb_crypto objects

The change improves network throughput especially on multi-core systems.
---
Update

ipsec(4), opencrypto(9) and vlan(4) are now MP-safe.
---
Write known issues on scalability
---
Share a global dummy SP between PCBs

It's never be changed so it can be pre-allocated and shared safely between PCBs.
---
Fix race condition on the rawcb list shared by rtsock and keysock

keysock now protects itself by its own mutex, which means that
the rawcb list is protected by two different mutexes (keysock's one
and softnet_lock for rtsock), of course it's useless.

Fix the situation by having a discrete rawcb list for each.
---
Use a dedicated mutex for rt_rawcb instead of softnet_lock if NET_MPSAFE
---
fix localcount leak in sav. fixed by ozaki-r@n.o.

I commit on behalf of him.
---
remove unnecessary comment.
---
Fix deadlock between pserialize_perform and localcount_drain

A typical ussage of localcount_drain looks like this:

  mutex_enter(&mtx);
  item = remove_from_list();
  pserialize_perform(psz);
  localcount_drain(&item->localcount, &cv, &mtx);
  mutex_exit(&mtx);

This sequence can cause a deadlock which happens for example on the following
situation:

- Thread A calls localcount_drain which calls xc_broadcast after releasing
  a specified mutex
- Thread B enters the sequence and calls pserialize_perform with holding
  the mutex while pserialize_perform also calls xc_broadcast
- Thread C (xc_thread) that calls an xcall callback of localcount_drain tries
  to hold the mutex

xc_broadcast of thread B doesn't start until xc_broadcast of thread A
finishes, which is a feature of xcall(9). This means that pserialize_perform
never complete until xc_broadcast of thread A finishes. On the other hand,
thread C that is a callee of xc_broadcast of thread A sticks on the mutex.
Finally the threads block each other (A blocks B, B blocks C and C blocks A).

A possible fix is to serialize executions of the above sequence by another
mutex, but adding another mutex makes the code complex, so fix the deadlock
by another way; the fix is to release the mutex before pserialize_perform
and instead use a condvar to prevent pserialize_perform from being called
simultaneously.

Note that the deadlock has happened only if NET_MPSAFE is enabled.
---
Add missing ifdef NET_MPSAFE
---
Take softnet_lock on pr_input properly if NET_MPSAFE

Currently softnet_lock is taken unnecessarily in some cases, e.g.,
icmp_input and encap4_input from ip_input, or not taken even if needed,
e.g., udp_input and tcp_input from ipsec4_common_input_cb. Fix them.

NFC if NET_MPSAFE is disabled (default).
---
- sanitize key debugging so that we don't print extra newlines or unassociated
  debugging messages.
- remove unused functions and make internal ones static
- print information in one line per message
---
humanize printing of ip addresses
---
cast reduction, NFC.
---
Fix typo in comment
---
Pull out ipsec_fill_saidx_bymbuf (NFC)
---
Don't abuse key_checkrequest just for looking up sav

It does more than expected for example key_acquire.
---
Fix SP is broken on transport mode

isr->saidx was modified accidentally in ipsec_nextisr.

Reported by christos@
Helped investigations by christos@ and knakahara@
---
Constify isr at many places (NFC)
---
Include socketvar.h for softnet_lock
---
Fix buffer length for ipsec_logsastr

Revision 1.54 / (download) - annotate - [select for diffs], Tue Oct 3 08:56:52 2017 UTC (6 years, 6 months ago) by ozaki-r
Branch: MAIN
Changes since 1.53: +3 -3 lines
Diff to previous 1.53 (colored)

Constify isr at many places (NFC)

Revision 1.31.4.5 / (download) - annotate - [select for diffs], Mon Aug 28 17:53:13 2017 UTC (6 years, 7 months ago) by skrll
Branch: nick-nhusb
Changes since 1.31.4.4: +55 -81 lines
Diff to previous 1.31.4.4 (colored) to branchpoint 1.31 (colored) next main 1.32 (colored)

Sync with HEAD

Revision 1.53 / (download) - annotate - [select for diffs], Fri Jul 14 12:26:26 2017 UTC (6 years, 9 months ago) by ozaki-r
Branch: MAIN
CVS Tags: perseant-stdc-iso10646-base, perseant-stdc-iso10646, nick-nhusb-base-20170825
Changes since 1.52: +4 -6 lines
Diff to previous 1.52 (colored)

Prepare to stop using isr->sav

isr is a shared resource and using isr->sav as a temporal storage
for each packet processing is racy. And also having a reference from
isr to sav makes the lifetime of sav non-deterministic; such a reference
is removed when a packet is processed and isr->sav is overwritten by
new one. Let's have a sav locally for each packet processing instead of
using shared isr->sav.

However this change doesn't stop using isr->sav yet because there are
some users of isr->sav. isr->sav will be removed after the users find
a way to not use isr->sav.

Revision 1.52 / (download) - annotate - [select for diffs], Fri Jul 14 01:24:23 2017 UTC (6 years, 9 months ago) by ozaki-r
Branch: MAIN
Changes since 1.51: +4 -4 lines
Diff to previous 1.51 (colored)

Pass sav directly to opencrypto callback

In a callback, use a passed sav as-is by default and look up a sav
only if the passed sav is dead.

Revision 1.51 / (download) - annotate - [select for diffs], Wed Jul 12 07:00:40 2017 UTC (6 years, 9 months ago) by ozaki-r
Branch: MAIN
Changes since 1.50: +2 -3 lines
Diff to previous 1.50 (colored)

Omit unnecessary NULL checks for sav->sah

Revision 1.50 / (download) - annotate - [select for diffs], Thu Jun 29 07:13:41 2017 UTC (6 years, 9 months ago) by ozaki-r
Branch: MAIN
Changes since 1.49: +10 -5 lines
Diff to previous 1.49 (colored)

Apply C99-style struct initialization to xformsw

Revision 1.48.2.1 / (download) - annotate - [select for diffs], Fri May 19 00:22:58 2017 UTC (6 years, 10 months ago) by pgoyette
Branch: prg-localcount2
Changes since 1.48: +5 -4 lines
Diff to previous 1.48 (colored) next main 1.49 (colored)

Resolve conflicts from previous merge (all resulting from $NetBSD
keywork expansion)

Revision 1.49 / (download) - annotate - [select for diffs], Thu May 11 05:55:14 2017 UTC (6 years, 11 months ago) by ryo
Branch: MAIN
CVS Tags: prg-localcount2-base3, netbsd-8-base
Branch point for: netbsd-8
Changes since 1.48: +5 -4 lines
Diff to previous 1.48 (colored)

Make ipsec_address() and ipsec_logsastr() mpsafe.

Revision 1.42.2.1 / (download) - annotate - [select for diffs], Wed Apr 26 02:53:29 2017 UTC (6 years, 11 months ago) by pgoyette
Branch: pgoyette-localcount
Changes since 1.42: +43 -72 lines
Diff to previous 1.42 (colored) next main 1.43 (colored)

Sync with HEAD

Revision 1.42.4.1 / (download) - annotate - [select for diffs], Fri Apr 21 16:54:06 2017 UTC (6 years, 11 months ago) by bouyer
Branch: bouyer-socketcan
Changes since 1.42: +43 -72 lines
Diff to previous 1.42 (colored) next main 1.43 (colored)

Sync with HEAD

Revision 1.48 / (download) - annotate - [select for diffs], Wed Apr 19 03:39:14 2017 UTC (6 years, 11 months ago) by ozaki-r
Branch: MAIN
CVS Tags: prg-localcount2-base2, prg-localcount2-base1, prg-localcount2-base, pgoyette-localcount-20170426, bouyer-socketcan-base1
Branch point for: prg-localcount2
Changes since 1.47: +4 -10 lines
Diff to previous 1.47 (colored)

Retire ipsec_osdep.h

We don't need to care other OSes (FreeBSD) anymore.

Some macros are alive in ipsec_private.h.

Revision 1.47 / (download) - annotate - [select for diffs], Tue Apr 18 05:26:42 2017 UTC (6 years, 11 months ago) by ozaki-r
Branch: MAIN
Changes since 1.46: +4 -4 lines
Diff to previous 1.46 (colored)

Convert IPSEC_ASSERT to KASSERT or KASSERTMSG

IPSEC_ASSERT just discarded specified message...

Revision 1.46 / (download) - annotate - [select for diffs], Tue Apr 18 05:25:32 2017 UTC (6 years, 11 months ago) by ozaki-r
Branch: MAIN
Changes since 1.45: +2 -26 lines
Diff to previous 1.45 (colored)

Remove __FreeBSD__ and __NetBSD__ switches

No functional changes (except for a debug printf).

Note that there remain some __FreeBSD__ for sysctl knobs which counerparts
to NetBSD don't exist. And ipsec_osdep.h isn't touched yet; tidying it up
requires actual code changes.

Revision 1.45 / (download) - annotate - [select for diffs], Sat Apr 15 22:01:57 2017 UTC (6 years, 11 months ago) by christos
Branch: MAIN
Changes since 1.44: +38 -38 lines
Diff to previous 1.44 (colored)

cosmetic fixes:
	- __func__ in printfs
	- no space after sizeof
	- eliminate useless casts
	- u_intX_t -> uintX_t

Revision 1.44 / (download) - annotate - [select for diffs], Fri Apr 14 22:35:05 2017 UTC (7 years ago) by christos
Branch: MAIN
Changes since 1.43: +3 -3 lines
Diff to previous 1.43 (colored)

PR/52161: Ryota Ozaki: Fix AH tunnel ipsec for ipv6. Compute plen right,
don't forget to subtract the ipv6 header length.

Revision 1.43 / (download) - annotate - [select for diffs], Thu Apr 6 09:20:07 2017 UTC (7 years ago) by ozaki-r
Branch: MAIN
CVS Tags: jdolecek-ncq-base, jdolecek-ncq
Changes since 1.42: +4 -3 lines
Diff to previous 1.42 (colored)

Prepare netipsec for rump-ification

- Include "opt_*.h" only if _KERNEL_OPT is defined
- Allow encapinit to be called twice (by ifinit and ipe4_attach)
  - ifinit didn't call encapinit if IPSEC is enabled (ipe4_attach called
    it instead), however, on a rump kernel ipe4_attach may not be called
    even if IPSEC is enabled. So we need to allow ifinit to call it anyway
- Setup sysctls in ipsec_attach explicitly instead of using SYSCTL_SETUP
- Call ip6flow_invalidate_all in key_spdadd only if in6_present
  - It's possible that a rump kernel loads the ipsec library but not
    the inet6 library

Revision 1.31.4.4 / (download) - annotate - [select for diffs], Sat Jul 9 20:25:23 2016 UTC (7 years, 9 months ago) by skrll
Branch: nick-nhusb
Changes since 1.31.4.3: +11 -5 lines
Diff to previous 1.31.4.3 (colored) to branchpoint 1.31 (colored)

Sync with HEAD

Revision 1.42 / (download) - annotate - [select for diffs], Thu Jul 7 09:32:03 2016 UTC (7 years, 9 months ago) by ozaki-r
Branch: MAIN
CVS Tags: pgoyette-localcount-base, pgoyette-localcount-20170320, pgoyette-localcount-20170107, pgoyette-localcount-20161104, pgoyette-localcount-20160806, pgoyette-localcount-20160726, nick-nhusb-base-20170204, nick-nhusb-base-20161204, nick-nhusb-base-20161004, nick-nhusb-base-20160907, localcount-20160914, bouyer-socketcan-base
Branch point for: pgoyette-localcount, bouyer-socketcan
Changes since 1.41: +3 -3 lines
Diff to previous 1.41 (colored)

Switch the address list of intefaces to pslist(9)

As usual, we leave the old list to avoid breaking kvm(3) users.

Revision 1.41 / (download) - annotate - [select for diffs], Mon Jul 4 04:35:09 2016 UTC (7 years, 9 months ago) by knakahara
Branch: MAIN
Changes since 1.40: +6 -3 lines
Diff to previous 1.40 (colored)

make encap_lock_{enter,exit} interruptable.

Revision 1.40 / (download) - annotate - [select for diffs], Mon Jul 4 04:17:25 2016 UTC (7 years, 9 months ago) by knakahara
Branch: MAIN
Changes since 1.39: +5 -2 lines
Diff to previous 1.39 (colored)

let gif(4) promise softint(9) contract (2/2) : ip_encap side

The last commit does not care encaptab. This commit fixes encaptab race which
is used not only gif(4).

Revision 1.39 / (download) - annotate - [select for diffs], Fri Jun 10 13:31:44 2016 UTC (7 years, 10 months ago) by ozaki-r
Branch: MAIN
Changes since 1.38: +4 -4 lines
Diff to previous 1.38 (colored)

Avoid storing a pointer of an interface in a mbuf

Having a pointer of an interface in a mbuf isn't safe if we remove big
kernel locks; an interface object (ifnet) can be destroyed anytime in any
packet processing and accessing such object via a pointer is racy. Instead
we have to get an object from the interface collection (ifindex2ifnet) via
an interface index (if_index) that is stored to a mbuf instead of an
pointer.

The change provides two APIs: m_{get,put}_rcvif_psref that use psref(9)
for sleep-able critical sections and m_{get,put}_rcvif that use
pserialize(9) for other critical sections. The change also adds another
API called m_get_rcvif_NOMPSAFE, that is NOT MP-safe and for transition
moratorium, i.e., it is intended to be used for places where are not
planned to be MP-ified soon.

The change adds some overhead due to psref to performance sensitive paths,
however the overhead is not serious, 2% down at worst.

Proposed on tech-kern and tech-net.

Revision 1.31.4.3 / (download) - annotate - [select for diffs], Sun May 29 08:44:39 2016 UTC (7 years, 10 months ago) by skrll
Branch: nick-nhusb
Changes since 1.31.4.2: +7 -3 lines
Diff to previous 1.31.4.2 (colored) to branchpoint 1.31 (colored)

Sync with HEAD

Revision 1.38 / (download) - annotate - [select for diffs], Thu May 12 02:24:17 2016 UTC (7 years, 11 months ago) by ozaki-r
Branch: MAIN
CVS Tags: nick-nhusb-base-20160529
Changes since 1.37: +7 -3 lines
Diff to previous 1.37 (colored)

Protect ifnet list with psz and psref

The change ensures that ifnet objects in the ifnet list aren't freed during
list iterations by using pserialize(9) and psref(9).

Note that the change adds a pslist(9) for ifnet but doesn't remove the
original ifnet list (ifnet_list) to avoid breaking kvm(3) users. We
shouldn't use the original list in the kernel anymore.

Revision 1.31.4.2 / (download) - annotate - [select for diffs], Sat Mar 19 11:30:33 2016 UTC (8 years ago) by skrll
Branch: nick-nhusb
Changes since 1.31.4.1: +16 -47 lines
Diff to previous 1.31.4.1 (colored) to branchpoint 1.31 (colored)

Sync with HEAD

Revision 1.37 / (download) - annotate - [select for diffs], Tue Jan 26 06:00:10 2016 UTC (8 years, 2 months ago) by knakahara
Branch: MAIN
CVS Tags: nick-nhusb-base-20160422, nick-nhusb-base-20160319
Changes since 1.36: +4 -9 lines
Diff to previous 1.36 (colored)

eliminate variable argument in encapsw

Revision 1.36 / (download) - annotate - [select for diffs], Tue Jan 26 05:58:06 2016 UTC (8 years, 2 months ago) by knakahara
Branch: MAIN
Changes since 1.35: +14 -38 lines
Diff to previous 1.35 (colored)

implement encapsw instead of protosw and uniform prototype.

suggested and advised by riastradh@n.o, thanks.

BTW, It seems in_stf_input() had bugs...

Revision 1.35 / (download) - annotate - [select for diffs], Fri Jan 22 23:27:12 2016 UTC (8 years, 2 months ago) by riastradh
Branch: MAIN
Changes since 1.34: +43 -10 lines
Diff to previous 1.34 (colored)

Back out previous change to introduce struct encapsw.

This change was intended, but Nakahara-san had already made a better
one locally!  So I'll let him commit that one, and I'll try not to
step on anyone's toes again.

Revision 1.34 / (download) - annotate - [select for diffs], Fri Jan 22 05:15:10 2016 UTC (8 years, 2 months ago) by riastradh
Branch: MAIN
Changes since 1.33: +10 -43 lines
Diff to previous 1.33 (colored)

Don't abuse struct protosw for ip_encap -- introduce struct encapsw.

Mostly mechanical change to replace it, culling some now-needless
boilerplate around all the users.

This does not substantively change the ip_encap API or eliminate
abuse of sketchy pointer casts -- that will come later, and will be
easier now that it is not tangled up with struct protosw.

Revision 1.33 / (download) - annotate - [select for diffs], Wed Jan 20 21:44:00 2016 UTC (8 years, 2 months ago) by riastradh
Branch: MAIN
Changes since 1.32: +2 -4 lines
Diff to previous 1.32 (colored)

Eliminate struct protosw::pr_output.

You can't use this unless you know what it is a priori: the formal
prototype is variadic, and the different instances (e.g., ip_output,
route_output) have different real prototypes.

Convert the only user of it, raw_send in net/raw_cb.c, to take an
explicit callback argument.  Convert the only instances of it,
route_output and key_output, to such explicit callbacks for raw_send.
Use assertions to make sure the conversion to explicit callbacks is
warranted.

Discussed on tech-net with no objections:
https://mail-index.netbsd.org/tech-net/2016/01/16/msg005484.html

Revision 1.31.4.1 / (download) - annotate - [select for diffs], Mon Apr 6 15:18:23 2015 UTC (9 years ago) by skrll
Branch: nick-nhusb
Changes since 1.31: +2 -5 lines
Diff to previous 1.31 (colored)

Sync with HEAD

Revision 1.32 / (download) - annotate - [select for diffs], Fri Mar 27 07:47:10 2015 UTC (9 years ago) by ozaki-r
Branch: MAIN
CVS Tags: nick-nhusb-base-20151226, nick-nhusb-base-20150921, nick-nhusb-base-20150606, nick-nhusb-base-20150406
Changes since 1.31: +2 -5 lines
Diff to previous 1.31 (colored)

Remove unnecessary ifdef IPSEC

Revision 1.28.12.2 / (download) - annotate - [select for diffs], Wed Aug 20 00:04:36 2014 UTC (9 years, 7 months ago) by tls
Branch: tls-maxphys
Changes since 1.28.12.1: +9 -17 lines
Diff to previous 1.28.12.1 (colored) to branchpoint 1.28 (colored)

Rebase to HEAD as of a few days ago.

Revision 1.29.6.1 / (download) - annotate - [select for diffs], Sun Aug 10 06:56:34 2014 UTC (9 years, 8 months ago) by tls
Branch: tls-earlyentropy
Changes since 1.29: +11 -19 lines
Diff to previous 1.29 (colored) next main 1.30 (colored)

Rebase.

Revision 1.31 / (download) - annotate - [select for diffs], Thu Jun 5 23:48:17 2014 UTC (9 years, 10 months ago) by rmind
Branch: MAIN
CVS Tags: tls-maxphys-base, tls-earlyentropy-base, nick-nhusb-base, netbsd-7-nhusb-base-20170116, netbsd-7-nhusb-base, netbsd-7-nhusb, netbsd-7-base, netbsd-7-1-RELEASE, netbsd-7-1-RC2, netbsd-7-1-RC1, netbsd-7-1-1-RELEASE, netbsd-7-0-RELEASE, netbsd-7-0-RC3, netbsd-7-0-RC2, netbsd-7-0-RC1, netbsd-7-0-2-RELEASE, netbsd-7-0-1-RELEASE
Branch point for: nick-nhusb, netbsd-7-1, netbsd-7-0, netbsd-7
Changes since 1.30: +9 -13 lines
Diff to previous 1.30 (colored)

- Implement pktqueue interface for lockless IP input queue.
- Replace ipintrq and ip6intrq with the pktqueue mechanism.
- Eliminate kernel-lock from ipintr() and ip6intr().
- Some preparation work to push softnet_lock out of ipintr().

Discussed on tech-net.

Revision 1.28.2.1 / (download) - annotate - [select for diffs], Thu May 22 11:41:10 2014 UTC (9 years, 10 months ago) by yamt
Branch: yamt-pagecache
Changes since 1.28: +4 -4 lines
Diff to previous 1.28 (colored) next main 1.29 (colored)

sync with head.

for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.

this commit was splitted into small chunks to avoid
a limitation of cvs.  ("Protocol error: too many arguments")

Revision 1.30 / (download) - annotate - [select for diffs], Sun May 18 14:46:16 2014 UTC (9 years, 10 months ago) by rmind
Branch: MAIN
CVS Tags: rmind-smpnet-nbase, rmind-smpnet-base
Changes since 1.29: +4 -8 lines
Diff to previous 1.29 (colored)

Add struct pr_usrreqs with a pr_generic function and prepare for the
dismantling of pr_usrreq in the protocols; no functional change intended.
PRU_ATTACH/PRU_DETACH changes will follow soon.

Bump for struct protosw.  Welcome to 6.99.62!

Revision 1.29.2.1 / (download) - annotate - [select for diffs], Wed Aug 28 15:21:49 2013 UTC (10 years, 7 months ago) by rmind
Branch: rmind-smpnet
Changes since 1.29: +4 -8 lines
Diff to previous 1.29 (colored) next main 1.30 (colored)

Checkpoint work in progress:
- Initial split of the protocol user-request method into the following
  methods: pr_attach, pr_detach and pr_generic for old the pr_usrreq.
- Adjust socreate(9) and sonewconn(9) to call pr_attach without the
  socket lock held (as a preparation for the locking scheme adjustment).
- Adjust all pr_attach routines to assert that PCB is not set.
- Sprinkle various comments, document some routines and their locking.
- Remove M_PCB, replace with kmem(9).
- Fix few bugs spotted on the way.

Revision 1.28.12.1 / (download) - annotate - [select for diffs], Sun Jun 23 06:20:26 2013 UTC (10 years, 9 months ago) by tls
Branch: tls-maxphys
Changes since 1.28: +4 -4 lines
Diff to previous 1.28 (colored)

resync from head

Revision 1.29 / (download) - annotate - [select for diffs], Wed Jun 5 19:01:26 2013 UTC (10 years, 10 months ago) by christos
Branch: MAIN
CVS Tags: yamt-pagecache-base9, riastradh-xf86-video-intel-2-7-1-pre-2-21-15, riastradh-drm2-base3, riastradh-drm2-base2, riastradh-drm2-base1, riastradh-drm2-base, riastradh-drm2
Branch point for: tls-earlyentropy, rmind-smpnet
Changes since 1.28: +4 -4 lines
Diff to previous 1.28 (colored)

IPSEC has not come in two speeds for a long time now (IPSEC == kame,
FAST_IPSEC). Make everything refer to IPSEC to avoid confusion.

Revision 1.28 / (download) - annotate - [select for diffs], Sun Jul 17 20:54:54 2011 UTC (12 years, 8 months ago) by joerg
Branch: MAIN
CVS Tags: yamt-pagecache-tag8, yamt-pagecache-base8, yamt-pagecache-base7, yamt-pagecache-base6, yamt-pagecache-base5, yamt-pagecache-base4, yamt-pagecache-base3, yamt-pagecache-base2, yamt-pagecache-base, netbsd-6-base, netbsd-6-1-RELEASE, netbsd-6-1-RC4, netbsd-6-1-RC3, netbsd-6-1-RC2, netbsd-6-1-RC1, netbsd-6-1-5-RELEASE, netbsd-6-1-4-RELEASE, netbsd-6-1-3-RELEASE, netbsd-6-1-2-RELEASE, netbsd-6-1-1-RELEASE, netbsd-6-0-RELEASE, netbsd-6-0-RC2, netbsd-6-0-RC1, netbsd-6-0-6-RELEASE, netbsd-6-0-5-RELEASE, netbsd-6-0-4-RELEASE, netbsd-6-0-3-RELEASE, netbsd-6-0-2-RELEASE, netbsd-6-0-1-RELEASE, matt-nb6-plus-nbase, matt-nb6-plus-base, matt-nb6-plus, khorben-n900, jmcneill-usbmp-pre-base2, jmcneill-usbmp-base9, jmcneill-usbmp-base8, jmcneill-usbmp-base7, jmcneill-usbmp-base6, jmcneill-usbmp-base5, jmcneill-usbmp-base4, jmcneill-usbmp-base3, jmcneill-usbmp-base2, jmcneill-usbmp-base10, jmcneill-usbmp-base, jmcneill-usbmp, jmcneill-audiomp3-base, jmcneill-audiomp3, agc-symver-base, agc-symver
Branch point for: yamt-pagecache, tls-maxphys, netbsd-6-1, netbsd-6-0, netbsd-6
Changes since 1.27: +2 -4 lines
Diff to previous 1.27 (colored)

Retire varargs.h support. Move machine/stdarg.h logic into MI
sys/stdarg.h and expect compiler to provide proper builtins, defaulting
to the GCC interface. lint still has a special fallback.
Reduce abuse of _BSD_VA_LIST_ by defining __va_list by default and
derive va_list as required by standards.

Revision 1.26.2.1 / (download) - annotate - [select for diffs], Thu Jun 23 14:20:27 2011 UTC (12 years, 9 months ago) by cherry
Branch: cherry-xenmp
Changes since 1.26: +15 -12 lines
Diff to previous 1.26 (colored) next main 1.27 (colored)

Catchup with rmind-uvmplock merge.

Revision 1.24.22.2 / (download) - annotate - [select for diffs], Sun Jun 12 00:24:31 2011 UTC (12 years, 10 months ago) by rmind
Branch: rmind-uvmplock
Changes since 1.24.22.1: +13 -10 lines
Diff to previous 1.24.22.1 (colored) to branchpoint 1.24 (colored) next main 1.25 (colored)

sync with head

Revision 1.27 / (download) - annotate - [select for diffs], Mon Jun 6 16:48:35 2011 UTC (12 years, 10 months ago) by drochner
Branch: MAIN
CVS Tags: rmind-uvmplock-nbase, rmind-uvmplock-base
Changes since 1.26: +15 -12 lines
Diff to previous 1.26 (colored)

remove a limitation that inner and outer IP version must be equal
for an ESP tunnel, and add some fixes which make v4-in-v6 work
(v6 as inner protocol isn't ready, even v6-in-v6 can never have worked)

being here, fix a statistics counter and kill an unused variable

Revision 1.24.28.1 / (download) - annotate - [select for diffs], Mon Jun 6 09:10:01 2011 UTC (12 years, 10 months ago) by jruoho
Branch: jruoho-x86intr
Changes since 1.24: +5 -5 lines
Diff to previous 1.24 (colored) next main 1.25 (colored)

Sync with HEAD.

Revision 1.24.22.1 / (download) - annotate - [select for diffs], Sat Mar 5 20:56:00 2011 UTC (13 years, 1 month ago) by rmind
Branch: rmind-uvmplock
Changes since 1.24: +5 -5 lines
Diff to previous 1.24 (colored)

sync with head

Revision 1.24.30.1 / (download) - annotate - [select for diffs], Sat Mar 5 15:10:48 2011 UTC (13 years, 1 month ago) by bouyer
Branch: bouyer-quota2
Changes since 1.24: +5 -5 lines
Diff to previous 1.24 (colored) next main 1.25 (colored)

Sync with HEAD

Revision 1.26 / (download) - annotate - [select for diffs], Fri Feb 18 20:40:58 2011 UTC (13 years, 1 month ago) by drochner
Branch: MAIN
CVS Tags: cherry-xenmp-base, bouyer-quota2-nbase
Branch point for: cherry-xenmp
Changes since 1.25: +3 -3 lines
Diff to previous 1.25 (colored)

more "const"

Revision 1.25 / (download) - annotate - [select for diffs], Fri Feb 18 19:06:45 2011 UTC (13 years, 1 month ago) by drochner
Branch: MAIN
Changes since 1.24: +4 -4 lines
Diff to previous 1.24 (colored)

sprinkle some "const", documenting that the SA is not supposed to
change during an xform operation

Revision 1.21.6.1 / (download) - annotate - [select for diffs], Mon Jun 2 13:24:28 2008 UTC (15 years, 10 months ago) by mjf
Branch: mjf-devfs2
Changes since 1.21: +40 -24 lines
Diff to previous 1.21 (colored) next main 1.22 (colored)

Sync with HEAD.

Revision 1.21.8.1 / (download) - annotate - [select for diffs], Sun May 18 12:35:40 2008 UTC (15 years, 10 months ago) by yamt
Branch: yamt-pf42
Changes since 1.21: +40 -24 lines
Diff to previous 1.21 (colored) next main 1.22 (colored)

sync with head.

Revision 1.23.2.1 / (download) - annotate - [select for diffs], Fri May 16 02:25:45 2008 UTC (15 years, 11 months ago) by yamt
Branch: yamt-nfs-mp
Changes since 1.23: +4 -4 lines
Diff to previous 1.23 (colored) next main 1.24 (colored)

sync with head.

Revision 1.24 / (download) - annotate - [select for diffs], Sun Apr 27 12:58:48 2008 UTC (15 years, 11 months ago) by degroote
Branch: MAIN
CVS Tags: yamt-pf42-base4, yamt-pf42-base3, yamt-pf42-base2, yamt-nfs-mp-base9, yamt-nfs-mp-base8, yamt-nfs-mp-base7, yamt-nfs-mp-base6, yamt-nfs-mp-base5, yamt-nfs-mp-base4, yamt-nfs-mp-base3, yamt-nfs-mp-base2, yamt-nfs-mp-base11, yamt-nfs-mp-base10, wrstuden-revivesa-base-4, wrstuden-revivesa-base-3, wrstuden-revivesa-base-2, wrstuden-revivesa-base-1, wrstuden-revivesa-base, wrstuden-revivesa, uebayasi-xip-base4, uebayasi-xip-base3, uebayasi-xip-base2, uebayasi-xip-base1, uebayasi-xip-base, uebayasi-xip, simonb-wapbl-nbase, simonb-wapbl-base, simonb-wapbl, nick-hppapmap-base4, nick-hppapmap-base3, nick-hppapmap-base2, nick-hppapmap-base, nick-hppapmap, netbsd-5-base, netbsd-5-2-RELEASE, netbsd-5-2-RC1, netbsd-5-2-3-RELEASE, netbsd-5-2-2-RELEASE, netbsd-5-2-1-RELEASE, netbsd-5-2, netbsd-5-1-RELEASE, netbsd-5-1-RC4, netbsd-5-1-RC3, netbsd-5-1-RC2, netbsd-5-1-RC1, netbsd-5-1-5-RELEASE, netbsd-5-1-4-RELEASE, netbsd-5-1-3-RELEASE, netbsd-5-1-2-RELEASE, netbsd-5-1-1-RELEASE, netbsd-5-1, netbsd-5-0-RELEASE, netbsd-5-0-RC4, netbsd-5-0-RC3, netbsd-5-0-RC2, netbsd-5-0-RC1, netbsd-5-0-2-RELEASE, netbsd-5-0-1-RELEASE, netbsd-5-0, netbsd-5, mjf-devfs2-base, matt-premerge-20091211, matt-nb5-pq3-base, matt-nb5-pq3, matt-nb5-mips64-u2-k2-k4-k7-k8-k9, matt-nb5-mips64-u1-k1-k5, matt-nb5-mips64-premerge-20101231, matt-nb5-mips64-premerge-20091211, matt-nb5-mips64-k15, matt-nb5-mips64, matt-nb4-mips64-k7-u2a-k9b, matt-mips64-premerge-20101231, matt-mips64-base2, jymxensuspend-base, jym-xensuspend-nbase, jym-xensuspend-base, jym-xensuspend, jruoho-x86intr-base, hpcarm-cleanup-nbase, haad-nbase2, haad-dm-base2, haad-dm-base1, haad-dm-base, haad-dm, bouyer-quota2-base, ad-audiomp2-base, ad-audiomp2
Branch point for: rmind-uvmplock, jruoho-x86intr, bouyer-quota2
Changes since 1.23: +4 -4 lines
Diff to previous 1.23 (colored)

Fix some fallout from socket locking patch :

 - {ah6,esp6}_ctlinput must return void*
 - use correct wrapper for rip_usrreq

Revision 1.23 / (download) - annotate - [select for diffs], Thu Apr 24 11:38:38 2008 UTC (15 years, 11 months ago) by ad
Branch: MAIN
CVS Tags: yamt-nfs-mp-base
Branch point for: yamt-nfs-mp
Changes since 1.22: +12 -2 lines
Diff to previous 1.22 (colored)

Merge the socket locking patch:

- Socket layer becomes MP safe.
- Unix protocols become MP safe.
- Allows protocol processing interrupts to safely block on locks.
- Fixes a number of race conditions.

With much feedback from matt@ and plunky@.

Revision 1.22 / (download) - annotate - [select for diffs], Wed Apr 23 06:09:05 2008 UTC (15 years, 11 months ago) by thorpej
Branch: MAIN
Changes since 1.21: +30 -24 lines
Diff to previous 1.21 (colored)

Make IPSEC and FAST_IPSEC stats per-cpu.  Use <net/net_stats.h> and
netstat_sysctl().

Revision 1.17.16.3 / (download) - annotate - [select for diffs], Sun Mar 23 02:05:07 2008 UTC (16 years ago) by matt
Branch: matt-armv6
Changes since 1.17.16.2: +3 -3 lines
Diff to previous 1.17.16.2 (colored) to branchpoint 1.17 (colored) next main 1.18 (colored)

sync with HEAD

Revision 1.18.2.2 / (download) - annotate - [select for diffs], Mon Feb 18 21:07:13 2008 UTC (16 years, 1 month ago) by mjf
Branch: mjf-devfs
Changes since 1.18.2.1: +3 -3 lines
Diff to previous 1.18.2.1 (colored) to branchpoint 1.18 (colored) next main 1.19 (colored)

Sync with HEAD.

Revision 1.11.2.7 / (download) - annotate - [select for diffs], Mon Feb 11 15:00:09 2008 UTC (16 years, 2 months ago) by yamt
Branch: yamt-lazymbuf
Changes since 1.11.2.6: +3 -3 lines
Diff to previous 1.11.2.6 (colored) to branchpoint 1.11 (colored) next main 1.12 (colored)

sync with head.

Revision 1.21 / (download) - annotate - [select for diffs], Sun Feb 10 21:42:20 2008 UTC (16 years, 2 months ago) by degroote
Branch: MAIN
CVS Tags: yamt-pf42-baseX, yamt-pf42-base, yamt-lazymbuf-base15, yamt-lazymbuf-base14, nick-net80211-sync-base, nick-net80211-sync, mjf-devfs-base, matt-armv6-nbase, keiichi-mipv6-nbase, keiichi-mipv6-base, keiichi-mipv6, hpcarm-cleanup-base, ad-socklock-base1
Branch point for: yamt-pf42, mjf-devfs2
Changes since 1.20: +3 -3 lines
Diff to previous 1.20 (colored)

Fix build of FAST_IPSEC after the change of ip_newid prototype

Revision 1.11.2.6 / (download) - annotate - [select for diffs], Mon Jan 21 09:47:27 2008 UTC (16 years, 2 months ago) by yamt
Branch: yamt-lazymbuf
Changes since 1.11.2.5: +28 -10 lines
Diff to previous 1.11.2.5 (colored) to branchpoint 1.11 (colored)

sync with head

Revision 1.17.16.2 / (download) - annotate - [select for diffs], Wed Jan 9 01:57:43 2008 UTC (16 years, 3 months ago) by matt
Branch: matt-armv6
Changes since 1.17.16.1: +30 -14 lines
Diff to previous 1.17.16.1 (colored) to branchpoint 1.17 (colored)

sync with HEAD

Revision 1.14.4.2 / (download) - annotate - [select for diffs], Sun Jan 6 05:01:15 2008 UTC (16 years, 3 months ago) by wrstuden
Branch: wrstuden-fixsa
Changes since 1.14.4.1: +3 -5 lines
Diff to previous 1.14.4.1 (colored) to branchpoint 1.14 (colored) next main 1.15 (colored)

Catch up to netbsd-4.0 release.

Revision 1.17.14.2 / (download) - annotate - [select for diffs], Sun Dec 9 19:38:40 2007 UTC (16 years, 4 months ago) by jmcneill
Branch: jmcneill-pm
Changes since 1.17.14.1: +30 -14 lines
Diff to previous 1.17.14.1 (colored) to branchpoint 1.17 (colored) next main 1.18 (colored)

Sync with HEAD.

Revision 1.17.6.1 / (download) - annotate - [select for diffs], Sun Dec 9 16:04:07 2007 UTC (16 years, 4 months ago) by reinoud
Branch: reinoud-bufcleanup
Changes since 1.17: +28 -10 lines
Diff to previous 1.17 (colored) next main 1.18 (colored)

Pullup to HEAD

Revision 1.18.2.1 / (download) - annotate - [select for diffs], Sat Dec 8 18:21:19 2007 UTC (16 years, 4 months ago) by mjf
Branch: mjf-devfs
Changes since 1.18: +30 -14 lines
Diff to previous 1.18 (colored)

Sync with HEAD.

Revision 1.18.4.1 / (download) - annotate - [select for diffs], Sat Dec 8 17:58:00 2007 UTC (16 years, 4 months ago) by ad
Branch: vmlocking2
Changes since 1.18: +30 -14 lines
Diff to previous 1.18 (colored) next main 1.19 (colored)

Sync with head.

Revision 1.20 / (download) - annotate - [select for diffs], Fri Dec 7 19:46:18 2007 UTC (16 years, 4 months ago) by elad
Branch: MAIN
CVS Tags: yamt-kmem-base3, yamt-kmem-base2, yamt-kmem-base, yamt-kmem, vmlocking2-base3, vmlocking2-base2, reinoud-bufcleanup-nbase, matt-armv6-base, jmcneill-pm-base, cube-autoconf-base, cube-autoconf, bouyer-xeni386-nbase, bouyer-xeni386-merge1, bouyer-xeni386-base, bouyer-xeni386
Changes since 1.19: +28 -10 lines
Diff to previous 1.19 (colored)

Use struct initializers. No functional change.

Revision 1.11.2.5 / (download) - annotate - [select for diffs], Fri Dec 7 17:34:39 2007 UTC (16 years, 4 months ago) by yamt
Branch: yamt-lazymbuf
Changes since 1.11.2.4: +4 -6 lines
Diff to previous 1.11.2.4 (colored) to branchpoint 1.11 (colored)

sync with head

Revision 1.19 / (download) - annotate - [select for diffs], Tue Dec 4 10:28:45 2007 UTC (16 years, 4 months ago) by dyoung
Branch: MAIN
CVS Tags: reinoud-bufcleanup-base
Changes since 1.18: +4 -6 lines
Diff to previous 1.18 (colored)

Use IFNET_FOREACH() and IFADDR_FOREACH().

Revision 1.9.8.1 / (download) - annotate - [select for diffs], Sat Dec 1 17:33:47 2007 UTC (16 years, 4 months ago) by bouyer
Branch: netbsd-2
Changes since 1.9: +3 -5 lines
Diff to previous 1.9 (colored) next main 1.10 (colored)

Pull up following revision(s) (requested by adrianp in ticket #11395):
	sys/netipsec/xform_ah.c: revision 1.19 via patch
	sys/netipsec/ipsec.c: revision 1.34 via patch
	sys/netipsec/xform_ipip.c: revision 1.18 via patch
	sys/netipsec/ipsec_output.c: revision 1.23 via patch
	sys/netipsec/ipsec_osdep.h: revision 1.21 via patch
The function ipsec4_get_ulp assumes that ip_off is in host order. This results
in IPsec processing that is dependent on protocol and/or port can be bypassed.
Bug report, analysis and initial fix from Karl Knutsson.
Final patch and ok from degroote@

Revision 1.9.2.1 / (download) - annotate - [select for diffs], Sat Dec 1 17:33:15 2007 UTC (16 years, 4 months ago) by bouyer
Branch: netbsd-2-0
Changes since 1.9: +3 -5 lines
Diff to previous 1.9 (colored) next main 1.10 (colored)

Pull up following revision(s) (requested by adrianp in ticket #11395):
	sys/netipsec/xform_ah.c: revision 1.19 via patch
	sys/netipsec/ipsec.c: revision 1.34 via patch
	sys/netipsec/xform_ipip.c: revision 1.18 via patch
	sys/netipsec/ipsec_output.c: revision 1.23 via patch
	sys/netipsec/ipsec_osdep.h: revision 1.21 via patch
The function ipsec4_get_ulp assumes that ip_off is in host order. This results
in IPsec processing that is dependent on protocol and/or port can be bypassed.
Bug report, analysis and initial fix from Karl Knutsson.
Final patch and ok from degroote@

Revision 1.9.16.1 / (download) - annotate - [select for diffs], Sat Dec 1 17:32:29 2007 UTC (16 years, 4 months ago) by bouyer
Branch: netbsd-2-1
Changes since 1.9: +3 -5 lines
Diff to previous 1.9 (colored) next main 1.10 (colored)

Pull up following revision(s) (requested by adrianp in ticket #11395):
	sys/netipsec/xform_ah.c: revision 1.19 via patch
	sys/netipsec/ipsec.c: revision 1.34 via patch
	sys/netipsec/xform_ipip.c: revision 1.18 via patch
	sys/netipsec/ipsec_output.c: revision 1.23 via patch
	sys/netipsec/ipsec_osdep.h: revision 1.21 via patch
The function ipsec4_get_ulp assumes that ip_off is in host order. This results
in IPsec processing that is dependent on protocol and/or port can be bypassed.
Bug report, analysis and initial fix from Karl Knutsson.
Final patch and ok from degroote@

Revision 1.10.6.1 / (download) - annotate - [select for diffs], Thu Nov 22 19:02:17 2007 UTC (16 years, 4 months ago) by bouyer
Branch: netbsd-3-1
Changes since 1.10: +3 -5 lines
Diff to previous 1.10 (colored) next main 1.11 (colored)

Pull up following revision(s) (requested by adrianp in ticket #1878):
	sys/netipsec/xform_ah.c: revision 1.19 via patch
	sys/netipsec/ipsec.c: revision 1.34 via patch
	sys/netipsec/xform_ipip.c: revision 1.18 via patch
	sys/netipsec/ipsec_output.c: revision 1.23 via patch
	sys/netipsec/ipsec_osdep.h: revision 1.21 via patch
The function ipsec4_get_ulp assumes that ip_off is in host order. This results
in IPsec processing that is dependent on protocol and/or port can be bypassed.
Bug report, analysis and initial fix from Karl Knutsson.
Final patch and ok from degroote@

Revision 1.10.4.1 / (download) - annotate - [select for diffs], Thu Nov 22 19:01:37 2007 UTC (16 years, 4 months ago) by bouyer
Branch: netbsd-3-0
Changes since 1.10: +3 -5 lines
Diff to previous 1.10 (colored) next main 1.11 (colored)

Pull up following revision(s) (requested by adrianp in ticket #1878):
	sys/netipsec/xform_ah.c: revision 1.19 via patch
	sys/netipsec/ipsec.c: revision 1.34 via patch
	sys/netipsec/xform_ipip.c: revision 1.18 via patch
	sys/netipsec/ipsec_output.c: revision 1.23 via patch
	sys/netipsec/ipsec_osdep.h: revision 1.21 via patch
The function ipsec4_get_ulp assumes that ip_off is in host order. This results
in IPsec processing that is dependent on protocol and/or port can be bypassed.
Bug report, analysis and initial fix from Karl Knutsson.
Final patch and ok from degroote@

Revision 1.10.2.1 / (download) - annotate - [select for diffs], Thu Nov 22 19:00:53 2007 UTC (16 years, 4 months ago) by bouyer
Branch: netbsd-3
Changes since 1.10: +3 -5 lines
Diff to previous 1.10 (colored) next main 1.11 (colored)

Pull up following revision(s) (requested by adrianp in ticket #1878):
	sys/netipsec/xform_ah.c: revision 1.19 via patch
	sys/netipsec/ipsec.c: revision 1.34 via patch
	sys/netipsec/xform_ipip.c: revision 1.18 via patch
	sys/netipsec/ipsec_output.c: revision 1.23 via patch
	sys/netipsec/ipsec_osdep.h: revision 1.21 via patch
The function ipsec4_get_ulp assumes that ip_off is in host order. This results
in IPsec processing that is dependent on protocol and/or port can be bypassed.
Bug report, analysis and initial fix from Karl Knutsson.
Final patch and ok from degroote@

Revision 1.11.2.4 / (download) - annotate - [select for diffs], Thu Nov 15 11:45:17 2007 UTC (16 years, 5 months ago) by yamt
Branch: yamt-lazymbuf
Changes since 1.11.2.3: +3 -5 lines
Diff to previous 1.11.2.3 (colored) to branchpoint 1.11 (colored)

sync with head.

Revision 1.17.20.1 / (download) - annotate - [select for diffs], Tue Nov 13 16:03:04 2007 UTC (16 years, 5 months ago) by bouyer
Branch: bouyer-xenamd64
Changes since 1.17: +3 -5 lines
Diff to previous 1.17 (colored) next main 1.18 (colored)

Sync with HEAD

Revision 1.17.16.1 / (download) - annotate - [select for diffs], Tue Nov 6 23:34:14 2007 UTC (16 years, 5 months ago) by matt
Branch: matt-armv6
CVS Tags: matt-armv6-prevmlocking
Changes since 1.17: +3 -5 lines
Diff to previous 1.17 (colored)

sync with HEAD

Revision 1.14.2.2 / (download) - annotate - [select for diffs], Wed Oct 31 12:39:29 2007 UTC (16 years, 5 months ago) by liamjfoy
Branch: netbsd-4
CVS Tags: wrstuden-fixsa-newbase, wrstuden-fixsa-base-1, wrstuden-fixsa-base, netbsd-4-0-RELEASE, netbsd-4-0-RC5, netbsd-4-0-RC4, netbsd-4-0-1-RELEASE, netbsd-4-0, matt-nb4-arm-base, matt-nb4-arm
Changes since 1.14.2.1: +3 -5 lines
Diff to previous 1.14.2.1 (colored) to branchpoint 1.14 (colored) next main 1.15 (colored)

Pull up following revision(s) (requested by adrianp in ticket #964):
	sys/netipsec/xform_ah.c: revision 1.19
	sys/netipsec/ipsec.c: revision 1.34
	sys/netipsec/xform_ipip.c: revision 1.18
	sys/netipsec/ipsec_output.c: revision 1.23
	sys/netipsec/ipsec_osdep.h: revision 1.21
The function ipsec4_get_ulp assumes that ip_off is in host order. This results
in IPsec processing that is dependent on protocol and/or port can be bypassed.
Bug report, analysis and initial fix from Karl Knutsson.
Final patch and ok from degroote&#64;

Revision 1.17.14.1 / (download) - annotate - [select for diffs], Sun Oct 28 20:11:15 2007 UTC (16 years, 5 months ago) by joerg
Branch: jmcneill-pm
Changes since 1.17: +3 -5 lines
Diff to previous 1.17 (colored)

Sync with HEAD.

Revision 1.18 / (download) - annotate - [select for diffs], Sun Oct 28 15:48:23 2007 UTC (16 years, 5 months ago) by adrianp
Branch: MAIN
CVS Tags: vmlocking2-base1, vmlocking-nbase, jmcneill-base, bouyer-xenamd64-base2, bouyer-xenamd64-base
Branch point for: vmlocking2, mjf-devfs
Changes since 1.17: +3 -5 lines
Diff to previous 1.17 (colored)

The function ipsec4_get_ulp assumes that ip_off is in host order. This results
in IPsec processing that is dependent on protocol and/or port can be bypassed.

Bug report, analysis and initial fix from Karl Knutsson.
Final patch and ok from degroote@

Revision 1.11.2.3 / (download) - annotate - [select for diffs], Mon Sep 3 14:43:48 2007 UTC (16 years, 7 months ago) by yamt
Branch: yamt-lazymbuf
Changes since 1.11.2.2: +7 -7 lines
Diff to previous 1.11.2.2 (colored) to branchpoint 1.11 (colored)

sync with head.

Revision 1.14.4.1 / (download) - annotate - [select for diffs], Mon Jun 4 01:54:28 2007 UTC (16 years, 10 months ago) by wrstuden
Branch: wrstuden-fixsa
Changes since 1.14: +20 -14 lines
Diff to previous 1.14 (colored)

Update to today's netbsd-4.

Revision 1.14.2.1 / (download) - annotate - [select for diffs], Thu May 24 19:13:12 2007 UTC (16 years, 10 months ago) by pavel
Branch: netbsd-4
CVS Tags: netbsd-4-0-RC3, netbsd-4-0-RC2, netbsd-4-0-RC1
Changes since 1.14: +20 -14 lines
Diff to previous 1.14 (colored)

Pull up following revision(s) (requested by degroote in ticket #667):
	sys/netinet/tcp_input.c: revision 1.260
	sys/netinet/tcp_output.c: revision 1.154
	sys/netinet/tcp_subr.c: revision 1.210
	sys/netinet6/icmp6.c: revision 1.129
	sys/netinet6/in6_proto.c: revision 1.70
	sys/netinet6/ip6_forward.c: revision 1.54
	sys/netinet6/ip6_input.c: revision 1.94
	sys/netinet6/ip6_output.c: revision 1.114
	sys/netinet6/raw_ip6.c: revision 1.81
	sys/netipsec/ipcomp_var.h: revision 1.4
	sys/netipsec/ipsec.c: revision 1.26 via patch,1.31-1.32
	sys/netipsec/ipsec6.h: revision 1.5
	sys/netipsec/ipsec_input.c: revision 1.14
	sys/netipsec/ipsec_netbsd.c: revision 1.18,1.26
	sys/netipsec/ipsec_output.c: revision 1.21 via patch
	sys/netipsec/key.c: revision 1.33,1.44
	sys/netipsec/xform_ipcomp.c: revision 1.9
	sys/netipsec/xform_ipip.c: revision 1.15
	sys/opencrypto/deflate.c: revision 1.8
Commit my SoC work
Add ipv6 support for fast_ipsec
Note that currently, packet with extensions headers are not correctly
supported
Change the ipcomp logic

Add sysctl tree to modify the fast_ipsec options related to ipv6. Similar
to the sysctl kame interface.

Choose the good default policy, depending of the adress family of the
desired policy

Increase the refcount for the default ipv6 policy so nobody can reclaim it

Always compute the sp index even if we don't have any sp in spd. It will
let us to choose the right default policy (based on the adress family
requested).
While here, fix an error message

Use dynamic array instead of an static array to decompress. It lets us to
decompress any data, whatever is the radio decompressed data / compressed
data.
It fixes the last issues with fast_ipsec and ipcomp.
While here, bzero -> memset, bcopy -> memcpy, FREE -> free
Reviewed a long time ago by sam@

Revision 1.15.2.1 / (download) - annotate - [select for diffs], Mon Mar 12 06:00:12 2007 UTC (17 years, 1 month ago) by rmind
Branch: yamt-idlelwp
Changes since 1.15: +7 -7 lines
Diff to previous 1.15 (colored) next main 1.16 (colored)

Sync with HEAD.

Revision 1.17 / (download) - annotate - [select for diffs], Sun Mar 4 21:17:56 2007 UTC (17 years, 1 month ago) by degroote
Branch: MAIN
CVS Tags: yamt-x86pmap-base4, yamt-x86pmap-base3, yamt-x86pmap-base2, yamt-x86pmap-base, yamt-x86pmap, yamt-idlelwp-base8, vmlocking-base, vmlocking, thorpej-atomic-base, thorpej-atomic, nick-csl-alignment-base5, nick-csl-alignment-base, nick-csl-alignment, mjf-ufs-trans-base, mjf-ufs-trans, matt-mips64-base, matt-mips64, hpcarm-cleanup
Branch point for: reinoud-bufcleanup, matt-armv6, jmcneill-pm, bouyer-xenamd64
Changes since 1.16: +7 -7 lines
Diff to previous 1.16 (colored)

Remove useless cast
Use NULL instead of (void*) 0

Revision 1.16 / (download) - annotate - [select for diffs], Sun Mar 4 06:03:30 2007 UTC (17 years, 1 month ago) by christos
Branch: MAIN
Changes since 1.15: +7 -7 lines
Diff to previous 1.15 (colored)

Kill caddr_t; there will be some MI fallout, but it will be fixed shortly.

Revision 1.11.2.2 / (download) - annotate - [select for diffs], Mon Feb 26 09:11:57 2007 UTC (17 years, 1 month ago) by yamt
Branch: yamt-lazymbuf
Changes since 1.11.2.1: +20 -14 lines
Diff to previous 1.11.2.1 (colored) to branchpoint 1.11 (colored)

sync with head.

Revision 1.15 / (download) - annotate - [select for diffs], Sat Feb 10 09:43:05 2007 UTC (17 years, 2 months ago) by degroote
Branch: MAIN
CVS Tags: ad-audiomp-base, ad-audiomp
Branch point for: yamt-idlelwp
Changes since 1.14: +20 -14 lines
Diff to previous 1.14 (colored)

Commit my SoC work
Add ipv6 support for fast_ipsec
Note that currently, packet with extensions headers are not correctly
supported
Change the ipcomp logic

Revision 1.11.2.1 / (download) - annotate - [select for diffs], Sat Dec 30 20:50:44 2006 UTC (17 years, 3 months ago) by yamt
Branch: yamt-lazymbuf
Changes since 1.11: +19 -9 lines
Diff to previous 1.11 (colored)

sync with head.

Revision 1.12.22.2 / (download) - annotate - [select for diffs], Sun Dec 10 07:19:20 2006 UTC (17 years, 4 months ago) by yamt
Branch: yamt-splraiseipl
Changes since 1.12.22.1: +12 -12 lines
Diff to previous 1.12.22.1 (colored) to branchpoint 1.12 (colored) next main 1.13 (colored)

sync with head.

Revision 1.12.20.1 / (download) - annotate - [select for diffs], Sat Nov 18 21:39:41 2006 UTC (17 years, 4 months ago) by ad
Branch: newlock2
Changes since 1.12: +19 -9 lines
Diff to previous 1.12 (colored) next main 1.13 (colored)

Sync with head.

Revision 1.14 / (download) - annotate - [select for diffs], Thu Nov 16 01:33:49 2006 UTC (17 years, 5 months ago) by christos
Branch: MAIN
CVS Tags: yamt-splraiseipl-base5, yamt-splraiseipl-base4, yamt-splraiseipl-base3, post-newlock2-merge, newlock2-nbase, newlock2-base, netbsd-4-base
Branch point for: wrstuden-fixsa, netbsd-4
Changes since 1.13: +12 -12 lines
Diff to previous 1.13 (colored)

__unused removal on arguments; approved by core.

Revision 1.12.22.1 / (download) - annotate - [select for diffs], Sun Oct 22 06:07:39 2006 UTC (17 years, 5 months ago) by yamt
Branch: yamt-splraiseipl
Changes since 1.12: +21 -11 lines
Diff to previous 1.12 (colored)

sync with head

Revision 1.13 / (download) - annotate - [select for diffs], Fri Oct 13 20:53:59 2006 UTC (17 years, 6 months ago) by christos
Branch: MAIN
CVS Tags: yamt-splraiseipl-base2
Changes since 1.12: +21 -11 lines
Diff to previous 1.12 (colored)

more __unused

Revision 1.12 / (download) - annotate - [select for diffs], Sun Dec 11 12:25:06 2005 UTC (18 years, 4 months ago) by christos
Branch: MAIN
CVS Tags: yamt-uio_vmspace-base5, yamt-uio_vmspace, yamt-splraiseipl-base, yamt-pdpolicy-base9, yamt-pdpolicy-base8, yamt-pdpolicy-base7, yamt-pdpolicy-base6, yamt-pdpolicy-base5, yamt-pdpolicy-base4, yamt-pdpolicy-base3, yamt-pdpolicy-base2, yamt-pdpolicy-base, yamt-pdpolicy, simonb-timecounters-base, simonb-timecounters, simonb-timcounters-final, rpaulo-netinet-merge-pcb-base, rpaulo-netinet-merge-pcb, peter-altq-base, peter-altq, gdamore-uart-base, gdamore-uart, elad-kernelauth-base, elad-kernelauth, chap-midi-nbase, chap-midi-base, chap-midi, abandoned-netbsd-4-base, abandoned-netbsd-4
Branch point for: yamt-splraiseipl, newlock2
Changes since 1.11: +2 -2 lines
Diff to previous 1.11 (colored)

merge ktrace-lwp.

Revision 1.9.4.6 / (download) - annotate - [select for diffs], Thu Nov 10 14:11:35 2005 UTC (18 years, 5 months ago) by skrll
Branch: ktrace-lwp
Changes since 1.9.4.5: +3 -3 lines
Diff to previous 1.9.4.5 (colored) to branchpoint 1.9 (colored) next main 1.10 (colored)

Sync with HEAD. Here we go again...

Revision 1.11 / (download) - annotate - [select for diffs], Mon Jun 6 06:06:50 2005 UTC (18 years, 10 months ago) by martin
Branch: MAIN
CVS Tags: yamt-vop-base3, yamt-vop-base2, yamt-vop-base, yamt-vop, yamt-readahead-pervnode, yamt-readahead-perfile, yamt-readahead-base3, yamt-readahead-base2, yamt-readahead-base, yamt-readahead, thorpej-vnode-attr-base, thorpej-vnode-attr, ktrace-lwp-base
Branch point for: yamt-lazymbuf
Changes since 1.10: +3 -3 lines
Diff to previous 1.10 (colored)

Since we decided "const struct mbuf *" would not do the right thing (tm),
remove ~all const from mbuf pointers.

Revision 1.9.10.1 / (download) - annotate - [select for diffs], Fri Apr 29 11:29:35 2005 UTC (18 years, 11 months ago) by kent
Branch: kent-audio2
Changes since 1.9: +4 -4 lines
Diff to previous 1.9 (colored) next main 1.10 (colored)

sync with -current

Revision 1.9.12.1 / (download) - annotate - [select for diffs], Sat Mar 19 08:36:41 2005 UTC (19 years ago) by yamt
Branch: yamt-km
Changes since 1.9: +4 -4 lines
Diff to previous 1.9 (colored) next main 1.10 (colored)

sync with head.  xen and whitespace.  xen part is not finished.

Revision 1.9.4.5 / (download) - annotate - [select for diffs], Fri Mar 4 16:53:44 2005 UTC (19 years, 1 month ago) by skrll
Branch: ktrace-lwp
Changes since 1.9.4.4: +4 -4 lines
Diff to previous 1.9.4.4 (colored) to branchpoint 1.9 (colored)

Sync with HEAD.

Hi Perry!

Revision 1.10 / (download) - annotate - [select for diffs], Sat Feb 26 22:45:13 2005 UTC (19 years, 1 month ago) by perry
Branch: MAIN
CVS Tags: yamt-km-base4, yamt-km-base3, netbsd-3-base, netbsd-3-1-RELEASE, netbsd-3-1-RC4, netbsd-3-1-RC3, netbsd-3-1-RC2, netbsd-3-1-RC1, netbsd-3-1-1-RELEASE, netbsd-3-0-RELEASE, netbsd-3-0-RC6, netbsd-3-0-RC5, netbsd-3-0-RC4, netbsd-3-0-RC3, netbsd-3-0-RC2, netbsd-3-0-RC1, netbsd-3-0-3-RELEASE, netbsd-3-0-2-RELEASE, netbsd-3-0-1-RELEASE, kent-audio2-base
Branch point for: netbsd-3-1, netbsd-3-0, netbsd-3
Changes since 1.9: +4 -4 lines
Diff to previous 1.9 (colored)

nuke trailing whitespace

Revision 1.9.4.4 / (download) - annotate - [select for diffs], Tue Sep 21 13:37:48 2004 UTC (19 years, 6 months ago) by skrll
Branch: ktrace-lwp
Changes since 1.9.4.3: +2 -2 lines
Diff to previous 1.9.4.3 (colored) to branchpoint 1.9 (colored)

Fix the sync with head I botched.

Revision 1.9.4.3 / (download) - annotate - [select for diffs], Sat Sep 18 14:55:32 2004 UTC (19 years, 6 months ago) by skrll
Branch: ktrace-lwp
Changes since 1.9.4.2: +2 -2 lines
Diff to previous 1.9.4.2 (colored) to branchpoint 1.9 (colored)

Sync with HEAD.

Revision 1.9.4.2 / (download) - annotate - [select for diffs], Tue Aug 3 10:55:29 2004 UTC (19 years, 8 months ago) by skrll
Branch: ktrace-lwp
Changes since 1.9.4.1: +732 -0 lines
Diff to previous 1.9.4.1 (colored) to branchpoint 1.9 (colored)

Sync with HEAD

Revision 1.9.4.1, Wed Mar 17 00:21:43 2004 UTC (20 years, 1 month ago) by skrll
Branch: ktrace-lwp
Changes since 1.9: +0 -732 lines
FILE REMOVED

file xform_ipip.c was added on branch ktrace-lwp on 2004-08-03 10:55:29 +0000

Revision 1.9 / (download) - annotate - [select for diffs], Wed Mar 17 00:21:43 2004 UTC (20 years, 1 month ago) by jonathan
Branch: MAIN
CVS Tags: yamt-km-base2, yamt-km-base, netbsd-2-base, netbsd-2-1-RELEASE, netbsd-2-1-RC6, netbsd-2-1-RC5, netbsd-2-1-RC4, netbsd-2-1-RC3, netbsd-2-1-RC2, netbsd-2-1-RC1, netbsd-2-0-base, netbsd-2-0-RELEASE, netbsd-2-0-RC5, netbsd-2-0-RC4, netbsd-2-0-RC3, netbsd-2-0-RC2, netbsd-2-0-RC1, netbsd-2-0-3-RELEASE, netbsd-2-0-2-RELEASE, netbsd-2-0-1-RELEASE, kent-audio1-beforemerge, kent-audio1-base, kent-audio1
Branch point for: yamt-km, netbsd-2-1, netbsd-2-0, netbsd-2, ktrace-lwp, kent-audio2
Changes since 1.8: +5 -3 lines
Diff to previous 1.8 (colored)

sys/netinet6/ip6_ecn.h is reportedly a FreeBSD-ism; NetBSD has
prototypes for the IPv6 ECN ingress/egress functions in sys/netinet/ip_ecn.h,
inside an #ifdef INET6 wrapper.   So, wrap sys/netipsec ocurrences of
	#include <netinet6/ip6_ecn.h>
in #ifdef __FreeBSD__/#endif, until both camps can agree on this
teensy little piece of namespace. Affects:
    ipsec_output.c xform_ah.c xform_esp.c xform_ipip.c

Revision 1.8 / (download) - annotate - [select for diffs], Fri Jan 16 11:06:27 2004 UTC (20 years, 3 months ago) by scw
Branch: MAIN
Changes since 1.7: +4 -4 lines
Diff to previous 1.7 (colored)

Fix ipip_output() to always set *mp to NULL on failure, even if 'm'
is NULL, otherwise ipsec4_process_packet() may try to m_freem() a
bad pointer.

In ipsec4_process_packet(), don't try to m_freem() 'm' twice; ipip_output()
already did it.

Revision 1.7 / (download) - annotate - [select for diffs], Mon Nov 17 21:34:27 2003 UTC (20 years, 5 months ago) by jonathan
Branch: MAIN
Changes since 1.6: +5 -3 lines
Diff to previous 1.6 (colored)

Revert the (default) ip_id algorithm to the pre-randomid algorithm,
due to demonstrated low-period repeated IDs from the randomized IP_id
code.  Consensus is that the low-period repetition (much less than
2^15) is not suitable for general-purpose use.

Allocators of new IPv4 IDs should now call the function ip_newid().
Randomized IP_ids is now a config-time option, "options RANDOM_IP_ID".
ip_newid() can use ip_random-id()_IP_ID if and only if configured
with RANDOM_IP_ID. A sysctl knob should be  provided.

This API may be reworked in the near future to support linear ip_id
counters per (src,dst) IP-address pair.

Revision 1.6 / (download) - annotate - [select for diffs], Fri Nov 14 07:15:28 2003 UTC (20 years, 5 months ago) by jonathan
Branch: MAIN
Changes since 1.5: +3 -3 lines
Diff to previous 1.5 (colored)

Use ip_randomid(), dependent on either __NetBSD__ preprocessor
token or FreeBSD RANDOM_IP_ID config option.

Revision 1.5 / (download) - annotate - [select for diffs], Mon Oct 6 22:05:15 2003 UTC (20 years, 6 months ago) by tls
Branch: MAIN
Changes since 1.4: +9 -5 lines
Diff to previous 1.4 (colored)

Reversion of "netkey merge", part 2 (replacement of removed files in the
repository by christos was part 1).  netipsec should now be back as it
was on 2003-09-11, with some very minor changes:

1) Some residual platform-dependent code was moved from ipsec.h to
   ipsec_osdep.h; without this, IPSEC_ASSERT() was multiply defined.  ipsec.h
   now includes ipsec_osdep.h

2) itojun's renaming of netipsec/files.ipsec to netipsec/files.netipsec has
   been left in place (it's arguable which name is less confusing but the
   rename is pretty harmless).

3) Some #endif TOKEN has been replaced by #endif /* TOKEN */; #endif TOKEN
   is invalid and GCC 3 won't compile it.

An i386 kernel with "options FAST_IPSEC" and "options OPENCRYPTO" now
gets through "make depend" but fails to build with errors in ip_input.c.
But it's better than it was (thank heaven for small favors).

Revision 1.4 / (download) - annotate - [select for diffs], Fri Sep 12 11:21:00 2003 UTC (20 years, 7 months ago) by itojun
Branch: MAIN
Changes since 1.3: +4 -4 lines
Diff to previous 1.3 (colored)

merge netipsec/key* into netkey/key*.  no need for both.
change confusing filename

Revision 1.3 / (download) - annotate - [select for diffs], Fri Sep 12 11:09:31 2003 UTC (20 years, 7 months ago) by itojun
Branch: MAIN
Changes since 1.2: +3 -7 lines
Diff to previous 1.2 (colored)

use ip_randomid

Revision 1.2 / (download) - annotate - [select for diffs], Wed Aug 20 22:33:41 2003 UTC (20 years, 7 months ago) by jonathan
Branch: MAIN
Changes since 1.1: +3 -3 lines
Diff to previous 1.1 (colored)

opt_inet6.h is FreeBSD-specific, so wrap it with #ifdef __FreeBSD__/#endif.

Revision 1.1 / (download) - annotate - [select for diffs], Wed Aug 13 20:06:52 2003 UTC (20 years, 8 months ago) by jonathan
Branch: MAIN

Initial import of Sam Leffler's `Fast-IPsec' from FreeBSD 4.
Fast-IPsec is a rework of the OpenBSD and KAME IPsec code, using the
OpenCryptoFramework (and thus hardware crypto accelerators) and
numerous detailed performance improvements.

This import is (aside from SPL-level names) the FreeBSD source,
imported ``as-is'' as a historical snapshot, for future maintenance
and comparison against the FreeBSD source.  For now, several minor
kernel-API differences are hidden by macros a shim file, ipsec_osdep.h,
which (aside from SPL names) can be targeted at either NetBSD or FreeBSD.

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.




CVSweb <webmaster@jp.NetBSD.org>