![[BACK]](/icons/back.gif){kind=icon}
Up to [local] / src / usr.sbin / ftp-proxy
Request diff between arbitrary revisions
Default branch: MAIN
Revision 1.21 / (download) - annotate - [select for diffs], Wed Jan 21 21:50:33 2015 UTC (9 years, 4 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE,
OPENBSD_7_5,
OPENBSD_7_4_BASE,
OPENBSD_7_4,
OPENBSD_7_3_BASE,
OPENBSD_7_3,
OPENBSD_7_2_BASE,
OPENBSD_7_2,
OPENBSD_7_1_BASE,
OPENBSD_7_1,
OPENBSD_7_0_BASE,
OPENBSD_7_0,
OPENBSD_6_9_BASE,
OPENBSD_6_9,
OPENBSD_6_8_BASE,
OPENBSD_6_8,
OPENBSD_6_7_BASE,
OPENBSD_6_7,
OPENBSD_6_6_BASE,
OPENBSD_6_6,
OPENBSD_6_5_BASE,
OPENBSD_6_5,
OPENBSD_6_4_BASE,
OPENBSD_6_4,
OPENBSD_6_3_BASE,
OPENBSD_6_3,
OPENBSD_6_2_BASE,
OPENBSD_6_2,
OPENBSD_6_1_BASE,
OPENBSD_6_1,
OPENBSD_6_0_BASE,
OPENBSD_6_0,
OPENBSD_5_9_BASE,
OPENBSD_5_9,
OPENBSD_5_8_BASE,
OPENBSD_5_8,
OPENBSD_5_7_BASE,
OPENBSD_5_7,
HEAD
Changes since 1.20: +3 -3 lines
Diff to previous 1.20 (colored)
Include <netinet/in.h> before <net/pfvar.h>. In a future change when ports is ready, <net/pfvar.h> will stop including a pile of balony.
Revision 1.20 / (download) - annotate - [select for diffs], Tue Sep 18 10:11:53 2012 UTC (11 years, 8 months ago) by henning
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE,
OPENBSD_5_6,
OPENBSD_5_5_BASE,
OPENBSD_5_5,
OPENBSD_5_4_BASE,
OPENBSD_5_4,
OPENBSD_5_3_BASE,
OPENBSD_5_3
Changes since 1.19: +1 -2 lines
Diff to previous 1.19 (colored)
prio 0 is valid, therefore, I chose an "impossible" value for prio meaning "not set" and used a PF_PRIO_NOTSET define for it. now that means that everything that creates a struct pf_rule doesn't get away with bzero'ing it, which turned out to be not so nice. so get rid of PF_PRIO_NOTSET, instead, make a rule+state flag PFSTATE_SETPRIO which indicates wether the prio should be set. ok benno claudio mikeb
Revision 1.19 / (download) - annotate - [select for diffs], Sat Jul 7 16:24:32 2012 UTC (11 years, 10 months ago) by henning
Branch: MAIN
CVS Tags: OPENBSD_5_2_BASE,
OPENBSD_5_2
Changes since 1.18: +1 -1 lines
Diff to previous 1.18 (colored)
rename prio in struct pf_rule and related structs to set_prio so it is utterly clear this is not a filter criteria but a packet modification thing. also preparation for upcoming changes, including one to unscrew this mess (I should not have to touch half the tree for this - ifixitlater) not user visible, ok gcc
Revision 1.18 / (download) - annotate - [select for diffs], Mon Apr 30 13:53:01 2012 UTC (12 years, 1 month ago) by haesbaert
Branch: MAIN
Changes since 1.17: +2 -2 lines
Diff to previous 1.17 (colored)
Check for nat_range_high before creating the PF nat rule. From Lawrence Teo. ok camield, myself, mikeb.
Revision 1.17 / (download) - annotate - [select for diffs], Tue Mar 6 12:50:20 2012 UTC (12 years, 2 months ago) by mikeb
Branch: MAIN
Changes since 1.16: +4 -3 lines
Diff to previous 1.16 (colored)
catch up with "on rdomain" changes; ok claudio
Revision 1.16 / (download) - annotate - [select for diffs], Wed Jun 22 08:44:02 2011 UTC (12 years, 11 months ago) by sthen
Branch: MAIN
CVS Tags: OPENBSD_5_1_BASE,
OPENBSD_5_1,
OPENBSD_5_0_BASE,
OPENBSD_5_0
Changes since 1.15: +5 -5 lines
Diff to previous 1.15 (colored)
fix whitespace
Revision 1.15 / (download) - annotate - [select for diffs], Thu Apr 28 00:17:28 2011 UTC (13 years, 1 month ago) by mikeb
Branch: MAIN
Changes since 1.14: +1 -81 lines
Diff to previous 1.14 (colored)
switch ftp-proxy over to divert-to instead of rdr-to. this avoids an expensive state lookup (via natlook ioctl) and shrinks the code. tested by me and sthen, ok reyk sthen
Revision 1.14 / (download) - annotate - [select for diffs], Fri Mar 25 14:51:31 2011 UTC (13 years, 2 months ago) by claudio
Branch: MAIN
Changes since 1.13: +20 -12 lines
Diff to previous 1.13 (colored)
Use the rdomain information returned by DIOCNATLOOK to install the nat-to and rdr-to rules with correct rtable rule attributes. This allows to use ftp-proxy to proxy accross rdomains. Tested and OK phessler@, OK henning@
Revision 1.13 / (download) - annotate - [select for diffs], Wed Jan 13 01:07:34 2010 UTC (14 years, 4 months ago) by claudio
Branch: MAIN
CVS Tags: OPENBSD_4_9_BASE,
OPENBSD_4_9,
OPENBSD_4_8_BASE,
OPENBSD_4_8,
OPENBSD_4_7_BASE,
OPENBSD_4_7
Changes since 1.12: +4 -1 lines
Diff to previous 1.12 (colored)
pfr.rule.*.addr.type must be initialized to PF_ADDR_NONE for things that are not used. bzero() of the rule structure is not enough. Find with dlg@, OK mcbride@
Revision 1.12 / (download) - annotate - [select for diffs], Tue Jan 12 03:20:51 2010 UTC (14 years, 4 months ago) by mcbride
Branch: MAIN
Changes since 1.11: +10 -18 lines
Diff to previous 1.11 (colored)
First pass at removing the 'pf_pool' mechanism for translation and routing actions. Allow interfaces to be specified in special table entries for the routing actions. Lists of addresses can now only be done using tables, which pfctl will generate automatically from the existing syntax. Functionally, this deprecates the use of multiple tables or dynamic interfaces in a single nat or rdr rule. ok henning dlg claudio
Revision 1.11 / (download) - annotate - [select for diffs], Sun Nov 22 23:30:05 2009 UTC (14 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.10: +6 -6 lines
Diff to previous 1.10 (colored)
Move from the PF_RULESET_FILTER world order to PF_TRANS_RULESET due to the standard henning+oga commit-and-run-for-beer problem. ok claudio
Revision 1.10 / (download) - annotate - [select for diffs], Sat Nov 21 13:59:31 2009 UTC (14 years, 6 months ago) by claudio
Branch: MAIN
Changes since 1.9: +5 -2 lines
Diff to previous 1.9 (colored)
If tagging is used use match rules instead of pass rules. This is needed so that later pass rules will not overwrite the nat-to/rdr-to settings. Because of this there must be an expilicit "pass .. tagged proxytag .." rule after the ftp-proxy anchor. OK henning@
Revision 1.9 / (download) - annotate - [select for diffs], Tue Sep 1 13:46:14 2009 UTC (14 years, 9 months ago) by claudio
Branch: MAIN
Changes since 1.8: +48 -114 lines
Diff to previous 1.8 (colored)
Bring ftp-proxy in sync with the massive pf change just commited by Henning. This changes the way the rdr/nat rules are added to pf. Now only a single anchor is needed (the other ones do no longer exist). To convert your ruleset you need something like this at the start of your ruleset: # filter rules and anchors for ftp-proxy(8) anchor "ftp-proxy/*" pass in quick proto tcp to port ftp rdr-to 127.0.0.1 port 8021 This was tested by myself, sthen@, dlg@ and I think many more. OK by the same people plus henning.
Revision 1.8 / (download) - annotate - [select for diffs], Fri Jun 13 07:25:26 2008 UTC (15 years, 11 months ago) by claudio
Branch: MAIN
CVS Tags: OPENBSD_4_6_BASE,
OPENBSD_4_6,
OPENBSD_4_5_BASE,
OPENBSD_4_5,
OPENBSD_4_4_BASE,
OPENBSD_4_4
Changes since 1.7: +2 -2 lines
Diff to previous 1.7 (colored)
Better error messages. Include the function causing the problem and do not include the program name in logmsg() plus exit_daemon() does not return so make it a void function. OK mpf@
Revision 1.7 / (download) - annotate - [select for diffs], Tue Feb 26 18:52:53 2008 UTC (16 years, 3 months ago) by henning
Branch: MAIN
CVS Tags: OPENBSD_4_3_BASE,
OPENBSD_4_3
Changes since 1.6: +8 -5 lines
Diff to previous 1.6 (colored)
Don't pass quick when tagging, so the tag can be used outside the ftp-proxy anchor. Exotic setups with route-to etc. can be implemented this way. from camield, ok reyk beck canacar and manpage polished by jmc
Revision 1.6 / (download) - annotate - [select for diffs], Wed Aug 1 09:31:41 2007 UTC (16 years, 10 months ago) by henning
Branch: MAIN
CVS Tags: OPENBSD_4_2_BASE,
OPENBSD_4_2
Changes since 1.5: +6 -3 lines
Diff to previous 1.5 (colored)
allow ftp-proxy to add tag statements to teh rules it inserts clever, nice and easy diff from bsd@openbsd.rutgers.edu, ok pyr reyk
Revision 1.5 / (download) - annotate - [select for diffs], Fri Dec 1 07:31:21 2006 UTC (17 years, 6 months ago) by camield
Branch: MAIN
CVS Tags: OPENBSD_4_1_BASE,
OPENBSD_4_1
Changes since 1.4: +2 -2 lines
Diff to previous 1.4 (colored)
forgot to update the comment as well
Revision 1.4 / (download) - annotate - [select for diffs], Fri Dec 1 07:25:41 2006 UTC (17 years, 6 months ago) by camield
Branch: MAIN
Changes since 1.3: +2 -2 lines
Diff to previous 1.3 (colored)
use flags S/SA for consistency with the rest of pf
Revision 1.3 / (download) - annotate - [select for diffs], Tue Jun 7 14:12:07 2005 UTC (18 years, 11 months ago) by camield
Branch: MAIN
CVS Tags: OPENBSD_4_0_BASE,
OPENBSD_4_0,
OPENBSD_3_9_BASE,
OPENBSD_3_9,
OPENBSD_3_8_BASE,
OPENBSD_3_8
Changes since 1.2: +2 -0 lines
Diff to previous 1.2 (colored)
add OpenBSD cvs tags, prompted by xsa@
Revision 1.2 / (download) - annotate - [select for diffs], Tue Jun 7 04:37:32 2005 UTC (18 years, 11 months ago) by camield
Branch: MAIN
Changes since 1.1: +9 -4 lines
Diff to previous 1.1 (colored)
Introduce verbose option to control the logging of the pf rules. ok beck mpf
Revision 1.1 / (download) - annotate - [select for diffs], Thu May 26 04:38:35 2005 UTC (19 years ago) by camield
Branch: MAIN
Import new FTP proxy. Handles IPv6 and all FTP modes. It was previously known as pftpx. Not connected to the builds yet. ok beck