82423e3d01
Resolve conflicts
1998-05-17 16:50:15 +00:00
9fd3093f39
don't free pointer to static struct. please pullup.
1997-11-28 00:46:39 +00:00
2a9598ccdf
fixes for memory leaks in proxying, and byte ordering problems. from darren reed.
1997-11-25 03:14:11 +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
b19b36aff5
Restore original RCS IDs.
1997-07-06 05:29:13 +00:00
729f0dc597
fix conflicts from import
1997-07-05 05:38:14 +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
03e37a1874
Make this compile on 32-bit architectures:
...
- Deal with lame gcc -Wuninitialized warning (which is incorrect)
- Add parens around assignments within conditionals.
1997-05-27 01:22:52 +00:00
27be4b8f04
Import new sources for 3.2alpha7
...
(blah, someone want to clean away /cvsroot/sys/netinet ?)
1997-05-26 15:18:15 +00:00
veego