Guido van Rooij
|
4160f4c64e
|
Resolve conflicts
MFC after: 2 weeks
|
2006-08-16 12:06:35 +00:00 |
|
Guido van Rooij
|
ecdad7e688
|
Add mcopywrap prototype to ip_compat.h
Remove h323 proxy from ip_proxy (copyright issue)
|
2005-12-30 11:55:37 +00:00 |
|
Guido van Rooij
|
9088f4e67b
|
Resolve conflicts
|
2005-12-30 11:32:23 +00:00 |
|
Darren Reed
|
caec4e7746
|
The current H.323 proxy source has a license that isn't suitable for inclusion
with FreeBSD so we shouldn't be trying to include it here.
|
2005-04-27 05:53:12 +00:00 |
|
Darren Reed
|
6eab6ed50f
|
Merge the changes from 3.4.35 to 4.1.8 into the kernel source tree
|
2005-04-25 18:43:14 +00:00 |
|
Darren Reed
|
77bb8ca4a3
|
Enable fine grained locking within IPFilter, using mtx(9) and sx(9) allowing
the the "needs giant" flag to be removed from the driver.
|
2004-12-24 09:14:26 +00:00 |
|
Darren Reed
|
aeb497128e
|
Commit import changed from vendor branch of ipfilter to -current head
|
2003-02-15 06:25:25 +00:00 |
|
Alfred Perlstein
|
8deebb0160
|
Consolidate MIN/MAX macros into one place (param.h).
Submitted by: Hiten Pandya <hiten@unixdaemons.com>
|
2003-02-02 13:17:30 +00:00 |
|
Darren Reed
|
ecae20848a
|
Finally merge in the changes from ipfilter 3.4.29 to freebsd-current.
Main changes here are related to the ftp proxy and making that work better.
|
2002-08-28 13:41:36 +00:00 |
|
Darren Reed
|
fde76f025d
|
Commit changes that happened in IPFilter versions 3.4.27 - 3.4.28
|
2002-06-07 08:56:30 +00:00 |
|
Darren Reed
|
7df187a3ad
|
Merge updates from 3.4.26 - 3.4.27.
|
2002-04-27 16:56:25 +00:00 |
|
Ruslan Ermilov
|
f791219e02
|
We don't need ip_ipsec_pxy.c in userland.
|
2002-03-26 13:42:09 +00:00 |
|
Darren Reed
|
40c407243f
|
do not include the missing ip_h323_pxy.c
|
2002-03-19 15:14:18 +00:00 |
|
Darren Reed
|
b38f3fb061
|
fix conflicts (mostly damn rcs id's) generated by import
|
2002-03-19 11:44:16 +00:00 |
|
Alfred Perlstein
|
20125be8b1
|
Backout inclusion of queue.h since rev 1.38 sys/file.h now has it
included in the right order.
|
2002-01-14 09:07:15 +00:00 |
|
Alfred Perlstein
|
9e209b124a
|
Include sys/_lock.h and sys/_mutex.h to reduce namespace pollution.
Requested by: jhb
|
2002-01-13 21:37:49 +00:00 |
|
Darren Reed
|
354699e12f
|
fix conflicts created by import
|
2001-07-28 11:58:26 +00:00 |
|
Jonathan Lemon
|
0a52f59c36
|
Move IPFilter into contrib.
|
2001-06-07 05:13:35 +00:00 |
|