- (tim) [kex.c myproposal.h md-sha256.c openbsd-compat/sha2.c,h] Disable

[openssh.git] / readconf.h

diff --git a/readconf.h b/readconf.h
index 6680559433f0f4a9a99141ae91f057a6126b4ea0..4565b2c2cedabd42cc95334be089295a45368135 100644 (file)
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: readconf.h,v 1.62 2004/04/27 09:46:37 djm Exp $       */
+/*     $OpenBSD: readconf.h,v 1.68 2005/12/06 22:38:27 reyk Exp $      */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -21,9 +21,10 @@
 /* Data structure for representing a forwarding request. */
 
 typedef struct {
-       u_short   port;         /* Port to forward. */
-       char     *host;         /* Host to connect. */
-       u_short   host_port;    /* Port to connect on host. */
+       char     *listen_host;          /* Host (address) to listen on. */
+       u_short   listen_port;          /* Port to forward. */
+       char     *connect_host;         /* Host to connect. */
+       u_short   connect_port;         /* Port to connect on connect_host. */
 }       Forward;
 /* Data structure for representing option data. */
 
@@ -103,22 +104,41 @@ typedef struct {
        int     rekey_limit;
        int     no_host_authentication_for_localhost;
        int     identities_only;
-       int     server_alive_interval; 
+       int     server_alive_interval;
        int     server_alive_count_max;
 
        int     num_send_env;
        char   *send_env[MAX_SEND_ENV];
+
+       char    *control_path;
+       int     control_master;
+
+       int     hash_known_hosts;
+
+       int     tun_open;       /* tun(4) */
+       int     tun_local;      /* force tun device (optional) */
+       int     tun_remote;     /* force tun device (optional) */
+
+       char    *local_command;
+       int     permit_local_command;
+
 }       Options;
 
+#define SSHCTL_MASTER_NO       0
+#define SSHCTL_MASTER_YES      1
+#define SSHCTL_MASTER_AUTO     2
+#define SSHCTL_MASTER_ASK      3
+#define SSHCTL_MASTER_AUTO_ASK 4
 
 void     initialize_options(Options *);
 void     fill_default_options(Options *);
 int     read_config_file(const char *, const char *, Options *, int);
+int     parse_forward(Forward *, const char *);
 
 int
 process_config_line(Options *, const char *, char *, const char *, int, int *);
 
-void    add_local_forward(Options *, u_short, const char *, u_short);
-void    add_remote_forward(Options *, u_short, const char *, u_short);
+void    add_local_forward(Options *, const Forward *);
+void    add_remote_forward(Options *, const Forward *);
 
 #endif                         /* READCONF_H */