8db28cd918
Resolve conflicts and fix a compile error in ip_ftp_pxy.c.
2000-05-11 19:46:05 +00:00
21dea2100c
Resolve conflicts.
2000-05-03 11:12:03 +00:00
64b2c34646
Resolve conflicts and small fixes.
1999-12-12 11:11:15 +00:00
78db9d7d95
merge ipf 3.2.10
1998-11-22 15:17:18 +00:00
82423e3d01
Resolve conflicts
1998-05-17 16:50:15 +00:00
f73530ba55
add/cleanup multiple inclusion protection.
1998-02-10 01:26:19 +00:00
2a9598ccdf
fixes for memory leaks in proxying, and byte ordering problems. from darren reed.
1997-11-25 03:14:11 +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
a464ced388
Change the aps_tout member of struct ap_session from time_t to u_long
...
so that it can be passed to the filter rule aging functions, which
expect a pointer to a u_long. (time_t is an int on the alpha.)
1997-05-28 04:59:34 +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
faeb45fcca
Make this compile on 32-bit architectures:
...
- Add prototypes.
- Add a forward-decl to avoid a cyclic dependency graph.
1997-05-27 01:23:50 +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