comparison runopts.h @ 641:2b1bb792cd4d dropbear-tfm

- Update tfm changes to current default tip
author Matt Johnston <matt@ucc.asn.au>
date Mon, 21 Nov 2011 19:52:28 +0800
parents f9b5dc0cba61
children 4edea9f363d0
comparison
equal deleted inserted replaced
640:76097ec1a29a 641:2b1bb792cd4d
35 35
36 #if defined(ENABLE_SVR_REMOTETCPFWD) || defined(ENABLE_CLI_LOCALTCPFWD) 36 #if defined(ENABLE_SVR_REMOTETCPFWD) || defined(ENABLE_CLI_LOCALTCPFWD)
37 int listen_fwd_all; 37 int listen_fwd_all;
38 #endif 38 #endif
39 unsigned int recv_window; 39 unsigned int recv_window;
40 unsigned int keepalive_secs; 40 time_t keepalive_secs;
41 unsigned int idle_timeout_secs; 41 time_t idle_timeout_secs;
42
43 #ifndef DISABLE_ZLIB
44 /* TODO: add a commandline flag. Currently this is on by default if compression
45 * is compiled in, but disabled for a client's non-final multihop stages. (The
46 * intermediate stages are compressed streams, so are uncompressible. */
47 int enable_compress;
48 #endif
49
42 50
43 } runopts; 51 } runopts;
44 52
45 extern runopts opts; 53 extern runopts opts;
46 54
110 int always_accept_key; 118 int always_accept_key;
111 int no_cmd; 119 int no_cmd;
112 int backgrounded; 120 int backgrounded;
113 int is_subsystem; 121 int is_subsystem;
114 #ifdef ENABLE_CLI_PUBKEY_AUTH 122 #ifdef ENABLE_CLI_PUBKEY_AUTH
115 struct SignKeyList *privkeys; /* Keys to use for public-key auth */ 123 m_list *privkeys; /* Keys to use for public-key auth */
116 #endif 124 #endif
117 #ifdef ENABLE_CLI_REMOTETCPFWD 125 #ifdef ENABLE_CLI_REMOTETCPFWD
118 struct TCPFwdList * remotefwds; 126 m_list * remotefwds;
119 #endif 127 #endif
120 #ifdef ENABLE_CLI_LOCALTCPFWD 128 #ifdef ENABLE_CLI_LOCALTCPFWD
121 struct TCPFwdList * localfwds; 129 m_list * localfwds;
130 #endif
131 #ifdef ENABLE_CLI_AGENTFWD
132 int agent_fwd;
133 int agent_keys_loaded; /* whether pubkeys has been populated with a
134 list of keys held by the agent */
135 int agent_fd; /* The agent fd is only set during authentication. Forwarded
136 agent sessions have their own file descriptors */
122 #endif 137 #endif
123 138
124 #ifdef ENABLE_CLI_NETCAT 139 #ifdef ENABLE_CLI_NETCAT
125 char *netcat_host; 140 char *netcat_host;
126 unsigned int netcat_port; 141 unsigned int netcat_port;
127 #endif 142 #endif
128 #ifdef ENABLE_CLI_PROXYCMD 143 #ifdef ENABLE_CLI_PROXYCMD
129 char *proxycmd; 144 char *proxycmd;
130 #endif 145 #endif
131
132 } cli_runopts; 146 } cli_runopts;
133 147
134 extern cli_runopts cli_opts; 148 extern cli_runopts cli_opts;
135 void cli_getopts(int argc, char ** argv); 149 void cli_getopts(int argc, char ** argv);
136 150