The NetBSD Project

CVS log for src/sys/net/npf/npf_impl.h

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

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.82 / (download) - annotate - [select for diffs], Thu Aug 27 18:50:25 2020 UTC (3 years, 7 months ago) by riastradh
Branch: MAIN
CVS Tags: thorpej-ifq-base, thorpej-ifq, 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, 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, cjep_sun2x-base1, cjep_sun2x-base, cjep_sun2x, cjep_staticlib_x-base1, cjep_staticlib_x-base, cjep_staticlib_x, bouyer-sunxi-drm-base, bouyer-sunxi-drm, HEAD
Changes since 1.81: +3 -0 lines
Diff to previous 1.81 (colored)

npf: Make sure to initialize portmap_lock only once.

PR kern/55586

Revision 1.75.2.5 / (download) - annotate - [select for diffs], Sat Jun 20 15:46:47 2020 UTC (3 years, 9 months ago) by martin
Branch: netbsd-9
CVS Tags: netbsd-9-3-RELEASE, netbsd-9-2-RELEASE, netbsd-9-1-RELEASE
Changes since 1.75.2.4: +40 -28 lines
Diff to previous 1.75.2.4 (colored) to branchpoint 1.75 (colored) next main 1.76 (colored)

Pull up following revision(s) (requested by rmind in ticket #956):

	usr.sbin/npf/npf-params.7: revision 1.4
	sys/net/npf/npf_worker.c: revision 1.9
	usr.sbin/npf/npftest/npftest.h: revision 1.17
	usr.sbin/npf/npfctl/npf_bpf_comp.c: revision 1.16
	usr.sbin/npf/npf-params.7: revision 1.5
	sys/net/npf/npf_state_tcp.c: revision 1.21
	usr.sbin/npf/npfctl/npf_build.c: revision 1.55
	usr.sbin/npf/npf-params.7: revision 1.6
	sys/net/npf/npfkern.h: revision 1.5
	lib/libnpf/npf.c: revision 1.49
	usr.sbin/npf/npf-params.7: revision 1.7
	sys/net/npf/npf_impl.h: revision 1.81
	sys/net/npf/npf_ext_log.c: revision 1.17
	usr.sbin/npf/npfctl/npfctl.h: revision 1.53
	usr.sbin/npf/npftest/libnpftest/npf_mbuf_subr.c: revision 1.11
	sys/net/npf/npf_nat.c: revision 1.50
	sys/net/npf/npf_mbuf.c: revision 1.24
	sys/net/npf/npf_alg.c: revision 1.22
	usr.sbin/npf/npftest/libnpftest/npf_nat_test.c: revision 1.14
	usr.sbin/npf/npftest/libnpftest/npf_conn_test.c: file removal
	usr.sbin/npf/npftest/libnpftest/npf_state_test.c: revision 1.10
	sys/net/npf/npf.h: revision 1.63
	usr.sbin/npf/npftest/libnpftest/npf_test.h: revision 1.21
	usr.sbin/npf/npfctl/npf_var.c: revision 1.13
	sys/net/npf/files.npf: revision 1.23
	usr.sbin/npf/npfctl/npf_show.c: revision 1.32
	usr.sbin/npf/npfctl/npf.conf.5: revision 1.91
	sys/net/npf/npf_os.c: revision 1.18
	sys/net/npf/npf_connkey.c: revision 1.2
	sys/net/npf/npf_conf.c: revision 1.17
	lib/libnpf/libnpf.3: revision 1.12
	usr.sbin/npf/npftest/npftest.c: revision 1.25
	usr.sbin/npf/npftest/libnpftest/npf_gc_test.c: revision 1.1
	usr.sbin/npf/npfctl/npf_parse.y: revision 1.51
	sys/net/npf/npf_tableset.c: revision 1.35
	usr.sbin/npf/npftest/npftest.conf: revision 1.9
	sys/net/npf/npf_sendpkt.c: revision 1.22
	usr.sbin/npf/npfctl/npf_var.h: revision 1.10
	sys/net/npf/npf_state.c: revision 1.23
	sys/net/npf/npf_conn.h: revision 1.20
	usr.sbin/npf/npfctl/npfctl.c: revision 1.64
	usr.sbin/npf/npfctl/npf_cmd.c: revision 1.1
	sys/net/npf/npf_portmap.c: revision 1.5
	sys/net/npf/npf_params.c: revision 1.3
	usr.sbin/npf/npfctl/npf_scan.l: revision 1.32
	tests/net/npf/t_npf.sh: revision 1.4
	sys/net/npf/npf_ext_rndblock.c: revision 1.9
	lib/libnpf/npf.h: revision 1.39
	sys/net/npf/npf_ruleset.c: revision 1.51
	sys/net/npf/npf_alg_icmp.c: revision 1.33
	sys/net/npf/npf.c: revision 1.43
	usr.sbin/npf/npftest/libnpftest/npf_test_subr.c: revision 1.17
	usr.sbin/npf/npfctl/npfctl.8: revision 1.25
	sys/net/npf/npf_ctl.c: revision 1.60
	usr.sbin/npf/npftest/libnpftest/npf_test_subr.c: revision 1.18
	usr.sbin/npf/npftest/libnpftest/Makefile: revision 1.11
	sys/net/npf/npf_handler.c: revision 1.49
	sys/net/npf/npf_inet.c: revision 1.57
	sys/net/npf/npf_ifaddr.c: revision 1.7
	sys/net/npf/npf_conndb.c: revision 1.9
	sys/net/npf/npf_if.c: revision 1.13
	usr.sbin/npf/npfctl/Makefile: revision 1.15
	sys/net/npf/npf_conn.c: revision 1.32
	sys/net/npf/npf_ext_normalize.c: revision 1.10
	sys/net/npf/npf_rproc.c: revision 1.20
	sys/net/npf/npf_worker.c: revision 1.8

Major NPF improvements (merge from upstream):
- Switch to the C11-style atomic primitives using atomic_loadstore(9).
- npfkern: introduce the 'state.key.interface' and 'state.key.direction'
  settings.  Users can now choose whether the connection state should be
  strictly per-interface or global at the configuration level.  Keep NAT
  logic to be always per-interface, though.
- npfkern: rewrite the G/C worker logic and make it self-tuning.
- npfkern and libnpf: multiple bug fixes; add param exporting; introduce
  more parameters.  Remove npf_nvlist_{copyin,copyout}() functions and
  refactor npfctl_load_nvlist() with others; add npfctl_run_op() to have
  a single entry point for operations.  Introduce npf_flow_t and clean up
  some code.
- npfctl: lots of fixes for the 'npfctl show' logic; make 'npfctl list'
  more informative; misc usability improvements and more user-friendly
  error messages.
- Amend and improve the manual pages.

npf_worker_sys{init,fini}: initialize/destroy the exit_cv condvar.

npftest -- npf_test_init(): add a workaround for NetBSD.

npf-params(7): fix the state.key defaults.

npf-params.7: s/filer/filter/

Adjust to "npfctl debug" command line changes, from rmind@.

Use more markup.

Revision 1.81 / (download) - annotate - [select for diffs], Sat May 30 14:16:56 2020 UTC (3 years, 10 months ago) by rmind
Branch: MAIN
Changes since 1.80: +40 -28 lines
Diff to previous 1.80 (colored)

Major NPF improvements (merge from upstream):

- Switch to the C11-style atomic primitives using atomic_loadstore(9).

- npfkern: introduce the 'state.key.interface' and 'state.key.direction'
  settings.  Users can now choose whether the connection state should be
  strictly per-interface or global at the configuration level.  Keep NAT
  logic to be always per-interface, though.

- npfkern: rewrite the G/C worker logic and make it self-tuning.

- npfkern and libnpf: multiple bug fixes; add param exporting; introduce
  more parameters.  Remove npf_nvlist_{copyin,copyout}() functions and
  refactor npfctl_load_nvlist() with others; add npfctl_run_op() to have
  a single entry point for operations.  Introduce npf_flow_t and clean up
  some code.

- npfctl: lots of fixes for the 'npfctl show' logic; make 'npfctl list'
  more informative; misc usability improvements and more user-friendly
  error messages.

- Amend and improve the manual pages.

Revision 1.70.4.2 / (download) - annotate - [select for diffs], Mon Apr 13 08:05:15 2020 UTC (4 years ago) by martin
Branch: phil-wifi
Changes since 1.70.4.1: +99 -34 lines
Diff to previous 1.70.4.1 (colored) to branchpoint 1.70 (colored) next main 1.71 (colored)

Mostly merge changes from HEAD upto 20200411

Revision 1.75.2.4 / (download) - annotate - [select for diffs], Fri Oct 4 08:06:35 2019 UTC (4 years, 6 months ago) by martin
Branch: netbsd-9
CVS Tags: netbsd-9-0-RELEASE, netbsd-9-0-RC2, netbsd-9-0-RC1
Changes since 1.75.2.3: +4 -2 lines
Diff to previous 1.75.2.3 (colored) to branchpoint 1.75 (colored)

Pull up following revision(s) (requested by rmind in ticket #282):

	usr.sbin/npf/npfctl/npf_build.c: revision 1.53
	lib/libnpf/npf.c: revision 1.48
	usr.sbin/npf/npfctl/npfctl.h: revision 1.50
	sys/net/npf/npf_impl.h: revision 1.80
	usr.sbin/npf/npfctl/npfctl.h: revision 1.51
	sys/net/npf/npf_ruleset.c: revision 1.49
	usr.sbin/npf/npfctl/npf.conf.5: revision 1.90
	sys/net/npf/npf_ctl.c: revision 1.59
	lib/libnpf/libnpf.3: revision 1.11
	usr.sbin/npf/npfctl/npf_parse.y: revision 1.50
	usr.sbin/npf/npftest/npftest.conf: revision 1.8
	usr.sbin/npf/npfctl/npfctl.c: revision 1.62
	usr.sbin/npf/npfctl/npfctl.c: revision 1.63
	usr.sbin/npf/npfctl/npf_scan.l: revision 1.30
	usr.sbin/npf/npfctl/npfctl.8: revision 1.22
	lib/libnpf/npf.h: revision 1.38
	usr.sbin/npf/npfctl/npfctl.8: revision 1.23
	usr.sbin/npf/npfctl/npfctl.8: revision 1.24
	sys/net/npf/npf_if.c: revision 1.11
	sys/net/npf/npf_if.c: revision 1.12
	usr.sbin/npf/npfctl/npf.conf.5: revision 1.89
	sys/net/npf/npf_conn.c: revision 1.30
	usr.sbin/npf/npfctl/npf_build.c: revision 1.52

npfctl: implement table replace subcommand.
Contributed by Timshel Knoll-Miller.

NPF ifmap: rework and fix a few small bugs.

npfctl: implement table replace subcommand.
Contributed by Timshel Knoll-Miller.
(missed a file in previous commit; cvs is so helpful..)

libnpf/npfctl: support dynamic NAT rulesets using a name prefix.

Use -width Pa for FILES.

Fix pasto in table replace -t type

Use -width Pa for FILES.

npf_ifmap_copylogname: be more defensive.

Revision 1.80 / (download) - annotate - [select for diffs], Sun Sep 29 17:00:29 2019 UTC (4 years, 6 months ago) by rmind
Branch: MAIN
CVS Tags: phil-wifi-20200421, phil-wifi-20200411, phil-wifi-20200406, phil-wifi-20191119, is-mlppp-base, is-mlppp, 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.79: +4 -2 lines
Diff to previous 1.79 (colored)

NPF ifmap: rework and fix a few small bugs.

Revision 1.75.2.3 / (download) - annotate - [select for diffs], Sun Sep 1 13:21:39 2019 UTC (4 years, 7 months ago) by martin
Branch: netbsd-9
Changes since 1.75.2.2: +30 -22 lines
Diff to previous 1.75.2.2 (colored) to branchpoint 1.75 (colored)

Pull up following revision(s) (requested by rmind in ticket #141):

	usr.sbin/npf/npfctl/npf_bpf_comp.c: revision 1.15
	sys/net/npf/npf_alg.c: revision 1.21
	sys/net/npf/npf.h: revision 1.62
	sys/net/npf/npf_ctl.c: revision 1.57
	sys/net/npf/npf_ctl.c: revision 1.58
	sys/net/npf/npf_os.c: revision 1.16
	sys/net/npf/npf_os.c: revision 1.17
	sys/net/npf/npf_conf.c: revision 1.15
	sys/net/npf/npf_impl.h: revision 1.78
	sys/sys/mbuf.h: revision 1.220
	sys/net/npf/npf_impl.h: revision 1.79
	sys/net/npf/npf.c: revision 1.41
	usr.sbin/npf/npftest/libnpftest/npf_rule_test.c: revision 1.19
	sys/net/npf/npf_nat.c: revision 1.48
	sys/net/npf/npf_handler.c: revision 1.48
	sys/net/npf/npf_ifaddr.c: revision 1.6

- npfctl_load_nvlist: simplify the config loading logic.
- Fix a small race condition in npf_nat_getaddr().
- Rework pserialize/EBR wrappers, make it easier to maintain.
Move PACKET_TAG_NPF where it belongs to.
Make npfctl_switch() and pfil private to OS-specific module.

Revision 1.75.2.2 / (download) - annotate - [select for diffs], Sun Sep 1 13:13:14 2019 UTC (4 years, 7 months ago) by martin
Branch: netbsd-9
Changes since 1.75.2.1: +2 -1 lines
Diff to previous 1.75.2.1 (colored) to branchpoint 1.75 (colored)

Pull up following revision(s) (requested by rmind in ticket #139):

	lib/libnpf/npf.c: revision 1.47
	usr.sbin/npf/npftest/libnpftest/npf_nbuf_test.c: revision 1.10
	usr.sbin/npf/npftest/libnpftest/npf_mbuf_subr.c: revision 1.10
	sys/net/npf/npf.h: revision 1.61
	sys/net/npf/npf_ctl.c: revision 1.56
	sys/net/npf/npf_os.c: revision 1.15
	lib/libnpf/libnpf.3: revision 1.10
	sys/net/npf/npf_tableset.c: revision 1.34
	usr.sbin/npf/npfctl/npfctl.c: revision 1.61
	sys/net/npf/npf_impl.h: revision 1.77
	lib/libnpf/npf.h: revision 1.37

- npftest: fix a memleak in a unit test (standalone path only).
- Minor style fixes.  No functional change.
npfkern/libnpf: Add support for the table replace/swap operation.
Contributed by Timshel Knoll-Miller.

Revision 1.79 / (download) - annotate - [select for diffs], Sun Aug 25 17:38:25 2019 UTC (4 years, 7 months ago) by rmind
Branch: MAIN
Changes since 1.78: +1 -7 lines
Diff to previous 1.78 (colored)

 ake npfctl_switch() and pfil private to OS-specific module.

Revision 1.78 / (download) - annotate - [select for diffs], Sun Aug 25 13:21:03 2019 UTC (4 years, 7 months ago) by rmind
Branch: MAIN
Changes since 1.77: +29 -15 lines
Diff to previous 1.77 (colored)

- npfctl_load_nvlist: simplify the config loading logic.
- Fix a small race condition in npf_nat_getaddr().
- Rework pserialize/EBR wrappers, make it easier to maintain.

Revision 1.77 / (download) - annotate - [select for diffs], Wed Aug 21 21:45:47 2019 UTC (4 years, 7 months ago) by rmind
Branch: MAIN
Changes since 1.76: +2 -1 lines
Diff to previous 1.76 (colored)

npfkern/libnpf: Add support for the table replace/swap operation.
Contributed by Timshel Knoll-Miller.

Revision 1.75.2.1 / (download) - annotate - [select for diffs], Tue Aug 13 14:35:55 2019 UTC (4 years, 8 months ago) by martin
Branch: netbsd-9
Changes since 1.75: +7 -5 lines
Diff to previous 1.75 (colored)

Pull up following revision(s) (requested by rmind in ticket #49):

	usr.sbin/npf/npf.7: revision 1.7
	sys/net/npf/npfkern.h: revision 1.4
	sys/net/npf/npf_conn.h: revision 1.18
	usr.sbin/npf/npftest/libnpftest/npf_nat_test.c: revision 1.13
	sys/net/npf/npf_ctl.c: revision 1.55
	sys/net/npf/npf_os.c: revision 1.14
	sys/net/npf/npf_conf.c: revision 1.14
	usr.sbin/npf/npftest/libnpftest/npf_conn_test.c: revision 1.3
	usr.sbin/npf/npftest/libnpftest/npf_perf_test.c: revision 1.9
	sys/net/npf/npf_impl.h: revision 1.76
	sys/net/npf/npf_portmap.c: revision 1.4
	sys/net/npf/npf_params.c: revision 1.2
	sys/net/npf/npf.c: revision 1.40
	usr.sbin/npf/npftest/libnpftest/npf_test_subr.c: revision 1.16
	usr.sbin/npf/npftest/libnpftest/npf_rule_test.c: revision 1.18
	sys/net/npf/npf_nat.c: revision 1.47
	sys/net/npf/npf_handler.c: revision 1.47
	sys/net/npf/npf_inet.c: revision 1.55
	sys/net/npf/npf_if.c: revision 1.10
	sys/net/npf/npf_worker.c: revision 1.7
	usr.sbin/npf/npf-params.7: revision 1.3

npf-params(7): add more bpf.jit details.
From David H. Gutteridge.

Adjust some internal NPF APIs:
* npfkern: use the npfk_ prefix.
* NPF portmap: amend the API so it could be used elsewhere.
* Make npf_connkey_t public.

npf.7: add xref to npf-params.7
(Adding directly here since this particular file isn't included in
rmind@'s upstream GitHub repo at present.)

Revision 1.76 / (download) - annotate - [select for diffs], Sun Aug 11 20:26:34 2019 UTC (4 years, 8 months ago) by rmind
Branch: MAIN
Changes since 1.75: +7 -5 lines
Diff to previous 1.75 (colored)

Adjust some internal NPF APIs:
* npfkern: use the npfk_ prefix.
* NPF portmap: amend the API so it could be used elsewhere.
* Make npf_connkey_t public.

Revision 1.75 / (download) - annotate - [select for diffs], Tue Jul 23 00:52:01 2019 UTC (4 years, 8 months ago) by rmind
Branch: MAIN
CVS Tags: netbsd-9-base
Branch point for: netbsd-9
Changes since 1.74: +61 -9 lines
Diff to previous 1.74 (colored)

NPF improvements:
- Add support for dynamic NETMAP algorithm (stateful net-to-net).
- Add most of the support for the dynamic NAT rules; a little bit more
  userland work is needed to finish this up and enable.
- Replace 'stateful-ends' with more permissive 'stateful-all'.
- Add various tunable parameters and document them, see npf-params(7).
- Reduce the memory usage of the connection state table (conndb).
- Portmap rewrite: use memory more efficiently, handle addresses dynamically.
- Bug fix: add splsoftnet()/splx() around the thmap writers and comment.
- npftest: clean up and simplify; fix some memleaks to make ASAN happy.

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

Sync with HEAD

Revision 1.70.2.3 / (download) - annotate - [select for diffs], Sat Jan 26 22:00:37 2019 UTC (5 years, 2 months ago) by pgoyette
Branch: pgoyette-compat
CVS Tags: pgoyette-compat-merge-20190127
Changes since 1.70.2.2: +5 -1 lines
Diff to previous 1.70.2.2 (colored) to branchpoint 1.70 (colored) next main 1.71 (colored)

Sync with HEAD

Revision 1.74 / (download) - annotate - [select for diffs], Sat Jan 19 21:19:32 2019 UTC (5 years, 2 months ago) by rmind
Branch: MAIN
CVS Tags: phil-wifi-20190609, pgoyette-compat-20190127, isaki-audio2-base, isaki-audio2
Changes since 1.73: +5 -1 lines
Diff to previous 1.73 (colored)

Major NPF improvements:
- Convert NPF connection table to thmap.  State lookup is now lock-free.
- Improve connection state G/C: it is now incremental and tunable.
- Add support for dynamic NAT address.  Translation addresses can now be
  selected from a pool of addresses.  There are two selection algorithms,
  "ip-hash" and "round-robin" (see the man page).
- Translation address can be specified as e.g. ifaddrs(wm0) in npf.conf
  to dynamically choose an IP from the interface address(es).
- Add support for the NETMAP algorithm with static NAT for net-to-net
  translation (it is equivalent to iptables NETMAP logic).
- Convert 'ipset' tables to use thmap; the table lookup is now lock-free.
- Misc improvements, bug fixes and more unit tests.
- Bump NPF_VERSION (will also bump libnpf).

Revision 1.70.2.2 / (download) - annotate - [select for diffs], Sun Sep 30 01:45:56 2018 UTC (5 years, 6 months ago) by pgoyette
Branch: pgoyette-compat
Changes since 1.70.2.1: +46 -16 lines
Diff to previous 1.70.2.1 (colored) to branchpoint 1.70 (colored)

Ssync with HEAD

Revision 1.73 / (download) - annotate - [select for diffs], Sat Sep 29 14:41:36 2018 UTC (5 years, 6 months ago) by rmind
Branch: MAIN
CVS Tags: pgoyette-compat-20190118, pgoyette-compat-1226, pgoyette-compat-1126, pgoyette-compat-1020, pgoyette-compat-0930
Changes since 1.72: +44 -16 lines
Diff to previous 1.72 (colored)

NPF: Major rework -- migrate NPF to the libnv library.
- This conversion significantly simplifies the code and moves NPF to
  a binary serialisation format (replacing the XML-like format).
- Fix some memory/reference leaks and possibly use-after-free bugs.
- Bump NPF_VERSION as this change makes libnpf incompatible with the
  previous versions.  Also, different serialisation format means NPF
  connection/config saving and loading is not compatible with the
  previous versions either.

Thanks to christos@ for extra testing.

Revision 1.72 / (download) - annotate - [select for diffs], Wed Sep 12 21:58:38 2018 UTC (5 years, 7 months ago) by christos
Branch: MAIN
Changes since 1.71: +3 -1 lines
Diff to previous 1.71 (colored)

Fix lockdebug diagnostic error of trying to acquire an rw_lock from a
pserialized active context. From riastradh@

Revision 1.70.2.1 / (download) - annotate - [select for diffs], Thu Sep 6 06:56:44 2018 UTC (5 years, 7 months ago) by pgoyette
Branch: pgoyette-compat
Changes since 1.70: +3 -1 lines
Diff to previous 1.70 (colored)

Sync with HEAD

Resolve a couple of conflicts (result of the uimin/uimax changes)

Revision 1.71 / (download) - annotate - [select for diffs], Fri Aug 31 14:16:06 2018 UTC (5 years, 7 months ago) by maxv
Branch: MAIN
CVS Tags: pgoyette-compat-0906
Changes since 1.70: +3 -1 lines
Diff to previous 1.70 (colored)

Introduce npf_set_mss(). When the MSS is not 16bit-aligned, it sets:

	0      8           16          24    32
	+------+-----------+-----------+------+
	| data | MSS (low) | MSS (hig) | data |
	+------+-----------+-----------+------+
	^                  ^
	old[0]             old[1]

And sets new[0,1] accordingly with the new value. The MSS-clamping code
then adjusts twice the checksum on a 16bit boundary:

	from old[0] to new[0]
	from old[1] to new[1]

Fixes PR/53479, opened by myself. Tested with wireshark and kASan.

Revision 1.70 / (download) - annotate - [select for diffs], Sun Dec 10 01:18:21 2017 UTC (6 years, 4 months ago) by rmind
Branch: MAIN
CVS Tags: phil-wifi-base, pgoyette-compat-base, pgoyette-compat-0728, pgoyette-compat-0625, pgoyette-compat-0521, pgoyette-compat-0502, pgoyette-compat-0422, pgoyette-compat-0415, pgoyette-compat-0407, pgoyette-compat-0330, pgoyette-compat-0322, pgoyette-compat-0315
Branch point for: phil-wifi, pgoyette-compat
Changes since 1.69: +2 -1 lines
Diff to previous 1.69 (colored)

- npf_mk_rules: enforce unique names for the dynamic rulesets.
- npf_worker_unregister: merge fix for the standalone NPF.

Revision 1.22.2.5 / (download) - annotate - [select for diffs], Sun Dec 3 11:39:03 2017 UTC (6 years, 4 months ago) by jdolecek
Branch: tls-maxphys
Changes since 1.22.2.4: +141 -58 lines
Diff to previous 1.22.2.4 (colored) next main 1.23 (colored)

update from HEAD

Revision 1.59.2.3 / (download) - annotate - [select for diffs], Mon Aug 28 17:53:11 2017 UTC (6 years, 7 months ago) by skrll
Branch: nick-nhusb
Changes since 1.59.2.2: +2 -1 lines
Diff to previous 1.59.2.2 (colored) to branchpoint 1.59 (colored) next main 1.60 (colored)

Sync with HEAD

Revision 1.67.2.1 / (download) - annotate - [select for diffs], Fri Apr 21 16:54:05 2017 UTC (6 years, 11 months ago) by bouyer
Branch: bouyer-socketcan
Changes since 1.67: +5 -3 lines
Diff to previous 1.67 (colored) next main 1.68 (colored)

Sync with HEAD

Revision 1.61.2.2 / (download) - annotate - [select for diffs], Mon Mar 20 06:57:50 2017 UTC (7 years ago) by pgoyette
Branch: pgoyette-localcount
Changes since 1.61.2.1: +5 -3 lines
Diff to previous 1.61.2.1 (colored) to branchpoint 1.61 (colored) next main 1.62 (colored)

Sync with HEAD

Revision 1.69 / (download) - annotate - [select for diffs], Sun Feb 19 02:11:19 2017 UTC (7 years, 1 month ago) by christos
Branch: MAIN
CVS Tags: tls-maxphys-base-20171202, prg-localcount2-base3, prg-localcount2-base2, prg-localcount2-base1, prg-localcount2-base, prg-localcount2, pgoyette-localcount-20170426, pgoyette-localcount-20170320, perseant-stdc-iso10646-base, perseant-stdc-iso10646, nick-nhusb-base-20170825, netbsd-8-base, netbsd-8-2-RELEASE, netbsd-8-1-RELEASE, netbsd-8-1-RC1, netbsd-8-0-RELEASE, netbsd-8-0-RC2, netbsd-8-0-RC1, netbsd-8, matt-nb8-mediatek-base, matt-nb8-mediatek, jdolecek-ncq-base, jdolecek-ncq, bouyer-socketcan-base1
Changes since 1.68: +2 -1 lines
Diff to previous 1.68 (colored)

forgot to commit this (new prototype)

Revision 1.59.2.2 / (download) - annotate - [select for diffs], Sun Feb 5 13:40:58 2017 UTC (7 years, 2 months ago) by skrll
Branch: nick-nhusb
Changes since 1.59.2.1: +141 -61 lines
Diff to previous 1.59.2.1 (colored) to branchpoint 1.59 (colored)

Sync with HEAD

Revision 1.68 / (download) - annotate - [select for diffs], Sun Jan 29 00:15:54 2017 UTC (7 years, 2 months ago) by christos
Branch: MAIN
CVS Tags: nick-nhusb-base-20170204
Changes since 1.67: +4 -3 lines
Diff to previous 1.67 (colored)

- Increase copyin buffer size to 4M
- Change log output format to be like the OpenBSD's pf including in
  the header the matching rule etc, and fill in the matching info.

Revision 1.58.2.3.4.1 / (download) - annotate - [select for diffs], Wed Jan 18 08:46:46 2017 UTC (7 years, 2 months ago) by skrll
Branch: netbsd-7-nhusb
Changes since 1.58.2.3: +1 -4 lines
Diff to previous 1.58.2.3 (colored) next main 1.58.2.4 (colored)

Sync with netbsd-5

Revision 1.61.2.1 / (download) - annotate - [select for diffs], Sat Jan 7 08:56:50 2017 UTC (7 years, 3 months ago) by pgoyette
Branch: pgoyette-localcount
Changes since 1.61: +138 -59 lines
Diff to previous 1.61 (colored)

Sync with HEAD.  (Note that most of these changes are simply $NetBSD$
tag issues.)

Revision 1.67 / (download) - annotate - [select for diffs], Tue Jan 3 00:58:05 2017 UTC (7 years, 3 months ago) by rmind
Branch: MAIN
CVS Tags: pgoyette-localcount-20170107, bouyer-socketcan-base
Branch point for: bouyer-socketcan
Changes since 1.66: +2 -2 lines
Diff to previous 1.66 (colored)

NPF: fix the interface table initialisation on load.

Revision 1.66 / (download) - annotate - [select for diffs], Mon Jan 2 21:49:51 2017 UTC (7 years, 3 months ago) by rmind
Branch: MAIN
Changes since 1.65: +7 -1 lines
Diff to previous 1.65 (colored)

NPF: implement dynamic handling of interface addresses (the kernel part).

Revision 1.65 / (download) - annotate - [select for diffs], Wed Dec 28 21:55:04 2016 UTC (7 years, 3 months ago) by christos
Branch: MAIN
Changes since 1.64: +2 -1 lines
Diff to previous 1.64 (colored)

export rprocs too so we don't lose them.

Revision 1.64 / (download) - annotate - [select for diffs], Mon Dec 26 23:05:06 2016 UTC (7 years, 3 months ago) by christos
Branch: MAIN
Changes since 1.63: +131 -57 lines
Diff to previous 1.63 (colored)

Sync NPF with the version on github: backport standalone NPF changes,
which allow us to create and run separate NPF instances. Minor fixes.
(from rmind@)

Revision 1.58.2.4 / (download) - annotate - [select for diffs], Sun Dec 18 07:40:50 2016 UTC (7 years, 3 months ago) by snj
Branch: netbsd-7
CVS Tags: netbsd-7-nhusb-base-20170116, netbsd-7-2-RELEASE, netbsd-7-1-RELEASE, netbsd-7-1-RC2, netbsd-7-1-RC1, netbsd-7-1-2-RELEASE, netbsd-7-1-1-RELEASE, netbsd-7-1
Changes since 1.58.2.3: +1 -4 lines
Diff to previous 1.58.2.3 (colored) to branchpoint 1.58 (colored) next main 1.59 (colored)

Pull up following revision(s) (requested by rmind in ticket #1319):
	sys/modules/npf/Makefile: revision 1.19
	sys/net/npf/files.npf: revision 1.18
	sys/net/npf/lpm.c: revision 1.1
	sys/net/npf/lpm.h: revision 1.1
	sys/net/npf/npf_impl.h: revision 1.62
	sys/net/npf/npf_tableset.c: revision 1.24
	sys/net/npf/npf_tableset_ptree.c: file removal
	sys/rump/net/lib/libnpf/Makefile: revision 1.18
This patches ditches the ptree(3) library, because it is broken (you
can get missing entries!).  Instead, as a temporary solution, we switch
to a simple linear scan of the hash tables for the longest-prefix-match
(lpm.c lpm.h) algorithm. In fact, with few unique prefixes in the set,
on modern hardware this simple algorithm is pretty fast anyway!
--
ditch ptree and use lpm
--
remove ptree add lpm

Revision 1.63 / (download) - annotate - [select for diffs], Sat Dec 10 05:41:10 2016 UTC (7 years, 4 months ago) by christos
Branch: MAIN
Changes since 1.62: +2 -1 lines
Diff to previous 1.62 (colored)

add functionality to lookup a nat entry from the connection list.

Revision 1.62 / (download) - annotate - [select for diffs], Fri Dec 9 02:40:38 2016 UTC (7 years, 4 months ago) by christos
Branch: MAIN
Changes since 1.61: +1 -4 lines
Diff to previous 1.61 (colored)

This patches ditches the ptree(3) library, because it is broken (you
can get missing entries!).  Instead, as a temporary solution, we switch
to a simple linear scan of the hash tables for the longest-prefix-match
(lpm.c lpm.h) algorithm. In fact, with few unique prefixes in the set,
on modern hardware this simple algorithm is pretty fast anyway!

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

Sync with HEAD

Revision 1.58.2.3 / (download) - annotate - [select for diffs], Wed Feb 4 07:13:04 2015 UTC (9 years, 2 months ago) by snj
Branch: netbsd-7
CVS Tags: netbsd-7-nhusb-base, 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, netbsd-7-0
Branch point for: netbsd-7-nhusb
Changes since 1.58.2.2: +2 -1 lines
Diff to previous 1.58.2.2 (colored) to branchpoint 1.58 (colored)

Pull up following revision(s) (requested by rmind in ticket #479):
	lib/libnpf/npf.c: revision 1.35
	lib/libnpf/npf.h: revision 1.28
	sys/net/npf/npf_conn.c: revision 1.15
	sys/net/npf/npf_impl.h: revision 1.61
	sys/net/npf/npf_ruleset.c: revision 1.41
	usr.sbin/npf/npfctl/npf.conf.5: revision 1.44
	usr.sbin/npf/npfctl/npf_parse.y: revision 1.37
	usr.sbin/npf/npfctl/npf_show.c: revisions 1.16, 1.17
	usr.sbin/npf/npfctl/npfctl.c: revision 1.46
load the config file before bpfjit so that we can disable the warning.
--
Don't depend on yacc to include stdlib.h or string.h.
--
- npf_conn_establish: remove a rare race condition when we might destroy a
  connection when it is still referenced by another thread.
- npf_conn_destroy: remove the backwards entry using the saved key, PR/49488.
- Sprinkle some asserts.
--
npf.conf(5): mention alg, include in the example, minor fix.
--
npfctl(8): report dynamic rule ID in a comment, print the case when libpcap
is used correctly.  Also, add npf_ruleset_dump() helper in the kernel.
--
libnpf: add npf_rule_getid() and npf_rule_getcode().
Missed in the previous commit.
--
npfctl_print_rule: print the ID in hex, not decimal.

Revision 1.61 / (download) - annotate - [select for diffs], Mon Feb 2 00:31:39 2015 UTC (9 years, 2 months ago) by rmind
Branch: MAIN
CVS Tags: pgoyette-localcount-base, pgoyette-localcount-20161104, pgoyette-localcount-20160806, pgoyette-localcount-20160726, nick-nhusb-base-20161204, nick-nhusb-base-20161004, nick-nhusb-base-20160907, nick-nhusb-base-20160529, nick-nhusb-base-20160422, nick-nhusb-base-20160319, nick-nhusb-base-20151226, nick-nhusb-base-20150921, nick-nhusb-base-20150606, nick-nhusb-base-20150406, localcount-20160914
Branch point for: pgoyette-localcount
Changes since 1.60: +2 -1 lines
Diff to previous 1.60 (colored)

npfctl(8): report dynamic rule ID in a comment, print the case when libpcap
is used correctly.  Also, add npf_ruleset_dump() helper in the kernel.

Revision 1.58.2.2 / (download) - annotate - [select for diffs], Mon Dec 1 13:05:26 2014 UTC (9 years, 4 months ago) by martin
Branch: netbsd-7
Changes since 1.58.2.1: +2 -2 lines
Diff to previous 1.58.2.1 (colored) to branchpoint 1.58 (colored)

Pull up following revision(s) (requested by rmind in ticket #280):
	sys/net/npf/npf_ruleset.c: revision 1.40
	sys/net/npf/npf_nat.c: revision 1.36
	sys/net/npf/npf_nat.c: revision 1.37
	sys/net/npf/npf_conn.h: revision 1.7
	sys/net/npf/npf_conf.c: revision 1.9
	sys/net/npf/npf_ruleset.c: revision 1.39
	sys/net/npf/npf_conn.c: revision 1.13
	sys/net/npf/npf_impl.h: revision 1.60
NPF:
- npf_nat_import: take the port only if using the portmap.
- Sprinkle some comments and asserts.
- npf_config_load: if loading the connections, do not perform any actice
  NAT policy take over or or portmap sharing - just replace them all.
- npf_config_fini: flush with the empty connection database.
- npf_nat_import: fix the stat counter.

Revision 1.60 / (download) - annotate - [select for diffs], Sun Nov 30 01:37:53 2014 UTC (9 years, 4 months ago) by rmind
Branch: MAIN
Changes since 1.59: +2 -2 lines
Diff to previous 1.59 (colored)

- npf_config_load: if loading the connections, do not perform any actice
  NAT policy take over or or portmap sharing - just replace them all.
- npf_config_fini: flush with the empty connection database.
- npf_nat_import: fix the stat counter.

Revision 1.58.2.1 / (download) - annotate - [select for diffs], Fri Aug 29 11:14:14 2014 UTC (9 years, 7 months ago) by martin
Branch: netbsd-7
Changes since 1.58: +2 -1 lines
Diff to previous 1.58 (colored)

Pull up following revision(s) (requested by rmind in ticket #56):
	sys/net/npf/npf_ctl.c: revision 1.39
	usr.sbin/npf/npfctl/npfctl.c: revision 1.43
	lib/libnpf/npf.c: revision 1.33
	lib/libnpf/npf.c: revision 1.34
	sys/net/npf/npf_impl.h: revision 1.59
	sys/net/npf/npf_ctl.c: revision 1.40
	sys/net/npf/npf_conn.c: revision 1.11
	sys/net/npf/npf_alg.c: revision 1.15
	sys/net/npf/npf_conn.c: revision 1.12
	sys/net/npf/npf_nat.c: revision 1.33
	sys/net/npf/npf_nat.c: revision 1.34
Add and use npf_alg_export().
npf_conn_import: handle NAT metadata correctly.
npf_nat_newpolicy: restore the policy ID.
npfctl_load: fix error code handling for the limit cases.
npf_config_import: fix the inverted logic.
npfctl_load: improve error handling.
npf_conn_import: add a missing stat counter increment.
npf_nat_import: add a missing reference and make a comment.
npf_config_submit: finally, include the saved connections.

Revision 1.22.2.4 / (download) - annotate - [select for diffs], Wed Aug 20 00:04:35 2014 UTC (9 years, 7 months ago) by tls
Branch: tls-maxphys
Changes since 1.22.2.3: +101 -104 lines
Diff to previous 1.22.2.3 (colored)

Rebase to HEAD as of a few days ago.

Revision 1.59 / (download) - annotate - [select for diffs], Mon Aug 11 23:48:01 2014 UTC (9 years, 8 months ago) by rmind
Branch: MAIN
CVS Tags: nick-nhusb-base
Branch point for: nick-nhusb
Changes since 1.58: +2 -1 lines
Diff to previous 1.58 (colored)

- Add and use npf_alg_export().
- npf_conn_import: handle NAT metadata correctly.
- npf_nat_newpolicy: restore the policy ID.
- npfctl_load: fix error code handling for the limit cases.
- npf_config_import: fix the inverted logic.
- npfctl_load: improve error handling.

Revision 1.58 / (download) - annotate - [select for diffs], Mon Aug 11 01:54:12 2014 UTC (9 years, 8 months ago) by rmind
Branch: MAIN
CVS Tags: tls-maxphys-base, netbsd-7-base
Branch point for: netbsd-7
Changes since 1.57: +6 -6 lines
Diff to previous 1.57 (colored)

NPF: finish up the rework of npfctl_save() mechanism.

Revision 1.57 / (download) - annotate - [select for diffs], Sun Aug 10 19:09:43 2014 UTC (9 years, 8 months ago) by rmind
Branch: MAIN
Changes since 1.56: +6 -3 lines
Diff to previous 1.56 (colored)

- Add npf_ruleset_export(), npf_rule_export() and npf_nat_policyexport().
- Split off npf_conn_export().  Add npf_ifmap_getname() and use it to save
  the interface name; pick it up on npf_conn_import().
- Misc fixes.  Bump NPF_VERSION.

Revision 1.50.2.1 / (download) - annotate - [select for diffs], Sun Aug 10 06:56:16 2014 UTC (9 years, 8 months ago) by tls
Branch: tls-earlyentropy
Changes since 1.50: +36 -62 lines
Diff to previous 1.50 (colored) next main 1.51 (colored)

Rebase.

Revision 1.56 / (download) - annotate - [select for diffs], Wed Jul 23 01:25:34 2014 UTC (9 years, 8 months ago) by rmind
Branch: MAIN
CVS Tags: tls-earlyentropy-base
Changes since 1.55: +13 -10 lines
Diff to previous 1.55 (colored)

NPF: rework of the connection saving and restoring:
- Add support for saving a snapshot of the current connections together
  with a full configuration.  Support a reverse load operation.  Eliminate
  the old 'sess-save' and 'sess-load' in favour of the new mechanism.
- Share code between load and reload operations: the latter performs
  load from npf.conf without affecting the connections.
- Simplify and fix races with connection loading.
- Bump NPF_VERSION.

Revision 1.55 / (download) - annotate - [select for diffs], Sun Jul 20 00:37:41 2014 UTC (9 years, 8 months ago) by rmind
Branch: MAIN
Changes since 1.54: +19 -20 lines
Diff to previous 1.54 (colored)

NPF: add nbuf_t * into npf_cache_t and remove unnecessary carrying by argument.

Revision 1.54 / (download) - annotate - [select for diffs], Sat Jul 19 18:24:16 2014 UTC (9 years, 8 months ago) by rmind
Branch: MAIN
Changes since 1.53: +12 -40 lines
Diff to previous 1.53 (colored)

NPF: partially rewrite the connection tracking mechanism:
- Separate the tracking interface from the storage (state table)
  and thus prepare to use a new data structure for the storage.
- Fix some race conditions in NAT association logic.

Revision 1.53 / (download) - annotate - [select for diffs], Wed Jun 25 00:20:06 2014 UTC (9 years, 9 months ago) by rmind
Branch: MAIN
Changes since 1.52: +2 -1 lines
Diff to previous 1.52 (colored)

Adjust NPF to the recent BPF / BPF JIT changes and make it work again.
All regression tests are happy now (hi alnsn!).

Revision 1.52 / (download) - annotate - [select for diffs], Fri May 30 23:26:06 2014 UTC (9 years, 10 months ago) by rmind
Branch: MAIN
Changes since 1.51: +1 -2 lines
Diff to previous 1.51 (colored)

- npf_nat_freepolicy: handle a race condition when a new connection might
  be associated with a NAT policy which is going away and npfctl reload
  would wait for its natural expiration (potentially long time).
- Remove npf_ruleset_natreload() by merging into npf_ruleset_reload().
- npf_ruleset_reload: eliminate a small time period when a valid NAT
  policy might be inactive during the reload operation.

Revision 1.7.6.6 / (download) - annotate - [select for diffs], Thu May 22 11:41:09 2014 UTC (9 years, 10 months ago) by yamt
Branch: yamt-pagecache
Changes since 1.7.6.5: +117 -65 lines
Diff to previous 1.7.6.5 (colored) to branchpoint 1.7 (colored) next main 1.8 (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.51 / (download) - annotate - [select for diffs], Mon May 19 18:45:51 2014 UTC (9 years, 10 months ago) by jakllsch
Branch: MAIN
Changes since 1.50: +2 -2 lines
Diff to previous 1.50 (colored)

Add ability to have mbufs disappear (to another interface) during
npf_rproc_run().  For upcoming npf_ext_route extension.

Guidance and ok by rmind@.

Revision 1.31.2.1 / (download) - annotate - [select for diffs], Sun May 18 17:46:13 2014 UTC (9 years, 11 months ago) by rmind
Branch: rmind-smpnet
Changes since 1.31: +68 -48 lines
Diff to previous 1.31 (colored) next main 1.32 (colored)

sync with head

Revision 1.50 / (download) - annotate - [select for diffs], Fri Mar 14 11:29:44 2014 UTC (10 years, 1 month ago) by rmind
Branch: MAIN
CVS Tags: yamt-pagecache-base9, rmind-smpnet-nbase, rmind-smpnet-base, riastradh-xf86-video-intel-2-7-1-pre-2-21-15, riastradh-drm2-base3
Branch point for: tls-earlyentropy
Changes since 1.49: +2 -2 lines
Diff to previous 1.49 (colored)

NPF: add support for "stateful-ends".

Revision 1.49 / (download) - annotate - [select for diffs], Wed Feb 19 03:51:31 2014 UTC (10 years, 1 month ago) by rmind
Branch: MAIN
Changes since 1.48: +3 -2 lines
Diff to previous 1.48 (colored)

NPF: fix the recent breakage of the traceroute ALG.  Also, simplify and
refactor a little bit.

Revision 1.48 / (download) - annotate - [select for diffs], Sun Feb 16 22:10:40 2014 UTC (10 years, 2 months ago) by rmind
Branch: MAIN
Changes since 1.47: +12 -5 lines
Diff to previous 1.47 (colored)

NPF: pass ALG functions via npfa_funcs_t structure.

Revision 1.47 / (download) - annotate - [select for diffs], Thu Feb 13 03:34:40 2014 UTC (10 years, 2 months ago) by rmind
Branch: MAIN
Changes since 1.46: +4 -2 lines
Diff to previous 1.46 (colored)

NPF: add support for IPv6-to-IPv6 Network Prefix Translation (NPTv6),
as per RFC 6296.  Add a unit test.  Also, bump NPF_VERSION.

Thanks to S.P.Zeidler for the help with NPTv6 work!

Revision 1.46 / (download) - annotate - [select for diffs], Thu Feb 6 02:51:28 2014 UTC (10 years, 2 months ago) by rmind
Branch: MAIN
Changes since 1.45: +2 -2 lines
Diff to previous 1.45 (colored)

Add support for CDB based NPF tables.

Revision 1.45 / (download) - annotate - [select for diffs], Fri Dec 6 01:33:37 2013 UTC (10 years, 4 months ago) by rmind
Branch: MAIN
Changes since 1.44: +11 -8 lines
Diff to previous 1.44 (colored)

NPF:
- Adjust NAT to not assume flow direction in some cases and thus support
  less usual setups which are possible when using 'map' with a custom
  filter criteria.
- Introduce NPF_SRC/NPF_DST and replace npc_src/npc_dst with npc_ips[2]
  for more convenient handling.
- ICMP ALG: restrict matching only to the outgoing traffic, but be more
  direction-agnostic elsewhere.

Revision 1.44 / (download) - annotate - [select for diffs], Wed Dec 4 01:38:49 2013 UTC (10 years, 4 months ago) by rmind
Branch: MAIN
Changes since 1.43: +3 -3 lines
Diff to previous 1.43 (colored)

- npf_do_nat: fix a race condition and simplify the logic.
- npf_session_setnat: clear the NAT association on failure.

Revision 1.43 / (download) - annotate - [select for diffs], Sat Nov 23 19:32:20 2013 UTC (10 years, 4 months ago) by rmind
Branch: MAIN
Changes since 1.42: +2 -3 lines
Diff to previous 1.42 (colored)

Move initialisation of bpf_args_t into the npf_ruleset_inspect().
This allows us to reuse the BPF memory store as a cache.

Revision 1.42 / (download) - annotate - [select for diffs], Fri Nov 22 01:24:21 2013 UTC (10 years, 4 months ago) by rmind
Branch: MAIN
Changes since 1.41: +2 -2 lines
Diff to previous 1.41 (colored)

npf_addr_mix: use xor rather than sum.

Revision 1.41 / (download) - annotate - [select for diffs], Fri Nov 22 00:25:51 2013 UTC (10 years, 4 months ago) by rmind
Branch: MAIN
Changes since 1.40: +2 -1 lines
Diff to previous 1.40 (colored)

Add npf_tableset_syncdict() to sync the table IDs in the proplib dictionary,
as they can change on reload now.  Also, fix table name checking in npfctl.

Revision 1.10.2.14.2.1 / (download) - annotate - [select for diffs], Sun Nov 17 19:17:04 2013 UTC (10 years, 5 months ago) by bouyer
Branch: netbsd-6-1
CVS Tags: netbsd-6-1-5-RELEASE, netbsd-6-1-4-RELEASE, netbsd-6-1-3-RELEASE
Changes since 1.10.2.14: +2 -2 lines
Diff to previous 1.10.2.14 (colored) next main 1.10.2.15 (colored)

Pull up following revision(s) (requested by rmind in ticket #985):
	sys/net/npf/npf_impl.h: revision 1.35
	sys/net/npf/npf_nat.c: revision 1.21
	sys/net/npf/npf_session.c: revision 1.26
npf_session_setnat: fix the race condition when the old connection is still
being expired while a new/duplicate is being created.

Revision 1.10.2.15 / (download) - annotate - [select for diffs], Sun Nov 17 19:16:57 2013 UTC (10 years, 5 months ago) by bouyer
Branch: netbsd-6
Changes since 1.10.2.14: +2 -2 lines
Diff to previous 1.10.2.14 (colored) to branchpoint 1.10 (colored) next main 1.11 (colored)

Pull up following revision(s) (requested by rmind in ticket #985):
	sys/net/npf/npf_impl.h: revision 1.35
	sys/net/npf/npf_nat.c: revision 1.21
	sys/net/npf/npf_session.c: revision 1.26
npf_session_setnat: fix the race condition when the old connection is still
being expired while a new/duplicate is being created.

Revision 1.40 / (download) - annotate - [select for diffs], Sat Nov 16 01:18:58 2013 UTC (10 years, 5 months ago) by rmind
Branch: MAIN
Changes since 1.39: +2 -1 lines
Diff to previous 1.39 (colored)

NPF: convert to bpf_jit_generate()/bpf_jit_freecode().

Revision 1.39 / (download) - annotate - [select for diffs], Fri Nov 15 00:12:45 2013 UTC (10 years, 5 months ago) by rmind
Branch: MAIN
Changes since 1.38: +2 -2 lines
Diff to previous 1.38 (colored)

- Add bpf_args_t and convert bpf_filter_ext() to use it.  This allows the
  caller to initialise (and re-use) the memory store.
- Add bpf_jit_generate() and bpf_jit_freecode() wrappers.

Revision 1.38 / (download) - annotate - [select for diffs], Tue Nov 12 00:46:34 2013 UTC (10 years, 5 months ago) by rmind
Branch: MAIN
Changes since 1.37: +17 -15 lines
Diff to previous 1.37 (colored)

NPF: add support for table naming and remove NPF_TABLE_SLOTS (there is
just an arbitrary sanity limit of NPF_MAX_TABLES currently set to 128).

Few misc fixes.  Bump NPF_VERSION.

Revision 1.37 / (download) - annotate - [select for diffs], Fri Nov 8 00:38:26 2013 UTC (10 years, 5 months ago) by rmind
Branch: MAIN
Changes since 1.36: +10 -3 lines
Diff to previous 1.36 (colored)

NPF: add support for specifying the interfaces before they are attached.
If an interface is or gets detached, all associated rules and connections
will be deactivated (it might be useful to have an option to invalidate
the associated connections).  Once the interface is reattached they will
become active.

Bump NPF_VERSION.

Revision 1.36 / (download) - annotate - [select for diffs], Mon Nov 4 22:17:21 2013 UTC (10 years, 5 months ago) by rmind
Branch: MAIN
Changes since 1.35: +2 -2 lines
Diff to previous 1.35 (colored)

npf_generic_fsm and npf_tcp_fsm: use uint8_t and make the arrays more dense.

Revision 1.35 / (download) - annotate - [select for diffs], Tue Oct 29 16:39:10 2013 UTC (10 years, 5 months ago) by rmind
Branch: MAIN
Changes since 1.34: +2 -2 lines
Diff to previous 1.34 (colored)

npf_session_setnat: fix the race condition when the old connection is still
being expired while a new/duplicate is being created.

Revision 1.34 / (download) - annotate - [select for diffs], Sun Oct 27 16:22:08 2013 UTC (10 years, 5 months ago) by rmind
Branch: MAIN
Changes since 1.33: +3 -1 lines
Diff to previous 1.33 (colored)

Add NPF_MAX_RULES, an artificial limit (set it to 1M).

Revision 1.33 / (download) - annotate - [select for diffs], Thu Sep 19 01:49:07 2013 UTC (10 years, 6 months ago) by rmind
Branch: MAIN
Changes since 1.32: +1 -16 lines
Diff to previous 1.32 (colored)

NPF: G/C n-code in favour of BPF byte-code.  Delete lots of code, mmm!

Revision 1.32 / (download) - annotate - [select for diffs], Thu Sep 19 01:04:46 2013 UTC (10 years, 6 months ago) by rmind
Branch: MAIN
Changes since 1.31: +11 -1 lines
Diff to previous 1.31 (colored)

- Convert NPF to use BPF byte-code by default.  Compile BPF byte-code in
  npfctl(8) and generate separate marks to describe the filter criteria.
- Rewrite 'npfctl show' functionality and fix some of the bugs.
- npftest: add a test for BPF COP.
- Bump NPF_VERSION.

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

resync from head

Revision 1.31 / (download) - annotate - [select for diffs], Sun Jun 2 02:20:04 2013 UTC (10 years, 10 months ago) by rmind
Branch: MAIN
CVS Tags: riastradh-drm2-base2, riastradh-drm2-base1, riastradh-drm2-base, riastradh-drm2
Branch point for: rmind-smpnet
Changes since 1.30: +10 -3 lines
Diff to previous 1.30 (colored)

- NPF connection tracking: rework synchronisation on tracking disable/enable
  points and document it.  Split the worker thread into a separate module
  with an interface, so it could be re-used for other tasks.
- Replace ALG list with arrays and thus hit fewer cache lines.
- Misc bug fixes.

Revision 1.30 / (download) - annotate - [select for diffs], Sun May 19 20:45:34 2013 UTC (10 years, 10 months ago) by rmind
Branch: MAIN
Changes since 1.29: +2 -1 lines
Diff to previous 1.29 (colored)

- Add NPF table flushing functionality.
- Fix line numbering for npfctl debug command.

Revision 1.29 / (download) - annotate - [select for diffs], Wed Mar 20 00:29:47 2013 UTC (11 years ago) by christos
Branch: MAIN
CVS Tags: khorben-n900, agc-symver-base, agc-symver
Changes since 1.28: +3 -2 lines
Diff to previous 1.28 (colored)

Make ALG's autoloadable by providing in the config file:
	alg "algname"

Revision 1.22.2.2 / (download) - annotate - [select for diffs], Mon Feb 25 00:30:03 2013 UTC (11 years, 1 month ago) by tls
Branch: tls-maxphys
Changes since 1.22.2.1: +79 -62 lines
Diff to previous 1.22.2.1 (colored)

resync with head

Revision 1.10.2.14 / (download) - annotate - [select for diffs], Mon Feb 18 18:26:14 2013 UTC (11 years, 1 month ago) by riz
Branch: netbsd-6
CVS Tags: netbsd-6-1-RELEASE, netbsd-6-1-RC4, netbsd-6-1-RC3, netbsd-6-1-RC2, netbsd-6-1-RC1, netbsd-6-1-2-RELEASE, netbsd-6-1-1-RELEASE
Branch point for: netbsd-6-1
Changes since 1.10.2.13: +3 -2 lines
Diff to previous 1.10.2.13 (colored) to branchpoint 1.10 (colored)

Pull up following revision(s) (requested by rmind in ticket #829):
	usr.sbin/npf/npfctl/npfctl.8: revision 1.13
	usr.sbin/npf/npfctl/npf_build.c: revision 1.21
	lib/libnpf/npf.c: revision 1.18
	sys/net/npf/npf_ctl.c: revision 1.23
	usr.sbin/npf/npfctl/npfctl.h: revision 1.27
	lib/libnpf/npf.h: revision 1.15
	sys/net/npf/npf_ruleset.c: revision 1.19
	sys/net/npf/npf_impl.h: revision 1.28
	usr.sbin/npf/npfctl/npf_disassemble.c: revision 1.17
	usr.sbin/npf/npfctl/npfctl.c: revision 1.31
	usr.sbin/npf/npftest/libnpftest/npf_rule_test.c: revision 1.6
- Convert NPF dynamic rule ID to just incremented 64-bit counter.
- Fix multiple bugs.  Also, update the man page.

Revision 1.28 / (download) - annotate - [select for diffs], Sat Feb 16 21:11:12 2013 UTC (11 years, 2 months ago) by rmind
Branch: MAIN
Changes since 1.27: +3 -2 lines
Diff to previous 1.27 (colored)

- Convert NPF dynamic rule ID to just incremented 64-bit counter.
- Fix multiple bugs.  Also, update the man page.

Revision 1.10.2.13 / (download) - annotate - [select for diffs], Mon Feb 11 21:49:49 2013 UTC (11 years, 2 months ago) by riz
Branch: netbsd-6
Changes since 1.10.2.12: +41 -19 lines
Diff to previous 1.10.2.12 (colored) to branchpoint 1.10 (colored)

Pull up following revision(s) (requested by rmind in ticket #817):
	usr.sbin/npf/npfctl/npfctl.8: revision 1.12
	usr.sbin/npf/npfctl/npf.conf.5: revision 1.27
	usr.sbin/npf/npfctl/npf_parse.y: revision 1.18
	usr.sbin/npf/npfctl/npf_build.c: revision 1.20
	usr.sbin/npf/npfctl/npfctl.c: revision 1.28
	lib/libnpf/npf.c: revision 1.16
	usr.sbin/npf/npfctl/npfctl.c: revision 1.29
	lib/libnpf/npf.c: revision 1.17
	sys/modules/npf/Makefile: revision 1.12
	sys/net/npf/npf_rproc.c: revision 1.6
	usr.sbin/npf/npftest/README: revision 1.4
	sys/net/npf/npf_tableset.c: revision 1.17
	sys/net/npf/npf_ctl.c: revision 1.21
	sys/net/npf/npf_ctl.c: revision 1.22
	usr.sbin/npf/npfctl/npfctl.h: revision 1.25
	lib/libnpf/npf.h: revision 1.13
	usr.sbin/npf/npftest/npftest.conf: revision 1.2
	usr.sbin/npf/npfctl/npfctl.h: revision 1.26
	sys/net/npf/npf_ruleset.c: revision 1.17
	lib/libnpf/npf.h: revision 1.14
	sys/net/npf/npf_ruleset.c: revision 1.18
	sys/net/npf/npf_conf.c: revision 1.1
	usr.sbin/npf/npfctl/npf_scan.l: revision 1.10
	sys/net/npf/npf_conf.c: revision 1.2
	sys/net/npf/npf_instr.c: revision 1.16
	sys/net/npf/npf_handler.c: revision 1.26
	sys/net/npf/npf_impl.h: revision 1.26
	usr.sbin/npf/npfctl/npf_disassemble.c: revision 1.14
	sys/net/npf/npf_processor.c: revision 1.15
	sys/net/npf/npf_impl.h: revision 1.27
	sys/net/npf/npf_alg_icmp.c: revision 1.15
	usr.sbin/npf/npfctl/npf_disassemble.c: revision 1.15
	usr.sbin/npf/npfctl/npf_disassemble.c: revision 1.16
	sys/net/npf/npf_ncode.h: revision 1.11
	sys/net/npf/files.npf: revision 1.10
	usr.sbin/npf/npftest/Makefile: revision 1.4
	usr.sbin/npf/npfctl/npfctl.c: revision 1.30
	lib/libnpf/npf.3: revision 1.8
	usr.sbin/npf/npftest/libnpftest/npf_rule_test.c: revision 1.4
	sys/net/npf/npf_session.c: revision 1.21
	usr.sbin/npf/npftest/libnpftest/npf_rule_test.c: revision 1.5
	usr.sbin/npf/npfctl/npf_build.c: revision 1.18
	usr.sbin/npf/npfctl/npf_build.c: revision 1.19
	sys/net/npf/npf_alg.c: revision 1.7
	usr.sbin/npf/npfctl/Makefile: revision 1.10
	sys/net/npf/npf_inet.c: revision 1.21
	sys/net/npf/npf.h: revision 1.26
	sys/net/npf/npf.h: revision 1.27
	usr.sbin/pf/ftp-proxy/Makefile: revision 1.8
	sys/net/npf/npf_nat.c: revision 1.19
	sys/net/npf/npf.c: revision 1.15
	sys/net/npf/npf_state.c: revision 1.14
	sys/net/npf/npf_sendpkt.c: revision 1.14
	sys/rump/net/lib/libnpf/Makefile: revision 1.4
IPv6 linklocal address printing cosmetics
NPF:
- Implement dynamic NPF rules.  Controlled through npf(3) library of via
  npfctl rule command.  A rule can be removed using a unique identifier,
  returned on addition, or using a key which is SHA1 hash of the rule.
  Adjust npftest and add a regression test.
- Improvements to rule inspection mechanism.
- Initial BPF support as an alternative to n-code.
- Minor fixes; bump the version.
Disable -DWITH_NPF for now; will be converted to BPF mechanism.
- Fix NPF config reload with dynamic rules present.
- Implement list and flush commands on a dynamic ruleset.
Allow filtering on IP addresses even if the L4 protocol is unknown.
Patch from spz@.
npftest: adjust for recent change.

Revision 1.27 / (download) - annotate - [select for diffs], Sun Feb 10 23:47:37 2013 UTC (11 years, 2 months ago) by rmind
Branch: MAIN
Changes since 1.26: +7 -3 lines
Diff to previous 1.26 (colored)

- Fix NPF config reload with dynamic rules present.
- Implement list and flush commands on a dynamic ruleset.

Revision 1.26 / (download) - annotate - [select for diffs], Sat Feb 9 03:35:32 2013 UTC (11 years, 2 months ago) by rmind
Branch: MAIN
Changes since 1.25: +37 -19 lines
Diff to previous 1.25 (colored)

NPF:
- Implement dynamic NPF rules.  Controlled through npf(3) library of via
  npfctl rule command.  A rule can be removed using a unique identifier,
  returned on addition, or using a key which is SHA1 hash of the rule.
  Adjust npftest and add a regression test.
- Improvements to rule inspection mechanism.
- Initial BPF support as an alternative to n-code.
- Minor fixes; bump the version.

Revision 1.10.2.12 / (download) - annotate - [select for diffs], Fri Feb 8 19:18:10 2013 UTC (11 years, 2 months ago) by riz
Branch: netbsd-6
Changes since 1.10.2.11: +38 -44 lines
Diff to previous 1.10.2.11 (colored) to branchpoint 1.10 (colored)

Pull up following revision(s) (requested by rmind in ticket #777):
	usr.sbin/npf/npfctl/npfctl.c: revision 1.27
	sys/net/npf/npf_session.c: revision 1.19
	usr.sbin/npf/npftest/libnpftest/npf_mbuf_subr.c: revision 1.4
	sys/net/npf/npf_rproc.c: revision 1.5
	usr.sbin/npf/npftest/README: revision 1.3
	sys/sys/mbuf.h: revision 1.151
	sys/net/npf/npf_ruleset.c: revision 1.15
	usr.sbin/npf/npftest/libnpftest/npf_nbuf_test.c: revision 1.3
	sys/net/npf/npf_ruleset.c: revision 1.16
	usr.sbin/npf/npftest/libnpftest/npf_state_test.c: revision 1.4
	usr.sbin/npf/npftest/libnpftest/npf_nbuf_test.c: revision 1.4
	sys/net/npf/npf_inet.c: revision 1.19
	sys/net/npf/npf_instr.c: revision 1.15
	sys/net/npf/npf_handler.c: revision 1.24
	sys/net/npf/npf_handler.c: revision 1.25
	sys/net/npf/npf_state_tcp.c: revision 1.12
	sys/net/npf/npf_processor.c: revision 1.13
	sys/net/npf/npf_impl.h: revision 1.25
	sys/net/npf/npf_processor.c: revision 1.14
	sys/net/npf/npf_mbuf.c: revision 1.10
	sys/net/npf/npf_alg_icmp.c: revision 1.14
	sys/net/npf/npf_mbuf.c: revision 1.9
	usr.sbin/npf/npftest/libnpftest/npf_nat_test.c: revision 1.2
	usr.sbin/npf/npftest/libnpftest/npf_rule_test.c: revision 1.3
	sys/net/npf/npf_session.c: revision 1.20
	sys/net/npf/npf_alg.c: revision 1.6
	sys/kern/uipc_mbuf.c: revision 1.148
	sys/net/npf/npf_inet.c: revision 1.20
	sys/net/npf/npf.h: revision 1.25
	sys/net/npf/npf_nat.c: revision 1.18
	sys/net/npf/npf_state.c: revision 1.13
	sys/net/npf/npf_sendpkt.c: revision 1.13
	sys/net/npf/npf_ext_log.c: revision 1.2
	usr.sbin/npf/npftest/libnpftest/npf_processor_test.c: revision 1.4
	sys/net/npf/npf_ext_normalise.c: revision 1.2
- Rework NPF's nbuf interface: use advancing and ensuring as a main method.
  Eliminate unnecessary copy and simplify.  Adapt regression tests.
- Simplify ICMP ALG a little.  While here, handle ICMP ECHO for traceroute.
- Minor fixes, misc cleanup.
Silence gcc in npf_recache().
Add m_ensure_contig() routine, which is equivalent to m_pullup, but does not
destroy the mbuf chain on failure (it is kept valid).
- nbuf_ensure_contig: rework to use m_ensure_contig(9), which will not free
  the mbuf chain on failure.  Fixes some corner cases.  Improve regression
  test and sprinkle some asserts.
- npf_reassembly: clear nbuf on IPv6 reassembly failure path (partial fix).
  The problem was found and fix provided by Anthony Mallet.

Revision 1.7.6.5 / (download) - annotate - [select for diffs], Wed Jan 23 00:06:25 2013 UTC (11 years, 2 months ago) by yamt
Branch: yamt-pagecache
CVS Tags: yamt-pagecache-tag8
Changes since 1.7.6.4: +38 -44 lines
Diff to previous 1.7.6.4 (colored) to branchpoint 1.7 (colored)

sync with head

Revision 1.25 / (download) - annotate - [select for diffs], Mon Dec 24 19:05:43 2012 UTC (11 years, 3 months ago) by rmind
Branch: MAIN
CVS Tags: yamt-pagecache-base8
Changes since 1.24: +38 -44 lines
Diff to previous 1.24 (colored)

- Rework NPF's nbuf interface: use advancing and ensuring as a main method.
  Eliminate unnecessary copy and simplify.  Adapt regression tests.
- Simplify ICMP ALG a little.  While here, handle ICMP ECHO for traceroute.
- Minor fixes, misc cleanup.

Revision 1.10.2.11 / (download) - annotate - [select for diffs], Mon Nov 26 17:39:29 2012 UTC (11 years, 4 months ago) by riz
Branch: netbsd-6
Changes since 1.10.2.10: +2 -2 lines
Diff to previous 1.10.2.10 (colored) to branchpoint 1.10 (colored)

Pull up following revision(s) (requested by rmind in ticket #718):
	usr.sbin/npf/npfctl/npfctl.c: revision 1.22
	usr.sbin/npf/npfctl/npfctl.c: revision 1.23
	usr.sbin/npf/npfctl/npf_parse.y: revision 1.15
	usr.sbin/npf/npfctl/npfctl.c: revision 1.24
	usr.sbin/npf/npfctl/npf_parse.y: revision 1.16
	usr.sbin/npf/npfctl/npfctl.h: revision 1.22
	usr.sbin/npf/npfctl/npf_ncgen.c: revision 1.14
	usr.sbin/npf/npfctl/npf_ncgen.c: revision 1.15
	usr.sbin/npf/npfctl/npf_disassemble.c: revision 1.11
	usr.sbin/npf/npfctl/npf_disassemble.c: revision 1.12
	usr.sbin/npf/npfctl/npf_scan.l: revision 1.7
	usr.sbin/npf/npfctl/npf_scan.l: revision 1.8
	usr.sbin/npf/npfctl/npf_extmod.c: revision 1.2
	usr.sbin/npf/npfctl/npf_extmod.c: revision 1.3
	usr.sbin/npf/npfctl/npf_var.c: revision 1.6
	usr.sbin/npf/npfctl/npf_var.c: revision 1.7
gcc 4.1 is not smart enough to notice "arg" is only used when initialized
correctly and produces a "might be used unintialized" warning.
npfctl: switch to efun(3) routines.
npfctl: switch to ecalloc(3).

Revision 1.10.2.10 / (download) - annotate - [select for diffs], Sat Nov 24 04:34:42 2012 UTC (11 years, 4 months ago) by riz
Branch: netbsd-6
Changes since 1.10.2.9: +3 -8 lines
Diff to previous 1.10.2.9 (colored) to branchpoint 1.10 (colored)

Pull up following revision(s) (requested by rmind in ticket #702):
	sys/net/npf/npf_tableset.c: revision 1.15
	usr.sbin/npf/npfctl/npfctl.h: revision 1.21
	usr.sbin/npf/npftest/libnpftest/npf_table_test.c: revision 1.6
	usr.sbin/npf/npfctl/npf_disassemble.c: revision 1.10
	sys/net/npf/npf_state_tcp.c: revision 1.11
	sys/net/npf/npf_impl.h: revision 1.24
	sys/net/npf/npf.h: revision 1.22
	sys/net/npf/npf_ctl.c: revision 1.19
	sys/net/npf/npf.c: revision 1.14
	usr.sbin/npf/npfctl/npfctl.8: revision 1.10
	usr.sbin/npf/npfctl/npfctl.c: revision 1.21
npf_tcp_inwindow: inspect the sequence numbers even if the packet contains no
data, fixing up only the RST to the initial SYN.  This makes off-path attacks
more difficult.  For the reference, see "Reflection Scan: an Off-Path Attack
on TCP" by Jan Wrobel.
Implement NPF table listing and preservation of entries on reload.
Bump the version.
npfctl(8): mention table listing.

Revision 1.22.2.1 / (download) - annotate - [select for diffs], Tue Nov 20 03:02:47 2012 UTC (11 years, 4 months ago) by tls
Branch: tls-maxphys
Changes since 1.22: +9 -14 lines
Diff to previous 1.22 (colored)

Resync to 2012-11-19 00:00:00 UTC

Revision 1.10.2.9 / (download) - annotate - [select for diffs], Sun Nov 18 22:38:26 2012 UTC (11 years, 4 months ago) by riz
Branch: netbsd-6
Changes since 1.10.2.8: +7 -7 lines
Diff to previous 1.10.2.8 (colored) to branchpoint 1.10 (colored)

Pull up following revision(s) (requested by rmind in ticket #693):
	lib/npf/ext_normalise/shlib_version: revision 1.1
	lib/libnpf/npf.c: revision 1.13
	distrib/sets/lists/modules/mi: revision 1.48
	sys/net/npf/npf_rproc.c: revision 1.3
	sys/net/npf/npf_rproc.c: revision 1.4
	sys/modules/npf/Makefile: revision 1.11
	usr.sbin/npf/npfctl/npfctl.h: revision 1.20
	lib/npf/ext_log/npfext_log.c: revision 1.1
	lib/libnpf/npf.h: revision 1.11
	sys/net/npf/npf_inet.c: revision 1.17
	sys/net/npf/npf_log.c: file removal
	sys/net/npf/npf_handler.c: revision 1.22
	distrib/sets/lists/base/shl.mi: revision 1.636
	sys/net/npf/npf_impl.h: revision 1.23
	usr.sbin/npf/npfctl/Makefile: revision 1.8
	lib/npf/Makefile: revision 1.1
	lib/npf/ext_log/shlib_version: revision 1.1
	lib/Makefile: revision 1.189
	distrib/sets/lists/comp/shl.mi: revision 1.236
	usr.sbin/npf/npfctl/npf_build.c: revision 1.14
	distrib/sets/lists/base/mi: revision 1.1007
	usr.sbin/npf/npfctl/npf_scan.l: revision 1.6
	distrib/sets/lists/base/mi: revision 1.1009
	sys/net/npf/npf.h: revision 1.21
	lib/npf/ext_normalise/npfext_normalise.c: revision 1.1
	etc/mtree/NetBSD.dist.base: revision 1.105
	lib/libnpf/Makefile: revision 1.3
	etc/mtree/NetBSD.dist.base: revision 1.106
	usr.sbin/npf/npfctl/npf_extmod.c: revision 1.1
	sys/net/npf/npf_ctl.c: revision 1.18
	lib/npf/ext_log/Makefile: revision 1.1
	distrib/sets/lists/comp/mi: revision 1.1781
	usr.sbin/npf/npfctl/npf_var.h: revision 1.4
	sys/net/npf/npf.c: revision 1.13
	sys/modules/Makefile: revision 1.111
	sys/net/npf/npf_ext_log.c: revision 1.1
	lib/npf/Makefile.inc: revision 1.1
	sys/net/npf/npf_ext_normalise.c: revision 1.1
	sys/net/npf/files.npf: revision 1.8
	sys/rump/net/lib/libnpf/Makefile: revision 1.2
	sys/modules/npf_ext_log/Makefile: revision 1.1
	lib/npf/ext_normalise/Makefile: revision 1.1
	usr.sbin/npf/npfctl/npfctl.c: revision 1.20
	usr.sbin/npf/npfctl/npf_parse.y: revision 1.13
	sys/modules/npf_ext_normalise/Makefile: revision 1.1
Implement dynamic NPF extensions interface.  An extension consists of
dynamically loaded module (.so) supplementing npfctl(8) and a kernel
module.  Move normalisation and logging functionality into their own
extensions.  More improvements to come.
Add /usr/lib/npf.
Add ./usr/libdata/debug/usr/lib/npf for rmind
Fix MKDEBUG set lists
ext_ops does not change during the life cycle and can be fetched without
the mutex held. This avoids confusion in the compiler about an uninitialized
variable ext_ops.
ok rmind@

Revision 1.10.2.8 / (download) - annotate - [select for diffs], Sun Nov 18 21:45:08 2012 UTC (11 years, 4 months ago) by riz
Branch: netbsd-6
Changes since 1.10.2.7: +2 -8 lines
Diff to previous 1.10.2.7 (colored) to branchpoint 1.10 (colored)

Pull up following revision(s) (requested by rmind in ticket #678):
	sys/rump/librump/rumpkern/rump.c: revision 1.243
	sys/rump/librump/rumpkern/rump.c: revision 1.244
	sys/rump/librump/rumpkern/rump.c: revision 1.245
	sys/rump/librump/rumpkern/rump.c: revision 1.246
	usr.sbin/npf/npftest/npftest.c: revision 1.5
	usr.sbin/npf/npftest/README: revision 1.2
	usr.sbin/npf/npftest/npftest.h: revision 1.5
	sys/rump/net/Makefile.rumpnetcomp: revision 1.5
	sys/rump/net/lib/libnpf/shlib_version: revision 1.1
	sys/net/npf/npf_impl.h: revision 1.22
	sys/rump/dev/lib/libnpf/Makefile: file removal
	usr.sbin/npf/npftest/Makefile: revision 1.3
	sys/rump/dev/lib/libnpf/component.c: file removal
	sys/rump/dev/lib/libnpf/shlib_version: file removal
	sys/net/npf/npf_state.c: revision 1.12
	sys/rump/net/lib/libnpf/component.c: revision 1.1
	usr.sbin/npf/npftest/libnpftest/npf_test_subr.c: revision 1.4
	usr.sbin/npf/npftest/libnpftest/npf_test.h: revision 1.6
	sys/rump/net/lib/libnpf/Makefile: revision 1.1
Move and rename librumpdev_npf to librumpnet_npf.
Enable the build of librumpnet_npf.
Add npf_state_setsampler() for _NPF_TESTING case.  This also fixes the build.
Call pserialize_init() during rump start-up, since librump/net/npf
uses it.
It helps to include the declaration of the routine being called.
We also need kcpuset_init() now.
Use correct routine name - kcpuset_sysinit() vs kcpuset_init()

Revision 1.7.6.4 / (download) - annotate - [select for diffs], Tue Oct 30 17:22:44 2012 UTC (11 years, 5 months ago) by yamt
Branch: yamt-pagecache
Changes since 1.7.6.3: +48 -29 lines
Diff to previous 1.7.6.3 (colored) to branchpoint 1.7 (colored)

sync with head

Revision 1.24 / (download) - annotate - [select for diffs], Mon Oct 29 02:27:12 2012 UTC (11 years, 5 months ago) by rmind
Branch: MAIN
CVS Tags: yamt-pagecache-base7, yamt-pagecache-base6
Changes since 1.23: +3 -8 lines
Diff to previous 1.23 (colored)

Implement NPF table listing and preservation of entries on reload.
Bump the version.

Revision 1.23 / (download) - annotate - [select for diffs], Sun Sep 16 13:47:41 2012 UTC (11 years, 7 months ago) by rmind
Branch: MAIN
Changes since 1.22: +7 -7 lines
Diff to previous 1.22 (colored)

Implement dynamic NPF extensions interface.  An extension consists of
dynamically loaded module (.so) supplementing npfctl(8) and a kernel
module.  Move normalisation and logging functionality into their own
extensions.  More improvements to come.

Revision 1.22 / (download) - annotate - [select for diffs], Wed Aug 15 19:47:38 2012 UTC (11 years, 8 months ago) by rmind
Branch: MAIN
Branch point for: tls-maxphys
Changes since 1.21: +2 -8 lines
Diff to previous 1.21 (colored)

Add npf_state_setsampler() for _NPF_TESTING case.  This also fixes the build.

Revision 1.10.2.7 / (download) - annotate - [select for diffs], Mon Aug 13 17:49:52 2012 UTC (11 years, 8 months ago) by riz
Branch: netbsd-6
CVS Tags: 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, netbsd-6-0, matt-nb6-plus-nbase, matt-nb6-plus-base, matt-nb6-plus
Changes since 1.10.2.6: +9 -7 lines
Diff to previous 1.10.2.6 (colored) to branchpoint 1.10 (colored)

Pull up following revision(s) (requested by rmind in ticket #485):
	lib/libnpf/npf.c: revision 1.11
	sys/net/npf/npf_session.c: revision 1.17
	sys/modules/npf/Makefile: revision 1.10
	usr.sbin/npf/npftest/npftest.c: revision 1.4
	usr.sbin/npf/npftest/README: revision 1.1
	sys/net/npf/npf_tableset.c: revision 1.14
	usr.sbin/npf/npftest/npftest.h: revision 1.4
	lib/libnpf/npf.h: revision 1.10
	sys/net/npf/npf_ruleset.c: revision 1.14
	usr.sbin/npf/npfctl/npf_data.c: revision 1.18
	usr.sbin/npf/npftest/npftest.conf: revision 1.1
	sys/net/npf/npf_handler.c: revision 1.21
	sys/net/npf/npf_impl.h: revision 1.21
	usr.sbin/npf/npfctl/npfctl.c: revision 1.18
	usr.sbin/npf/npftest/libnpftest/npf_nat_test.c: revision 1.1
	usr.sbin/npf/npfctl/npf_build.c: revision 1.13
	usr.sbin/npf/npftest/libnpftest/npf_rule_test.c: revision 1.1
	usr.sbin/npf/npftest/npfstream.c: revision 1.3
	usr.sbin/npf/npftest/libnpftest/Makefile: revision 1.4
	usr.sbin/npf/npfctl/npfctl.h: revision 1.19
	sys/net/npf/npf_nat.c: revision 1.16
	sys/net/npf/npf_state.c: revision 1.11
	usr.sbin/npf/npftest/libnpftest/npf_test_subr.c: revision 1.3
	usr.sbin/npf/npftest/libnpftest/npf_test.h: revision 1.5
	usr.sbin/npf/npfctl/npf_parse.y: revision 1.12
- Extend npftest: add ruleset inspection testing from the config generated
  by npfctl debug functionality.  Auto-create npftest interfaces for this.
- NPF sessions: combine protocol and interface into a separate substructure,
  share between the entries and thus fix the handling of them.  Constify.
- npftest: add regression tests for NAT policies.
- npf_build_nat: simplify and fix bi-NAT regression.
- Bump yacc stack size for npfctl.

Revision 1.21 / (download) - annotate - [select for diffs], Sun Aug 12 03:35:14 2012 UTC (11 years, 8 months ago) by rmind
Branch: MAIN
Changes since 1.20: +9 -7 lines
Diff to previous 1.20 (colored)

- Extend npftest: add ruleset inspection testing from the config generated
  by npfctl debug functionality.  Auto-create npftest interfaces for this.
- NPF sessions: combine protocol and interface into a separate substructure,
  share between the entries and thus fix the handling of them.  Constify.
- npftest: add regression tests for NAT policies.
- npf_build_nat: simplify and fix bi-NAT regression.
- Bump yacc stack size for npfctl.

Revision 1.20 / (download) - annotate - [select for diffs], Sat Jul 28 00:43:24 2012 UTC (11 years, 8 months ago) by matt
Branch: MAIN
Changes since 1.19: +2 -2 lines
Diff to previous 1.19 (colored)

Fix -fno-common found by building i386/conf/ALL

Revision 1.10.2.6 / (download) - annotate - [select for diffs], Wed Jul 25 20:45:23 2012 UTC (11 years, 8 months ago) by jdc
Branch: netbsd-6
Changes since 1.10.2.5: +2 -1 lines
Diff to previous 1.10.2.5 (colored) to branchpoint 1.10 (colored)

Pull up revisions:
  src/usr.sbin/npf/npfctl/npfctl.c revisions 1.16,1.17
  src/sys/net/npf/npf.h revision 1.20
  src/sys/net/npf/npf_alg_icmp.c revision 1.11
  src/sys/net/npf/npf_impl.h revision 1.19
  src/sys/net/npf/npf_inet.c revisions 1.15,1.16
  src/sys/net/npf/npf_instr.c revision 1.14
  src/sys/net/npf/npf_ncode.h revision 1.10
  src/sys/net/npf/npf_processor.c revision 1.12
  src/sys/net/npf/npf_session.c revision 1.16
  src/usr.sbin/npf/npfctl/npf_build.c revision 1.12
  src/usr.sbin/npf/npfctl/npf_data.c revisions 1.16,1.17
  src/usr.sbin/npf/npfctl/npf_disassemble.c revision 1.8
  src/usr.sbin/npf/npfctl/npf_ncgen.c revision 1.13
  src/usr.sbin/npf/npfctl/npf_parse.y revision 1.11
  src/usr.sbin/npf/npfctl/npf_scan.l revision 1.5
  src/usr.sbin/npf/npfctl/npf_var.h revision 1.3
  src/usr.sbin/npf/npfctl/npfctl.h revision 1.18
  src/sys/net/npf/npf_state.c revision 1.10
  src/sys/net/npf/npf_state_tcp.c revision 1.10
  src/usr.sbin/npf/npftest/npfstream.c revision 1.2
  src/usr.sbin/npf/npftest/libnpftest/npf_test_subr.c revision 1.2
(requested by rmind in ticket #435).

Add missing __dead.

teach npf ipv6-icmp
reviewed by rmind@

- npfctl_print_stats: beautification a la French style.
- npfctl_icmpcode: fix the build break.

- npf_fetch_tcpopts: fix off-by-one when validating TCP option length
  against the maximum allowed.
- npf_tcp_inwindow: be more liberal with npf_fetch_tcpopts().
- Few minor improvements to npftest.

Revision 1.19 / (download) - annotate - [select for diffs], Thu Jul 19 21:52:29 2012 UTC (11 years, 8 months ago) by spz
Branch: MAIN
Changes since 1.18: +2 -1 lines
Diff to previous 1.18 (colored)

teach npf ipv6-icmp
reviewed by rmind@

Revision 1.10.2.5 / (download) - annotate - [select for diffs], Mon Jul 16 22:13:27 2012 UTC (11 years, 9 months ago) by riz
Branch: netbsd-6
Changes since 1.10.2.4: +13 -9 lines
Diff to previous 1.10.2.4 (colored) to branchpoint 1.10 (colored)

Pull up following revision(s) (requested by rmind in ticket #421):
	lib/libnpf/npf.c: revision 1.10
	sys/net/npf/npf_session.c: revision 1.15
	sys/net/npf/npf_tableset.c: revision 1.13
	sys/net/npf/npf_state_tcp.c: revision 1.9
	usr.sbin/npf/npfctl/npf_data.c: revision 1.15
	sys/net/npf/npf_inet.c: revision 1.14
	sys/net/npf/npf_ruleset.c: revision 1.13
	sys/net/npf/npf.h: revision 1.19
	usr.sbin/npf/npfctl/npf_ncgen.c: revision 1.12
	sys/net/npf/npf_instr.c: revision 1.13
	sys/net/npf/npf_handler.c: revision 1.20
	usr.sbin/npf/npftest/libnpftest/npf_table_test.c: revision 1.4
	sys/net/npf/npf_alg_icmp.c: revision 1.10
	usr.sbin/npf/npfctl/npfctl.c: revision 1.15
	usr.sbin/npf/npfctl/npf_build.c: revision 1.11
	lib/libnpf/npf.h: revision 1.9
	sys/net/npf/npf_alg.c: revision 1.5
	sys/rump/dev/lib/libnpf/Makefile: revision 1.4
	usr.sbin/npf/npfctl/npfctl.h: revision 1.17
	sys/net/npf/npf_ctl.c: revision 1.16
	sys/net/npf/npf_nat.c: revision 1.15
	sys/net/npf/npf_tableset_ptree.c: revision 1.1
	sys/net/npf/npf.c: revision 1.12
	sys/net/npf/npf_sendpkt.c: revision 1.12
	usr.sbin/npf/npfctl/npf_disassemble.c: revision 1.7
	sys/net/npf/npf_impl.h: revision 1.18
	sys/net/npf/files.npf: revision 1.7
	usr.sbin/npf/npfctl/npf_parse.y: revision 1.10
- Rework NPF tables and fix support for IPv6.  Implement tree table type
  using radix / Patricia tree.  Universal IPv4/IPv6 comparator for ptree(3)
  was contributed by Matt Thomas.
- NPF tables: update regression tests, improve npfctl(8) error messages.
- Fix few bugs when using kernel modules and handle module autounloader.
- Few other fixes and misc cleanups.
- Bump the version.

Revision 1.18 / (download) - annotate - [select for diffs], Sun Jul 15 00:23:00 2012 UTC (11 years, 9 months ago) by rmind
Branch: MAIN
Changes since 1.17: +13 -9 lines
Diff to previous 1.17 (colored)

- Rework NPF tables and fix support for IPv6.  Implement tree table type
  using radix / Patricia tree.  Universal IPv4/IPv6 comparator for ptree(3)
  was contributed by Matt Thomas.
- NPF tables: update regression tests, improve npfctl(8) error messages.
- Fix few bugs when using kernel modules and handle module autounloader.
- Few other fixes and misc cleanups.
- Bump the version.

Revision 1.10.2.4 / (download) - annotate - [select for diffs], Thu Jul 5 17:48:42 2012 UTC (11 years, 9 months ago) by riz
Branch: netbsd-6
Changes since 1.10.2.3: +14 -6 lines
Diff to previous 1.10.2.3 (colored) to branchpoint 1.10 (colored)

Pull up following revision(s) (requested by rmind in ticket #399):
	sys/net/npf/npf_session.c: revision 1.14
	sys/net/npf/npf_tableset.c: revision 1.12
	sys/net/npf/npf_state_tcp.c: revision 1.8
	usr.sbin/npf/npftest/libnpftest/npf_mbuf_subr.c: revision 1.3
	usr.sbin/npf/npfctl/npf_data.c: revision 1.14
	sys/net/npf/npf_inet.c: revision 1.13
	sys/net/npf/npf_ruleset.c: revision 1.12
	sys/net/npf/npf.h: revision 1.18
	usr.sbin/npf/npfctl/npf_ncgen.c: revision 1.11
	usr.sbin/npf/npfctl/npfctl.8: revision 1.7
	usr.sbin/npf/npfctl/npf_parse.y: revision 1.9
	usr.sbin/npf/npftest/libnpftest/npf_state_test.c: revision 1.2
	usr.sbin/npf/npfctl/npfctl.8: revision 1.8
	sys/net/npf/npf_instr.c: revision 1.12
	usr.sbin/npf/npftest/libnpftest/npf_table_test.c: revision 1.3
	usr.sbin/npf/npfctl/npf.conf.5: revision 1.13
	usr.sbin/npf/npfctl/npf.conf.5: revision 1.14
	sys/net/npf/npf_state.c: revision 1.9
	sys/net/npf/npf_processor.c: revision 1.11
	usr.sbin/npf/npfctl/npfctl.c: revision 1.13
	usr.sbin/npf/npfctl/npfctl.c: revision 1.14
	usr.sbin/npf/npfctl/npf_build.c: revision 1.10
	lib/libnpf/npf.3: revision 1.5
	lib/libnpf/npf.h: revision 1.8
	share/man/man9/npf_ncode.9: revision 1.9
	usr.sbin/npf/npfctl/npf_scan.l: revision 1.4
	lib/libnpf/npf.c: revision 1.9
	usr.sbin/npf/npfctl/npfctl.h: revision 1.16
	sys/net/npf/npf_nat.c: revision 1.14
	usr.sbin/npf/npftest/libnpftest/npf_processor_test.c: revision 1.2
	usr.sbin/npf/npfctl/npf_disassemble.c: revision 1.6
	sys/net/npf/npf_impl.h: revision 1.17
	sys/net/npf/npf_handler.c: revision 1.18
	sys/net/npf/npf_handler.c: revision 1.19
	usr.sbin/npf/npftest/libnpftest/npf_test.h: revision 1.4
	sys/net/npf/npf_ncode.h: revision 1.9
Fix and update npf.conf(5), npfctl(8) and its usage message.
npf_state_tcp: fix for FIN retransmission and out-of-order ACK case.
NPF improvements:
- Add NPF_OPCODE_PROTO to match the address and/or protocol only.
- Update parser to support arbitrary "pass proto <name/number>".
- Fix IPv6 address and protocol handling (add a regression test).
- Fix few theorethical races in session handling module.
- Misc fixes, simplifications and some clean up.
npf_packet_handler: fix gcc unused warning.

Revision 1.17 / (download) - annotate - [select for diffs], Sun Jul 1 23:21:06 2012 UTC (11 years, 9 months ago) by rmind
Branch: MAIN
Changes since 1.16: +14 -6 lines
Diff to previous 1.16 (colored)

NPF improvements:
- Add NPF_OPCODE_PROTO to match the address and/or protocol only.
- Update parser to support arbitrary "pass proto <name/number>".
- Fix IPv6 address and protocol handling (add a regression test).
- Fix few theorethical races in session handling module.
- Misc fixes, simplifications and some clean up.

Revision 1.10.2.3 / (download) - annotate - [select for diffs], Tue Jun 26 14:49:10 2012 UTC (11 years, 9 months ago) by riz
Branch: netbsd-6
Changes since 1.10.2.2: +9 -2 lines
Diff to previous 1.10.2.2 (colored) to branchpoint 1.10 (colored)

Pull up following revision(s) (requested by rmind in ticket #365):
	sys/rump/librump/rumpkern/rumpcpu_generic.c: revision 1.4
	sys/net/npf/npf_session.c: revision 1.13
	sys/net/npf/npf_tableset.c: revision 1.11
	sys/net/npf/npf_state_tcp.c: revision 1.7
	sys/net/npf/npf_inet.c: revision 1.12
	sys/net/npf/npf.h: revision 1.17
	sys/net/npf/npf_instr.c: revision 1.11
	usr.sbin/npf/npftest/libnpftest/npf_table_test.c: revision 1.2
	sys/net/npf/npf_state.c: revision 1.8
	sys/net/npf/npf_log.c: revision 1.4
	sys/net/npf/npf_alg.c: revision 1.4
	sys/rump/librump/rumpkern/Makefile.rumpkern: revision 1.118
	sys/net/npf/npf_nat.c: revision 1.13
	sys/net/npf/npf.c: revision 1.11
	sys/net/npf/npf_sendpkt.c: revision 1.11
	sys/net/npf/npf_impl.h: revision 1.16
	sys/rump/librump/rumpkern/scheduler.c: revision 1.28
rumpkern:
- Add subr_kcpuset.c and subr_pserialize.c modules.
- Add kcpuset_{running,attached} for RUMP env.
NPF:
- Rename some functions for consistency and de-inline them.
- Fix few invalid asserts (add regressoin test).
- Use pserialize(9) for ALG interface.
- Minor fixes, sprinkle many comments.

Revision 1.10.2.2 / (download) - annotate - [select for diffs], Tue Jun 26 00:07:16 2012 UTC (11 years, 9 months ago) by riz
Branch: netbsd-6
Changes since 1.10.2.1: +11 -7 lines
Diff to previous 1.10.2.1 (colored) to branchpoint 1.10 (colored)

Pull up following revision(s) (requested by rmind in ticket #354):
	sys/net/npf/npf_state_tcp.c: revision 1.4
	sys/net/npf/npf_state_tcp.c: revision 1.5
	sys/net/npf/npf_state_tcp.c: revision 1.6
	usr.sbin/npf/npftest/npftest.c: revision 1.1
	usr.sbin/npf/npftest/libnpftest/npf_mbuf_subr.c: revision 1.1
	usr.sbin/npf/npftest/npftest.c: revision 1.2
	usr.sbin/npf/npftest/libnpftest/npf_mbuf_subr.c: revision 1.2
	usr.sbin/npf/npfctl/npf_data.c: revision 1.11
	usr.sbin/npf/npftest/npftest.c: revision 1.3
	usr.sbin/npf/npfctl/npf_data.c: revision 1.12
	usr.sbin/npf/npftest/npftest.h: revision 1.1
	usr.sbin/npf/npfctl/npf_parse.y: revision 1.5
	usr.sbin/npf/npfctl/npf_data.c: revision 1.13
	sys/net/npf/npf.h: revision 1.16
	usr.sbin/npf/npftest/npftest.h: revision 1.2
	usr.sbin/npf/npfctl/npf_parse.y: revision 1.6
	usr.sbin/npf/npftest/npftest.h: revision 1.3
	usr.sbin/npf/npfctl/npf_parse.y: revision 1.7
	usr.sbin/npf/npfctl/npf_ncgen.c: revision 1.10
	usr.sbin/npf/npfctl/npf_build.c: revision 1.6
	usr.sbin/npf/npfctl/npf_parse.y: revision 1.8
	usr.sbin/npf/npfctl/npf_build.c: revision 1.7
	usr.sbin/npf/npftest/libnpftest/npf_state_test.c: revision 1.1
	usr.sbin/npf/npftest/libnpftest/npf_nbuf_test.c: revision 1.1
	usr.sbin/npf/npfctl/npf_build.c: revision 1.8
	usr.sbin/npf/npftest/libnpftest/npf_table_test.c: revision 1.1
	usr.sbin/npf/npfctl/npf_build.c: revision 1.9
	usr.sbin/npf/npfctl/npf.conf.5: revision 1.10
	usr.sbin/npf/npfctl/npf.conf.5: revision 1.11
	usr.sbin/npf/npfctl/npf.conf.5: revision 1.12
	sys/net/npf/npf_state.c: revision 1.7
	usr.sbin/npf/npfctl/npfctl.c: revision 1.11
	usr.sbin/npf/npfctl/npfctl.c: revision 1.12
	usr.sbin/npf/npfctl/Makefile: revision 1.7
	sys/rump/net/lib/libnet/Makefile: revision 1.14
	sys/net/npf/npf_mbuf.c: revision 1.7
	usr.sbin/npf/npftest/Makefile: revision 1.1
	usr.sbin/npf/npftest/Makefile: revision 1.2
	usr.sbin/npf/npftest/libnpftest/Makefile: revision 1.1
	usr.sbin/npf/npfctl/npf_scan.l: revision 1.2
	usr.sbin/npf/npftest/npfstream.c: revision 1.1
	usr.sbin/npf/npftest/libnpftest/Makefile: revision 1.2
	usr.sbin/npf/npfctl/npf_scan.l: revision 1.3
	usr.sbin/npf/npftest/libnpftest/Makefile: revision 1.3
	usr.sbin/npf/npfctl/npfctl.h: revision 1.12
	sys/rump/dev/lib/libnpf/Makefile: revision 1.2
	usr.sbin/npf/npfctl/npfctl.h: revision 1.14
	sys/rump/dev/lib/libnpf/Makefile: revision 1.3
	usr.sbin/npf/npfctl/npfctl.h: revision 1.15
	usr.sbin/npf/npfctl/npf_ncgen.c: revision 1.9
	sys/net/npf/npf_ctl.c: revision 1.15
	usr.sbin/npf/npfctl/npf_var.c: revision 1.4
	usr.sbin/npf/npfctl/npf_var.h: revision 1.2
	usr.sbin/npf/npfctl/npf_var.c: revision 1.5
	sys/net/npf/npf_impl.h: revision 1.13
	sys/net/npf/npf_sendpkt.c: revision 1.10
	sys/net/npf/npf_impl.h: revision 1.14
	usr.sbin/npf/npfctl/npf_disassemble.c: revision 1.4
	sys/net/npf/npf_impl.h: revision 1.15
	sys/net/npf/npf_handler.c: revision 1.16
	usr.sbin/npf/npftest/libnpftest/npf_test.h: revision 1.1
	usr.sbin/npf/npftest/libnpftest/npf_processor_test.c: revision 1.1
	usr.sbin/npf/npfctl/npf_disassemble.c: revision 1.5
	sys/net/npf/npf_handler.c: revision 1.17
	usr.sbin/npf/npftest/libnpftest/npf_test.h: revision 1.2
	sys/net/npf/npf_ncode.h: revision 1.7
	usr.sbin/npf/npftest/libnpftest/npf_test_subr.c: revision 1.1
	usr.sbin/npf/npftest/libnpftest/npf_test.h: revision 1.3
	sys/net/npf/npf_ncode.h: revision 1.8
npf_tcp_inwindow: in a case of negative skew, bump the maximum seen value of
SEQ+LEN in the receiver's side correctly (using ACK from the sender's side).
PR/46265 from Changli Gao.
rumpnet_net: add pfil.c
Update rumpdev_npf; use WARNS=4.
Add initial NPF regression tests integrated with RUMP framework (running the
kernel part of NPF in userland).  Other tests will be added once converted to
RUMP framework.  All tests are in the public domain.
Some Makefile fixes from christos@.
- Fix double-free case on ICMP return case.
- npf_pfil_register: handle kernels without INET6 option correctly.
- Reduce some #ifdefs.
npfctl(8): add show-config command.  Also, update syntax.
npftest: add a stream processor, which prints out the TCP state information.
A tool for debugging connection tracking from tcpdump -w captured data.
npftest: add a module for TCP state tracking and add few test cases.
npf_state_tcp: add an assert; fix some comments while here.
- Rework NPF NAT syntax to be more structured and support future additions
  of different types and configurations of NAT.
- npfctl: improve disassemble and show-config command functionality.
- Fix custom ICMP code and type filtering.
make this compile again.
remove error(1) output
Remove superfluous Pp
- make each element of a variable hold a type
- change get_type to take an index, so we can get the individual types of
  each element (since primitive elements can be in lists)
- make port_range primitive
- add a routine to convert a variable of primitives to a variable containing
- only port ranges.
remove extra rule that got merged...

Revision 1.16 / (download) - annotate - [select for diffs], Fri Jun 22 13:43:17 2012 UTC (11 years, 9 months ago) by rmind
Branch: MAIN
Changes since 1.15: +9 -2 lines
Diff to previous 1.15 (colored)

NPF:
- Rename some functions for consistency and de-inline them.
- Fix few invalid asserts (add regressoin test).
- Use pserialize(9) for ALG interface.
- Minor fixes, sprinkle many comments.

Revision 1.9.2.5 / (download) - annotate - [select for diffs], Sat Jun 2 11:09:38 2012 UTC (11 years, 10 months ago) by mrg
Branch: jmcneill-usbmp
Changes since 1.9.2.4: +10 -2 lines
Diff to previous 1.9.2.4 (colored) to branchpoint 1.9 (colored) next main 1.10 (colored)

sync to latest -current.

Revision 1.15 / (download) - annotate - [select for diffs], Wed May 30 21:38:03 2012 UTC (11 years, 10 months ago) by rmind
Branch: MAIN
CVS Tags: jmcneill-usbmp-base10
Changes since 1.14: +9 -1 lines
Diff to previous 1.14 (colored)

npftest: add a stream processor, which prints out the TCP state information.
A tool for debugging connection tracking from tcpdump -w captured data.

Revision 1.7.6.3 / (download) - annotate - [select for diffs], Wed May 23 10:08:15 2012 UTC (11 years, 10 months ago) by yamt
Branch: yamt-pagecache
Changes since 1.7.6.2: +2 -2 lines
Diff to previous 1.7.6.2 (colored) to branchpoint 1.7 (colored)

sync with head.

Revision 1.14 / (download) - annotate - [select for diffs], Sun May 6 02:45:25 2012 UTC (11 years, 11 months ago) by rmind
Branch: MAIN
CVS Tags: yamt-pagecache-base5
Changes since 1.13: +2 -2 lines
Diff to previous 1.13 (colored)

- Fix double-free case on ICMP return case.
- npf_pfil_register: handle kernels without INET6 option correctly.
- Reduce some #ifdefs.

Revision 1.9.2.4 / (download) - annotate - [select for diffs], Sun Apr 29 23:05:06 2012 UTC (11 years, 11 months ago) by mrg
Branch: jmcneill-usbmp
Changes since 1.9.2.3: +2 -6 lines
Diff to previous 1.9.2.3 (colored) to branchpoint 1.9 (colored)

sync to latest -current.

Revision 1.7.6.2 / (download) - annotate - [select for diffs], Tue Apr 17 00:08:39 2012 UTC (12 years ago) by yamt
Branch: yamt-pagecache
Changes since 1.7.6.1: +32 -19 lines
Diff to previous 1.7.6.1 (colored) to branchpoint 1.7 (colored)

sync with head

Revision 1.13 / (download) - annotate - [select for diffs], Sat Apr 14 19:01:21 2012 UTC (12 years ago) by rmind
Branch: MAIN
CVS Tags: yamt-pagecache-base4, jmcneill-usbmp-base9
Changes since 1.12: +2 -6 lines
Diff to previous 1.12 (colored)

Update rumpdev_npf; use WARNS=4.

Revision 1.9.2.3 / (download) - annotate - [select for diffs], Thu Apr 5 21:33:43 2012 UTC (12 years ago) by mrg
Branch: jmcneill-usbmp
Changes since 1.9.2.2: +8 -4 lines
Diff to previous 1.9.2.2 (colored) to branchpoint 1.9 (colored)

sync to latest -current.

Revision 1.10.2.1 / (download) - annotate - [select for diffs], Tue Apr 3 17:22:53 2012 UTC (12 years ago) by riz
Branch: netbsd-6
Changes since 1.10: +14 -5 lines
Diff to previous 1.10 (colored)

Pull up following revision(s) (requested by rmind in ticket #158):
	sys/net/npf/npf_session.c: revision 1.12
	sys/net/npf/npf_tableset.c: revision 1.10
	sys/net/npf/npf_rproc.c: revision 1.2
	usr.sbin/npf/npfctl/npf_parse.y: revision 1.4
	sys/net/npf/npf_inet.c: revision 1.11
	sys/net/npf/npf.h: revision 1.15
	usr.sbin/npf/npfctl/npf_build.c: revision 1.5
	sys/net/npf/npf_ruleset.c: revision 1.11
	sys/net/npf/npf_instr.c: revision 1.10
	usr.sbin/npf/npfctl/Makefile: revision 1.6
	sys/net/npf/npf_processor.c: revision 1.10
	sys/net/npf/npf_log.c: revision 1.3
	lib/libnpf/npf.h: revision 1.7
	sys/net/npf/npf_alg.c: revision 1.3
	sys/net/npf/npf_sendpkt.c: revision 1.9
	lib/libnpf/npf.c: revision 1.8
	usr.sbin/npf/npfctl/npfctl.h: revision 1.13
	sys/net/npf/npf_ctl.c: revision 1.13
	usr.sbin/npf/npfctl/npf_ncgen.c: revision 1.8
	sys/net/npf/npf_ctl.c: revision 1.14
	sys/net/npf/npf_nat.c: revision 1.11
	sys/net/npf/npf_nat.c: revision 1.12
	sys/net/npf/npf_impl.h: revision 1.11
	usr.sbin/npf/npfctl/npf_disassemble.c: revision 1.1
	sys/net/npf/npf_impl.h: revision 1.12
	usr.sbin/npf/npfctl/npf_disassemble.c: revision 1.2
	sys/net/npf/npf_handler.c: revision 1.14
	usr.sbin/npf/npfctl/npf_disassemble.c: revision 1.3
	sys/net/npf/npf_handler.c: revision 1.15
	sys/net/npf/npf_ncode.h: revision 1.6
	sys/net/npf/npf.c: revision 1.8
	sys/net/npf/npf.c: revision 1.9
	sys/net/npf/npf_alg_icmp.c: revision 1.9
	sys/net/npf/npf_session.c: revision 1.11
- Add NPF_DECISION_BLOCK and NPF_DECISION_PASS.  Be more defensive in the
  packet handler.  Change the default policy to block when the config is
  loaded and set it to pass when flush operation is performed.
- Use kmem_zalloc(9) instead of kmem_alloc(9) in few places.
- npf_rproc_{create,release}: use kmem_intr_{alloc,free} as the destruction
  of rule procedure might happen in the interrupt handler (under a very rare
  condition, if config reload races with the handler).
- npf_session_establish: check whether layer 3 and 4 are cached.
- npfctl_build_group: do not make groups as passing rules.
- Remove some unecessary header inclusion.
Simplify slightly: merge iface into addr_or_iface, use it in filt_addr.
Add a small disassembler.
definitions used by the disassembler.
- better printing of type/code flags/mask
- pass the instruction start pointer, instead of subtracting 1 to account for it
- Save active config in proplib dictionary; add GETCONF ioctl to retrieve.
- Few fixes.  Improve some comments.
don't leak the branch target array.
Add NPF config retrieval routines.

Revision 1.12 / (download) - annotate - [select for diffs], Sun Mar 11 18:27:59 2012 UTC (12 years, 1 month ago) by rmind
Branch: MAIN
CVS Tags: jmcneill-usbmp-base8
Changes since 1.11: +9 -5 lines
Diff to previous 1.11 (colored)

- Save active config in proplib dictionary; add GETCONF ioctl to retrieve.
- Few fixes.  Improve some comments.

Revision 1.9.2.2 / (download) - annotate - [select for diffs], Fri Feb 24 09:11:49 2012 UTC (12 years, 1 month ago) by mrg
Branch: jmcneill-usbmp
Changes since 1.9.2.1: +8 -3 lines
Diff to previous 1.9.2.1 (colored) to branchpoint 1.9 (colored)

sync to -current.

Revision 1.11 / (download) - annotate - [select for diffs], Mon Feb 20 00:18:19 2012 UTC (12 years, 1 month ago) by rmind
Branch: MAIN
CVS Tags: jmcneill-usbmp-base7, jmcneill-usbmp-base6, jmcneill-usbmp-base5, jmcneill-usbmp-base4, jmcneill-usbmp-base3
Changes since 1.10: +8 -3 lines
Diff to previous 1.10 (colored)

- Add NPF_DECISION_BLOCK and NPF_DECISION_PASS.  Be more defensive in the
  packet handler.  Change the default policy to block when the config is
  loaded and set it to pass when flush operation is performed.
- Use kmem_zalloc(9) instead of kmem_alloc(9) in few places.
- npf_rproc_{create,release}: use kmem_intr_{alloc,free} as the destruction
  of rule procedure might happen in the interrupt handler (under a very rare
  condition, if config reload races with the handler).
- npf_session_establish: check whether layer 3 and 4 are cached.
- npfctl_build_group: do not make groups as passing rules.
- Remove some unecessary header inclusion.

Revision 1.9.2.1 / (download) - annotate - [select for diffs], Sat Feb 18 07:35:38 2012 UTC (12 years, 1 month ago) by mrg
Branch: jmcneill-usbmp
Changes since 1.9: +3 -2 lines
Diff to previous 1.9 (colored)

merge to -current.

Revision 1.10 / (download) - annotate - [select for diffs], Mon Feb 6 23:30:14 2012 UTC (12 years, 2 months ago) by rmind
Branch: MAIN
CVS Tags: netbsd-6-base, jmcneill-usbmp-base2
Branch point for: netbsd-6
Changes since 1.9: +3 -2 lines
Diff to previous 1.9 (colored)

- Split NPF rule procedure code into a separate module (no functional changes).
- Simplify some code, add more comments, some asserts.
- G/C unused rule hook code.

Revision 1.9 / (download) - annotate - [select for diffs], Tue Nov 29 20:05:30 2011 UTC (12 years, 4 months ago) by rmind
Branch: MAIN
CVS Tags: jmcneill-usbmp-pre-base2, jmcneill-usbmp-base
Branch point for: jmcneill-usbmp
Changes since 1.8: +16 -9 lines
Diff to previous 1.8 (colored)

- Rework and improve TCP state tracking.
- Fix regressions after IPv6 patch merge.

Note: npfctl(8) rework will come soon.

Revision 1.7.6.1 / (download) - annotate - [select for diffs], Thu Nov 10 14:31:50 2011 UTC (12 years, 5 months ago) by yamt
Branch: yamt-pagecache
Changes since 1.7: +10 -10 lines
Diff to previous 1.7 (colored)

sync with head

Revision 1.8 / (download) - annotate - [select for diffs], Fri Nov 4 01:00:27 2011 UTC (12 years, 5 months ago) by zoltan
Branch: MAIN
CVS Tags: yamt-pagecache-base3, yamt-pagecache-base2, jmcneill-audiomp3-base, jmcneill-audiomp3
Changes since 1.7: +10 -10 lines
Diff to previous 1.7 (colored)

Add IPv6 support for NPF.

Revision 1.5.2.1 / (download) - annotate - [select for diffs], Mon Jun 6 09:09:53 2011 UTC (12 years, 10 months ago) by jruoho
Branch: jruoho-x86intr
Changes since 1.5: +30 -20 lines
Diff to previous 1.5 (colored) next main 1.6 (colored)

Sync with HEAD.

Revision 1.7.2.2 / (download) - annotate - [select for diffs], Sat Mar 5 20:55:55 2011 UTC (13 years, 1 month ago) by rmind
Branch: rmind-uvmplock
Changes since 1.7.2.1: +293 -0 lines
Diff to previous 1.7.2.1 (colored) to branchpoint 1.7 (colored) next main 1.8 (colored)

sync with head

Revision 1.6.2.1 / (download) - annotate - [select for diffs], Tue Feb 8 16:20:01 2011 UTC (13 years, 2 months ago) by bouyer
Branch: bouyer-quota2
Changes since 1.6: +17 -9 lines
Diff to previous 1.6 (colored) next main 1.7 (colored)

Sync with HEAD

Revision 1.7.2.1, Wed Feb 2 02:20:25 2011 UTC (13 years, 2 months ago) by rmind
Branch: rmind-uvmplock
Changes since 1.7: +0 -293 lines
FILE REMOVED

file npf_impl.h was added on branch rmind-uvmplock on 2011-03-05 20:55:55 +0000

Revision 1.7 / (download) - annotate - [select for diffs], Wed Feb 2 02:20:25 2011 UTC (13 years, 2 months ago) by rmind
Branch: MAIN
CVS Tags: yamt-pagecache-base, rmind-uvmplock-nbase, rmind-uvmplock-base, cherry-xenmp-base, cherry-xenmp, bouyer-quota2-nbase, bouyer-quota2-base
Branch point for: yamt-pagecache, rmind-uvmplock
Changes since 1.6: +17 -9 lines
Diff to previous 1.6 (colored)

NPF checkpoint:
- Add libnpf(3) - a library to control NPF (configuration, ruleset, etc).
- Add NPF support for ftp-proxy(8).
- Add rc.d script for NPF.
- Convert npfctl(8) to use libnpf(3) and thus make it less depressive.
  Note: next clean-up step should be a parser, once dholland@ will finish it.
- Add more documentation.
- Various fixes.

Revision 1.6 / (download) - annotate - [select for diffs], Tue Jan 18 20:33:45 2011 UTC (13 years, 2 months ago) by rmind
Branch: MAIN
Branch point for: bouyer-quota2
Changes since 1.5: +15 -13 lines
Diff to previous 1.5 (colored)

NPF checkpoint:
- Add the concept of rule procedure: separate normalization, logging and
  potentially other functions from the rule structure.  Rule procedure can be
  shared amongst the rules.  Separation is both at kernel level (npf_rproc_t)
  and configuration ("procedure" + "apply").
- Fix portmap sharing for NAT policy.
- Update TCP state tracking logic.  Use TCP FSM definitions.
- Add if_byindex(), OK by matt@.  Use in logging for the lookup.
- Fix traceroute ALG and many other bugs; misc clean-up.

Revision 1.5 / (download) - annotate - [select for diffs], Sat Dec 18 01:07:25 2010 UTC (13 years, 4 months ago) by rmind
Branch: MAIN
CVS Tags: matt-mips64-premerge-20101231, jruoho-x86intr-base
Branch point for: jruoho-x86intr
Changes since 1.4: +55 -23 lines
Diff to previous 1.4 (colored)

NPF checkpoint:
- Add support for session saving/restoring.
- Add packet logging support (can tcpdump a pseudo-interface).
- Support reload without flushing of sessions; rework some locking.
- Revisit session mangement, replace linking with npf_sentry_t entries.
- Add some counters for statistics, using percpu(9).
- Add IP_DF flag cleansing.
- Fix various bugs; misc clean-up.

Revision 1.4 / (download) - annotate - [select for diffs], Thu Nov 11 06:30:39 2010 UTC (13 years, 5 months ago) by rmind
Branch: MAIN
Changes since 1.3: +60 -22 lines
Diff to previous 1.3 (colored)

NPF checkpoint:
- Add proper TCP state tracking as described in Guido van Rooij paper,
  plus handle TCP Window Scaling option.
- Completely rework npf_cache_t, reduce granularity, simplify code.
- Add npf_addr_t as an abstraction, amend session handling code, as well
  as NAT code et al, to use it.  Now design is prepared for IPv6 support.
- Handle IPv4 fragments i.e. perform packet reassembly.
- Add support for IPv4 ID randomization and minimum TTL enforcement.
- Add support for TCP MSS "clamping".
- Random bits for IPv6.  Various fixes and clean-up.

Revision 1.3.4.2 / (download) - annotate - [select for diffs], Fri Oct 22 09:23:14 2010 UTC (13 years, 5 months ago) by uebayasi
Branch: uebayasi-xip
Changes since 1.3.4.1: +213 -0 lines
Diff to previous 1.3.4.1 (colored) to branchpoint 1.3 (colored) next main 1.4 (colored)

Sync with HEAD (-D20101022).

Revision 1.3.2.2 / (download) - annotate - [select for diffs], Sat Oct 9 03:32:37 2010 UTC (13 years, 6 months ago) by yamt
Branch: yamt-nfs-mp
Changes since 1.3.2.1: +213 -0 lines
Diff to previous 1.3.2.1 (colored) to branchpoint 1.3 (colored) next main 1.4 (colored)

sync with head

Revision 1.3.4.1, Sat Sep 25 01:42:39 2010 UTC (13 years, 6 months ago) by uebayasi
Branch: uebayasi-xip
Changes since 1.3: +0 -213 lines
FILE REMOVED

file npf_impl.h was added on branch uebayasi-xip on 2010-10-22 09:23:14 +0000

Revision 1.3.2.1, Sat Sep 25 01:42:39 2010 UTC (13 years, 6 months ago) by yamt
Branch: yamt-nfs-mp
Changes since 1.3: +0 -213 lines
FILE REMOVED

file npf_impl.h was added on branch yamt-nfs-mp on 2010-10-09 03:32:37 +0000

Revision 1.3 / (download) - annotate - [select for diffs], Sat Sep 25 01:42:39 2010 UTC (13 years, 6 months ago) by matt
Branch: MAIN
CVS Tags: yamt-nfs-mp-base11, uebayasi-xip-base4, uebayasi-xip-base3
Branch point for: yamt-nfs-mp, uebayasi-xip
Changes since 1.2: +2 -2 lines
Diff to previous 1.2 (colored)

Rename rb.h to rbtree.h, as it is more appropriate (c.f. ptree.h).  Also
helps find code that hasn't been updated to use the new rbtree API.

Revision 1.2 / (download) - annotate - [select for diffs], Thu Sep 16 04:53:27 2010 UTC (13 years, 7 months ago) by rmind
Branch: MAIN
Changes since 1.1: +14 -15 lines
Diff to previous 1.1 (colored)

NPF checkpoint:
- Add support for bi-directional NAT and redirection / port forwarding.
- Finish filtering on ICMP type/code and add filtering on TCP flags.
- Add support for TCP reset (RST) or ICMP destination unreachable on block.
- Fix a bunch of bugs; misc cleanup.

Revision 1.1 / (download) - annotate - [select for diffs], Sun Aug 22 18:56:22 2010 UTC (13 years, 7 months ago) by rmind
Branch: MAIN

Import NPF - a packet filter.  Some features:

- Designed to be fully MP-safe and highly efficient.

- Tables/IP sets (hash or red-black tree) for high performance lookups.

- Stateful filtering and Network Address Port Translation (NAPT).
  Framework for application level gateways (ALGs).

- Packet inspection engine called n-code processor - inspired by BPF -
  supporting generic RISC-like and specific CISC-like instructions for
  common patterns (e.g. IPv4 address matching).  See npf_ncode(9) manual.

- Convenient userland utility npfctl(8) with npf.conf(8).

NOTE: This is not yet a fully capable alternative to PF or IPFilter.
Further work (support for binat/rdr, return-rst/return-icmp, common ALGs,
state saving/restoring, logging, etc) is in progress.

Thanks a lot to Matt Thomas for various useful comments and code review.
Aye by: board@

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>