diff options
author | Colin Watson <cjwatson@debian.org> | 2011-01-24 11:46:57 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2011-01-24 11:46:57 +0000 |
commit | 0970072c89b079b022538e3c366fbfa2c53fc821 (patch) | |
tree | b7024712d74234bb5a8b036ccbc9109e2e211296 /readconf.h | |
parent | 4e8aa4da57000c7bba8e5c49163bc0c0ca383f78 (diff) | |
parent | 478ff799463ca926a8dfbabf058f4e84aaffc65a (diff) |
merge 5.7p1
Diffstat (limited to 'readconf.h')
-rw-r--r-- | readconf.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/readconf.h b/readconf.h index bb3ff0481..3e5435576 100644 --- a/readconf.h +++ b/readconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.h,v 1.86 2010/07/19 09:15:12 djm Exp $ */ | 1 | /* $OpenBSD: readconf.h,v 1.88 2010/11/13 23:27:50 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -64,6 +64,8 @@ typedef struct { | |||
64 | int compression_level; /* Compression level 1 (fast) to 9 | 64 | int compression_level; /* Compression level 1 (fast) to 9 |
65 | * (best). */ | 65 | * (best). */ |
66 | int tcp_keep_alive; /* Set SO_KEEPALIVE. */ | 66 | int tcp_keep_alive; /* Set SO_KEEPALIVE. */ |
67 | int ip_qos_interactive; /* IP ToS/DSCP/class for interactive */ | ||
68 | int ip_qos_bulk; /* IP ToS/DSCP/class for bulk traffic */ | ||
67 | LogLevel log_level; /* Level for logging. */ | 69 | LogLevel log_level; /* Level for logging. */ |
68 | 70 | ||
69 | int port; /* Port to connect. */ | 71 | int port; /* Port to connect. */ |
@@ -78,6 +80,7 @@ typedef struct { | |||
78 | char *ciphers; /* SSH2 ciphers in order of preference. */ | 80 | char *ciphers; /* SSH2 ciphers in order of preference. */ |
79 | char *macs; /* SSH2 macs in order of preference. */ | 81 | char *macs; /* SSH2 macs in order of preference. */ |
80 | char *hostkeyalgorithms; /* SSH2 server key types in order of preference. */ | 82 | char *hostkeyalgorithms; /* SSH2 server key types in order of preference. */ |
83 | char *kex_algorithms; /* SSH2 kex methods in order of preference. */ | ||
81 | int protocol; /* Protocol in order of preference. */ | 84 | int protocol; /* Protocol in order of preference. */ |
82 | char *hostname; /* Real host to connect. */ | 85 | char *hostname; /* Real host to connect. */ |
83 | char *host_key_alias; /* hostname alias for .ssh/known_hosts */ | 86 | char *host_key_alias; /* hostname alias for .ssh/known_hosts */ |