Darren Reed
f590526d0a
fix conflicts
2001-02-04 14:26:56 +00:00
Darren Reed
0c72e2855d
Fix conflicts creted by import.
2000-10-29 07:53:05 +00:00
Darren Reed
60b88d9681
fix conflicts from rcsids
2000-10-26 12:33:42 +00:00
Ruslan Ermilov
8829f4ee0b
We now keep the ip_id field in network byte order all the
...
time, so there is no need to make the distinction between
ip_output() and ip_input() cases.
Reviewed by: silence on freebsd-net
2000-10-25 10:56:41 +00:00
Darren Reed
5e90b39cba
resolve conflicts
2000-08-13 04:31:06 +00:00
Darren Reed
72130853fb
fix conflicts
2000-07-19 14:02:09 +00:00
Darren Reed
6de9811ef7
define CSUM_DELAY_DATA to match merge
2000-05-26 07:28:03 +00:00
Darren Reed
6e067727a7
fix up conflicts
2000-05-24 04:40:17 +00:00
Darren Reed
fe646be69a
fix conflicts
2000-05-24 03:17:16 +00:00
Jonathan Lemon
1c23847582
Compute the checksum before handing the packet off to IPFilter.
...
Tested by: Cy Schubert <Cy.Schubert@uumail.gov.bc.ca>
2000-05-21 21:26:06 +00:00
Darren Reed
68b16578ca
Fix bug in dealing with "hlen == 1 and opt > 1"
2000-05-09 23:35:24 +00:00
Paul Saab
88c7d46bdc
Add missing include machine/in_cksum.h.
...
Submitted by: n_hibma
2000-05-09 16:56:51 +00:00
Peter Wemm
365c5db0a7
Add $FreeBSD$
2000-05-01 20:32:07 +00:00
Guido van Rooij
6cd756a2b5
Bring over ipfilter v3_3_8 kernel sources, including merging the
...
local modifications.
Also fix initializing fr_running in KLD case.
Rename ipl_inited to fr_runninhg in mlfk_ipl
Approved by: jkh
2000-02-09 20:56:36 +00:00
Guido van Rooij
0f9f7e9f23
Bring over ipfilter kernel sources, including merging the local modifications.
2000-01-13 19:01:33 +00:00
Eivind Eklund
3418fe8734
KERNEL -> _KERNEL
2000-01-05 16:25:20 +00:00
Guido van Rooij
9cc86ee930
Add kernel parts of revived ipfilter (3.3.3.)
1999-11-23 21:44:59 +00:00
Peter Wemm
088f7c5d38
Nuke the old antique copy of ipfilter from the tree. This is old enough
...
to be dangerous. It will better serve us as a port building a KLD,
ala SKIP.
The hooks are staying although it would be better to port and use
the NetBSD pfil interface rather than have custom hooks.
1999-10-10 15:09:59 +00:00
Peter Wemm
c3aac50f28
$Id$ -> $FreeBSD$
1999-08-28 01:08:13 +00:00
Eivind Eklund
29be051d68
Staticize some more.
1998-11-26 18:54:52 +00:00
Peter Wemm
6054307b92
Merge ipfilter 3.2.3 -> 3.2.7 changes onto mainline.
1998-06-20 18:37:51 +00:00
Peter Wemm
1ee25934a9
Make this compile.. There are some unpleasing hacks in here.
...
A major unifdef session is sorely tempting but would destroy any remaining
chance of tracking the original sources.
1998-03-21 11:34:28 +00:00
Peter Wemm
27064bb159
Import kernel parts of ipfilter v3.2.3
1998-03-21 10:11:54 +00:00
Peter Wemm
52aef1787c
Import kernel parts of ipfilter-3.2.1
1997-11-16 05:55:52 +00:00
Darren Reed
e10102a12a
Import version 3.2alpha7
1997-05-25 15:50:46 +00:00
Darren Reed
1fddb84ad6
Really import sys/netinet changes for IP Filter 3.2alpha4 this time.
1997-04-03 10:39:35 +00:00
Peter Wemm
413e00145c
Import ipfilter 3.1.8 kernel components
1997-03-02 15:50:35 +00:00
Peter Wemm
3589f3628a
Replacement import of ipfilter 3.1.7 components used in kernel.
...
(This is to repair the vendor branching)
1997-03-02 15:49:41 +00:00
