veego
8db28cd918
Resolve conflicts and fix a compile error in ip_ftp_pxy.c.
2000-05-11 19:46:05 +00:00
veego
21dea2100c
Resolve conflicts.
2000-05-03 11:12:03 +00:00
augustss
8529438fe6
Remove register declarations.
2000-03-30 12:51:13 +00:00
veego
64b2c34646
Resolve conflicts and small fixes.
1999-12-12 11:11:15 +00:00
bouyer
4f806e660f
Fix for kern/7831 from Darren Reed after discussion on tech-net 2 weeks ago:
...
check that the packet if of the rigth protocol before giving it to the
proxy module, otherwise let the ipnat code handle it.
What happens in kern/7831 is that a router sends back a icmp message for
a TCP SYN, and ip_proxy.c forwards it to ip_ftp_pxy.c which can only
handle TCP packets. The icmp message is properly handled by ipnat, no need to
go to ip_ftp_pxy.c.
1999-08-24 16:10:35 +00:00
cjs
8befad84b1
Remove SCCS markers and make these compile in $NetBSD$ IDs.
1999-02-02 19:57:30 +00:00
mycroft
b790730226
Fix problems with fr_tcpsum() that prevented the FTP proxy from working.
1999-01-23 08:50:52 +00:00
mrg
78db9d7d95
merge ipf 3.2.10
1998-11-22 15:17:18 +00:00
veego
97ab1bd53b
Resolve conflicts from the import.
1998-07-12 15:23:59 +00:00
veego
630030601c
Fix some compiler warnings: Missing prototype and ()'s.
1998-05-29 20:27:18 +00:00
veego
a4c89e3e2e
Resolve conflicts from the import of IPFilter 3.2.7.
1998-05-29 20:24:36 +00:00
veego
82423e3d01
Resolve conflicts
1998-05-17 16:50:15 +00:00
darrenr
9fd3093f39
don't free pointer to static struct. please pullup.
1997-11-28 00:46:39 +00:00
mrg
2a9598ccdf
fixes for memory leaks in proxying, and byte ordering problems. from darren reed.
1997-11-25 03:14:11 +00:00
mrg
84ecff38c2
merge ip-filter 3.2.1
1997-11-14 12:40:06 +00:00
mrg
60c28e1f95
sigh. merge ipfilter 3.2 onto the trunk. merge to the branch was a mistake.
1997-10-30 16:08:54 +00:00
veego
4508fb4354
Resolve conflicts from the merge of ipf 3.2beta5.
1997-09-21 18:00:54 +00:00
thorpej
b19b36aff5
Restore original RCS IDs.
1997-07-06 05:29:13 +00:00
darrenr
729f0dc597
fix conflicts from import
1997-07-05 05:38:14 +00:00
thorpej
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
thorpej
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
darrenr
27be4b8f04
Import new sources for 3.2alpha7
...
(blah, someone want to clean away /cvsroot/sys/netinet ?)
1997-05-26 15:18:15 +00:00
