diff options
author | Colin Watson <cjwatson@debian.org> | 2013-09-14 23:42:11 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-09-14 23:42:11 +0100 |
commit | 327155e6824b3ee13837bdde04e4eb47e147ff46 (patch) | |
tree | 8f8743122403c7a2e6ed919156711fb1520c657f /channels.h | |
parent | 0334ce32304e9ba2a10ee5ca49ca6e8ff3ba6cf4 (diff) | |
parent | 74e339b8f8936bc0d985e053a076d0c9b5e9ea51 (diff) |
* New upstream release (http://www.openssh.com/txt/release-6.3).
- sftp(1): add support for resuming partial downloads using the "reget"
command and on the sftp commandline or on the "get" commandline using
the "-a" (append) option (closes: #158590).
- ssh(1): add an "IgnoreUnknown" configuration option to selectively
suppress errors arising from unknown configuration directives (closes:
#436052).
- sftp(1): update progressmeter when data is acknowledged, not when it's
sent (partially addresses #708372).
- ssh(1): do not fatally exit when attempting to cleanup multiplexing-
created channels that are incompletely opened (closes: #651357).
Diffstat (limited to 'channels.h')
-rw-r--r-- | channels.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/channels.h b/channels.h index d75b800f7..4fab9d7c4 100644 --- a/channels.h +++ b/channels.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.h,v 1.111 2012/04/11 13:16:19 djm Exp $ */ | 1 | /* $OpenBSD: channels.h,v 1.113 2013/06/07 15:37:52 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -55,7 +55,8 @@ | |||
55 | #define SSH_CHANNEL_ZOMBIE 14 /* Almost dead. */ | 55 | #define SSH_CHANNEL_ZOMBIE 14 /* Almost dead. */ |
56 | #define SSH_CHANNEL_MUX_LISTENER 15 /* Listener for mux conn. */ | 56 | #define SSH_CHANNEL_MUX_LISTENER 15 /* Listener for mux conn. */ |
57 | #define SSH_CHANNEL_MUX_CLIENT 16 /* Conn. to mux slave */ | 57 | #define SSH_CHANNEL_MUX_CLIENT 16 /* Conn. to mux slave */ |
58 | #define SSH_CHANNEL_MAX_TYPE 17 | 58 | #define SSH_CHANNEL_ABANDONED 17 /* Abandoned session, eg mux */ |
59 | #define SSH_CHANNEL_MAX_TYPE 18 | ||
59 | 60 | ||
60 | #define CHANNEL_CANCEL_PORT_STATIC -1 | 61 | #define CHANNEL_CANCEL_PORT_STATIC -1 |
61 | 62 | ||
@@ -102,7 +103,9 @@ struct Channel { | |||
102 | int sock; /* sock fd */ | 103 | int sock; /* sock fd */ |
103 | int ctl_chan; /* control channel (multiplexed connections) */ | 104 | int ctl_chan; /* control channel (multiplexed connections) */ |
104 | int isatty; /* rfd is a tty */ | 105 | int isatty; /* rfd is a tty */ |
106 | #ifdef _AIX | ||
105 | int wfd_isatty; /* wfd is a tty */ | 107 | int wfd_isatty; /* wfd is a tty */ |
108 | #endif | ||
106 | int client_tty; /* (client) TTY has been requested */ | 109 | int client_tty; /* (client) TTY has been requested */ |
107 | int force_drain; /* force close on iEOF */ | 110 | int force_drain; /* force close on iEOF */ |
108 | time_t notbefore; /* Pause IO until deadline (time_t) */ | 111 | time_t notbefore; /* Pause IO until deadline (time_t) */ |
@@ -110,7 +113,7 @@ struct Channel { | |||
110 | * channels are delayed until the first call | 113 | * channels are delayed until the first call |
111 | * to a matching pre-select handler. | 114 | * to a matching pre-select handler. |
112 | * this way post-select handlers are not | 115 | * this way post-select handlers are not |
113 | * accidenly called if a FD gets reused */ | 116 | * accidentally called if a FD gets reused */ |
114 | Buffer input; /* data read from socket, to be sent over | 117 | Buffer input; /* data read from socket, to be sent over |
115 | * encrypted connection */ | 118 | * encrypted connection */ |
116 | Buffer output; /* data received over encrypted connection for | 119 | Buffer output; /* data received over encrypted connection for |