Commit Graph

37 Commits

Author SHA1 Message Date
veego 21dea2100c Resolve conflicts. 2000-05-03 11:12:03 +00:00
veego 2e825f9c4e Resolve conflicts and change the Makefile to reflect the move of ipl.h
to sys/netinet (we need it now in usr.sbin/ipf).
1999-12-12 11:18:46 +00:00
ross 4281edcb66 Enable this lkm on alpha. 1999-03-18 06:01:42 +00:00
cjs c890eba0b7 Change NOMAN=yep to MKMAN=no. 1999-02-12 05:41:57 +00:00
mrg d3224441a0 merge ipf 3.2.10 1998-11-22 14:41:29 +00:00
mrg de6cfc033a don't need our own lkmenodev anymore... 1998-11-17 01:46:10 +00:00
veego e3d44c6e25 Resolve conflicts from the import. 1998-07-12 15:11:50 +00:00
veego a5aa2efa3d Resolve conflicts from the import of IPFilter 3.2.7. 1998-05-29 20:32:01 +00:00
veego 82423e3d01 Resolve conflicts 1998-05-17 16:50:15 +00:00
thorpej 3ef999a19b Make sure all LKMs get built with -DUVM and -DPMAP_NEW if so configured
in mk.conf.
1998-03-28 23:58:44 +00:00
fvdl e5bc90f40c Merge with Lite2 + local changes 1998-03-01 02:20:01 +00:00
mikel 54013b0a5c add ipmon(8) support, from Matthias Scheler in PR kern/4860 1998-02-04 07:38:55 +00:00
mrg 84ecff38c2 merge ip-filter 3.2.1 1997-11-14 12:40:06 +00:00
mrg 3f0ebb2220 sigh. merge ipfilter 3.2 onto the trunk. merge to the branch was a mistake. 1997-10-30 15:39:56 +00:00
veego 4508fb4354 Resolve conflicts from the merge of ipf 3.2beta5. 1997-09-21 18:00:54 +00:00
kleink 20b33f1d4c When creating new device nodes based on the major number of the LKM slot we
have been assigned, try to remove any existing ones first; otherwise loading
the LKM could fail with EEXIST.  Fixes PR kern/3868.

Why was this call dropped between v3-2alpha7 and v3-2beta1?
1997-07-19 22:42:18 +00:00
kleink 24b86eb3f3 Sync if_ipl_lkmentry()'s prototype with the function's actual name; from
Matthias Scheler in PR kern/3868.
1997-07-19 15:35:27 +00:00
thorpej a6c52a705c Fix a case where an error condition wouldn't be indicated in the dispatch
routine.  A few minor KNF'ish stylistic changes while I'm here.
1997-07-06 22:19:43 +00:00
thorpej 5b434b6e72 Under no circumstances should we #define iplread to an error stub; ip_fil.c
already has the correct code to return ENXIO if logging is not enabled.
1997-07-06 22:13:49 +00:00
thorpej 928ff81b87 Need ip_auth.o 1997-07-06 22:12:56 +00:00
darrenr a7a52d12c8 fix conflicts from import 1997-07-05 05:52:39 +00:00
thorpej 8b4b26e8d9 Fix several bugs/warnings:
- Pull in correct headers to get types.
- Garbage-collect some unused code.
- Add missing return values.
- Add parenthesis around assignments in conditionals.
1997-05-28 02:49:06 +00:00
thorpej b987e82127 CVS munched date on copyright; correct it. 1997-05-28 02:11:10 +00:00
thorpej 6ef2799147 Garbage-collect unneeded CFLAGS. 1997-05-28 02:10:28 +00:00
thorpej bbf6e6fb4d Fix a typo. 1997-05-28 00:22:43 +00:00
thorpej 9062a97000 Resolve conflicts from merge of 3.2a7, take 2. 1997-05-28 00:22:15 +00:00
christos 48729af76f We don't want iplread to change to enodev() when we don't have IPFILTER_LOG
defined.
1997-04-15 18:58:27 +00:00
thorpej 04bfe534ed Fix botches in last IP Filter update that broke the LKM. From
Matthias Scheler, PR #3428.
1997-04-10 18:54:46 +00:00
thorpej f090be431e Use control device names provided by <netinet/ip_fil.h> 1997-03-29 19:51:45 +00:00
thorpej 85a327bb3b Make this compile again in light of recent changes:
- adjust for new ipl_attach()/ipl_detach() names.
	- In ipl_load(), so not implicitly call ipl_attach(), since
	  doing so would be inconsistent with the behavior exhibited
	  by the statically-configured version.
1997-03-29 03:03:08 +00:00
thorpej 99f4b72f6c Resolve conflicts from merge.
XXX doesn't compile yet, but that will require some other changes, which
XXX I want to make separately.
1997-03-29 01:42:33 +00:00
darrenr fe3bc025d0 Bring in entire 3.2alpha2 source tree 1997-03-27 15:13:58 +00:00
thorpej bf13067994 Give the entry point of this LKM a sane name, as suggested by
Matthias Scheler <tron@lyssa.owl.de> in PR #3140.
1997-02-21 21:11:16 +00:00
mrg b5f7cf1c76 if we fail to attach, abort before attaching the hook, not after. 1997-01-12 06:06:03 +00:00
veego d61e3f8c25 ipl[attach|detach]->ipfilter[attach|detach] for the pseudo-device change 1997-01-08 21:45:39 +00:00
mrg f9eeb3865a oops; forgot these. 1997-01-07 10:47:35 +00:00
mrg 85f84f08cd initial import of darren reed's ip-filter, version 3.1.2. 1997-01-05 13:26:10 +00:00