comparison runopts.h @ 1295:750ec4ec4cbe

Convert #ifdef to #if, other build changes
author Matt Johnston <matt@ucc.asn.au>
date Wed, 04 May 2016 15:33:40 +0200
parents a23386821e9f
children 3fdd8c5a0195 517c67cbcd31
comparison
equal deleted inserted replaced
1294:56aba7dedbea 1295:750ec4ec4cbe
31 #include "auth.h" 31 #include "auth.h"
32 #include "tcpfwd.h" 32 #include "tcpfwd.h"
33 33
34 typedef struct runopts { 34 typedef struct runopts {
35 35
36 #if defined(ENABLE_SVR_REMOTETCPFWD) || defined(ENABLE_CLI_LOCALTCPFWD) \ 36 #if DROPBEAR_SVR_REMOTETCPFWD || DROPBEAR_CLI_LOCALTCPFWD \
37 || defined(ENABLE_CLI_REMOTETCPFWD) 37 || DROPBEAR_CLI_REMOTETCPFWD
38 int listen_fwd_all; 38 int listen_fwd_all;
39 #endif 39 #endif
40 unsigned int recv_window; 40 unsigned int recv_window;
41 time_t keepalive_secs; /* Time between sending keepalives. 0 is off */ 41 time_t keepalive_secs; /* Time between sending keepalives. 0 is off */
42 time_t idle_timeout_secs; /* Exit if no traffic is sent/received in this time */ 42 time_t idle_timeout_secs; /* Exit if no traffic is sent/received in this time */
51 DROPBEAR_COMPRESS_ON, 51 DROPBEAR_COMPRESS_ON,
52 DROPBEAR_COMPRESS_OFF, 52 DROPBEAR_COMPRESS_OFF,
53 } compress_mode; 53 } compress_mode;
54 #endif 54 #endif
55 55
56 #ifdef ENABLE_USER_ALGO_LIST 56 #if DROPBEAR_USER_ALGO_LIST
57 char *cipher_list; 57 char *cipher_list;
58 char *mac_list; 58 char *mac_list;
59 #endif 59 #endif
60 60
61 } runopts; 61 } runopts;
95 95
96 int noauthpass; 96 int noauthpass;
97 int norootpass; 97 int norootpass;
98 int allowblankpass; 98 int allowblankpass;
99 99
100 #ifdef ENABLE_SVR_REMOTETCPFWD 100 #if DROPBEAR_SVR_REMOTETCPFWD
101 int noremotetcp; 101 int noremotetcp;
102 #endif 102 #endif
103 #ifdef ENABLE_SVR_LOCALTCPFWD 103 #if DROPBEAR_SVR_LOCALTCPFWD
104 int nolocaltcp; 104 int nolocaltcp;
105 #endif 105 #endif
106 106
107 sign_key *hostkey; 107 sign_key *hostkey;
108 108
137 int always_accept_key; 137 int always_accept_key;
138 int no_hostkey_check; 138 int no_hostkey_check;
139 int no_cmd; 139 int no_cmd;
140 int backgrounded; 140 int backgrounded;
141 int is_subsystem; 141 int is_subsystem;
142 #ifdef ENABLE_CLI_PUBKEY_AUTH 142 #if DROPBEAR_CLI_PUBKEY_AUTH
143 m_list *privkeys; /* Keys to use for public-key auth */ 143 m_list *privkeys; /* Keys to use for public-key auth */
144 #endif 144 #endif
145 #ifdef ENABLE_CLI_ANYTCPFWD 145 #if DROPBEAR_CLI_ANYTCPFWD
146 int exit_on_fwd_failure; 146 int exit_on_fwd_failure;
147 #endif 147 #endif
148 #ifdef ENABLE_CLI_REMOTETCPFWD 148 #if DROPBEAR_CLI_REMOTETCPFWD
149 m_list * remotefwds; 149 m_list * remotefwds;
150 #endif 150 #endif
151 #ifdef ENABLE_CLI_LOCALTCPFWD 151 #if DROPBEAR_CLI_LOCALTCPFWD
152 m_list * localfwds; 152 m_list * localfwds;
153 #endif 153 #endif
154 #ifdef ENABLE_CLI_AGENTFWD 154 #if DROPBEAR_CLI_AGENTFWD
155 int agent_fwd; 155 int agent_fwd;
156 int agent_keys_loaded; /* whether pubkeys has been populated with a 156 int agent_keys_loaded; /* whether pubkeys has been populated with a
157 list of keys held by the agent */ 157 list of keys held by the agent */
158 int agent_fd; /* The agent fd is only set during authentication. Forwarded 158 int agent_fd; /* The agent fd is only set during authentication. Forwarded
159 agent sessions have their own file descriptors */ 159 agent sessions have their own file descriptors */
160 #endif 160 #endif
161 161
162 #ifdef ENABLE_CLI_NETCAT 162 #if DROPBEAR_CLI_NETCAT
163 char *netcat_host; 163 char *netcat_host;
164 unsigned int netcat_port; 164 unsigned int netcat_port;
165 #endif 165 #endif
166 #ifdef ENABLE_CLI_PROXYCMD 166 #if DROPBEAR_CLI_PROXYCMD
167 char *proxycmd; 167 char *proxycmd;
168 #endif 168 #endif
169 } cli_runopts; 169 } cli_runopts;
170 170
171 extern cli_runopts cli_opts; 171 extern cli_runopts cli_opts;
172 void cli_getopts(int argc, char ** argv); 172 void cli_getopts(int argc, char ** argv);
173 173
174 #ifdef ENABLE_USER_ALGO_LIST 174 #if DROPBEAR_USER_ALGO_LIST
175 void parse_ciphers_macs(void); 175 void parse_ciphers_macs(void);
176 #endif 176 #endif
177 177
178 void print_version(void); 178 void print_version(void);
179 179