summaryrefslogtreecommitdiff
path: root/sys/netinet/ip_proxy.h
AgeCommit message (Expand)Author
2000-05-11Resolve conflicts and fix a compile error in ip_ftp_pxy.c.veego
2000-05-03Resolve conflicts.veego
1999-12-12Resolve conflicts and small fixes.veego
1998-11-22merge ipf 3.2.10mrg
1998-05-17Resolve conflictsveego
1998-02-10add/cleanup multiple inclusion protection.perry
1997-11-25fixes for memory leaks in proxying, and byte ordering problems. from darren ...mrg
1997-10-30sigh. merge ipfilter 3.2 onto the trunk. merge to the branch was a mistake.mrg
1997-09-21Resolve conflicts from the merge of ipf 3.2beta5.veego
1997-07-06Restore original RCS IDs.thorpej
1997-07-05fix conflicts from importdarrenr
1997-05-28Change the aps_tout member of struct ap_session from time_t to u_longthorpej
1997-05-28Resolve conflicts from merge of 3.2a7, take 2. Also, eliminate somethorpej
1997-05-27Make this compile on 32-bit architectures:thorpej
1997-05-26Import new sources for 3.2alpha7darrenr