8db28cd918
Resolve conflicts and fix a compile error in ip_ftp_pxy.c.
2000-05-11 19:46:05 +00:00
4a12628c71
correct out-of-bound access when hlen == 1 and opt > 1.
...
reviewed by darren, darren committed to freebsd fil.c (1.12 -> 1.13)
so it should be correct enough.
2000-05-10 00:08:03 +00:00
21dea2100c
Resolve conflicts.
2000-05-03 11:12:03 +00:00
8529438fe6
Remove register declarations.
2000-03-30 12:51:13 +00:00
b3bffdf856
Resolve conflicts.
2000-02-01 21:29:15 +00:00
64b2c34646
Resolve conflicts and small fixes.
1999-12-12 11:11:15 +00:00
8befad84b1
Remove SCCS markers and make these compile in $NetBSD$ IDs.
1999-02-02 19:57:30 +00:00
b790730226
Fix problems with fr_tcpsum() that prevented the FTP proxy from working.
1999-01-23 08:50:52 +00:00
a94214bdd0
add a patch from darren reed, to make ipfilter use our cksum routine.
1998-11-26 12:21:47 +00:00
78db9d7d95
merge ipf 3.2.10
1998-11-22 15:17:18 +00:00
97ab1bd53b
Resolve conflicts from the import.
1998-07-12 15:23:59 +00:00
dd8ed56342
Another demonstration that when you're converting variables from 'long's
...
to fixed 32-bit integers, you have to exercise care.
1998-05-31 19:39:13 +00:00
a4c89e3e2e
Resolve conflicts from the import of IPFilter 3.2.7.
1998-05-29 20:24:36 +00:00
82423e3d01
Resolve conflicts
1998-05-17 16:50:15 +00:00
77af553e79
If packets are passed through IP Filter at all, don't allow fast-forward
...
flow entries to be created for them.
Eventually, IP Filter should be extended to allow IP src/dst pairs to
be specified as "fast forward OK".
1998-05-01 03:28:14 +00:00
fc911d1529
fix checksum problems (from marc boucher via darren reed).
1997-11-17 14:33:46 +00:00
84ecff38c2
merge ip-filter 3.2.1
1997-11-14 12:40:06 +00:00
60c28e1f95
sigh. merge ipfilter 3.2 onto the trunk. merge to the branch was a mistake.
1997-10-30 16:08:54 +00:00
4508fb4354
Resolve conflicts from the merge of ipf 3.2beta5.
1997-09-21 18:00:54 +00:00
02e5531ec7
put back IPFILTER_DEFAULT_BLOCK, as documented in options(4).
1997-07-08 05:54:02 +00:00
b19b36aff5
Restore original RCS IDs.
1997-07-06 05:29:13 +00:00
ab01c534f6
Fix a bug caught by gcc: add parenthesis to properly group a test.
1997-07-06 05:10:41 +00:00
729f0dc597
fix conflicts from import
1997-07-05 05:38:14 +00:00
c258d0d05e
make it "options IPFILTER_DEFAULT_BLOCK".
1997-06-16 13:38:05 +00:00
41d4822677
Resolve conflicts from merge of 3.2a7, take 2. Also, eliminate some
...
silly differences between the NetBSD copy of the code and the
vendor branch, keeping only those which are necessary. Of those
differences that currently exist, several "portability to NetBSD"
issues, which will be fed back to the ipfilter author.
1997-05-28 00:17:11 +00:00
8ead9b88e8
Make this compile on 32-bit architectures again:
...
- garbage-collect unused variables, or #ifdef them as appropriate.
1997-05-27 01:09:13 +00:00
29fab67628
fix conflicts
1997-05-25 12:40:11 +00:00
4d1eb7820e
use IPLLOG instead of ipllog to easily mask parameters, fix up prototype
...
problems for compiling to user programs.
1997-03-29 04:39:15 +00:00
f30d8f327f
Resolve conflicts from merge.
...
XXX !!! XXX !!!
I noticed a few semi-serious bugs while doing this merge, one of which
has existed for a fairly long time. Some of them are addressed in this
commit (because they caused the kernel to not compile), and are annoted
by "XXX" and "--thorpej". The other one will be addressed shortly in
a future commit, and, as far as I can tell, affects all operating systems
which IP Filter supports.
1997-03-29 00:54:55 +00:00
54b157939d
Don't include ipfilter.h if building an LKM.
1997-02-19 23:07:57 +00:00
4c8bfe2630
pseudo-device ipfilter brings in PFIL_HOOKS.
1997-02-18 20:49:32 +00:00
47517abd07
Add $NetBSD$ id's and restore the orginal Id's.
1997-01-05 21:32:14 +00:00
c1067a3f4b
initial import of darren reed's ip-filter, version 3.1.2.
1997-01-05 13:47:59 +00:00
veego