diff options
author | Damien Miller <djm@mindrot.org> | 2010-09-24 22:15:11 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-09-24 22:15:11 +1000 |
commit | 65e42f87fe945a2bf30d7e02358554dbaefa8a4c (patch) | |
tree | 102c10a0b5328a40c79dca19d208f0ca0c1671b5 /sftp.1 | |
parent | 7fe2b1fec3b364faf952828f3875b8e7eed8feb4 (diff) |
- djm@cvs.openbsd.org 2010/09/22 22:58:51
[atomicio.c atomicio.h misc.c misc.h scp.c sftp-client.c]
[sftp-client.h sftp.1 sftp.c]
add an option per-read/write callback to atomicio
factor out bandwidth limiting code from scp(1) into a generic bandwidth
limiter that can be attached using the atomicio callback mechanism
add a bandwidth limit option to sftp(1) using the above
"very nice" markus@
Diffstat (limited to 'sftp.1')
-rw-r--r-- | sftp.1 | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: sftp.1,v 1.84 2010/09/19 21:30:05 jmc Exp $ | 1 | .\" $OpenBSD: sftp.1,v 1.85 2010/09/22 22:58:51 djm Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. | 3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. |
4 | .\" | 4 | .\" |
@@ -22,7 +22,7 @@ | |||
22 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 22 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
23 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 | .\" | 24 | .\" |
25 | .Dd $Mdocdate: September 19 2010 $ | 25 | .Dd $Mdocdate: September 22 2010 $ |
26 | .Dt SFTP 1 | 26 | .Dt SFTP 1 |
27 | .Os | 27 | .Os |
28 | .Sh NAME | 28 | .Sh NAME |
@@ -38,6 +38,7 @@ | |||
38 | .Op Fl D Ar sftp_server_path | 38 | .Op Fl D Ar sftp_server_path |
39 | .Op Fl F Ar ssh_config | 39 | .Op Fl F Ar ssh_config |
40 | .Op Fl i Ar identity_file | 40 | .Op Fl i Ar identity_file |
41 | .Op Fl l Ar limit | ||
41 | .Op Fl o Ar ssh_option | 42 | .Op Fl o Ar ssh_option |
42 | .Op Fl P Ar port | 43 | .Op Fl P Ar port |
43 | .Op Fl R Ar num_requests | 44 | .Op Fl R Ar num_requests |
@@ -159,6 +160,8 @@ Selects the file from which the identity (private key) for public key | |||
159 | authentication is read. | 160 | authentication is read. |
160 | This option is directly passed to | 161 | This option is directly passed to |
161 | .Xr ssh 1 . | 162 | .Xr ssh 1 . |
163 | .It Fl l Ar limit | ||
164 | Limits the used bandwidth, specified in Kbit/s. | ||
162 | .It Fl o Ar ssh_option | 165 | .It Fl o Ar ssh_option |
163 | Can be used to pass options to | 166 | Can be used to pass options to |
164 | .Nm ssh | 167 | .Nm ssh |