diff options
author | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
commit | e88de75a1a236779a10e8ccbcc51d25308be8840 (patch) | |
tree | 7495477a2a7d0cac17a9fcded020b6ea816182ef /readconf.h | |
parent | 30a0f9443782cd9d7308acd09430bf586186aa55 (diff) | |
parent | 5d05471f6657646d1d6500c7c43134462c407ee6 (diff) |
Merge 4.0p1 to the trunk.
Diffstat (limited to 'readconf.h')
-rw-r--r-- | readconf.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/readconf.h b/readconf.h index 2f4908f4e..d26063a0b 100644 --- a/readconf.h +++ b/readconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.h,v 1.64 2004/07/11 17:48:47 deraadt Exp $ */ | 1 | /* $OpenBSD: readconf.h,v 1.66 2005/03/01 10:40:27 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -21,9 +21,10 @@ | |||
21 | /* Data structure for representing a forwarding request. */ | 21 | /* Data structure for representing a forwarding request. */ |
22 | 22 | ||
23 | typedef struct { | 23 | typedef struct { |
24 | u_short port; /* Port to forward. */ | 24 | char *listen_host; /* Host (address) to listen on. */ |
25 | char *host; /* Host to connect. */ | 25 | u_short listen_port; /* Port to forward. */ |
26 | u_short host_port; /* Port to connect on host. */ | 26 | char *connect_host; /* Host to connect. */ |
27 | u_short connect_port; /* Port to connect on connect_host. */ | ||
27 | } Forward; | 28 | } Forward; |
28 | /* Data structure for representing option data. */ | 29 | /* Data structure for representing option data. */ |
29 | 30 | ||
@@ -112,17 +113,20 @@ typedef struct { | |||
112 | 113 | ||
113 | char *control_path; | 114 | char *control_path; |
114 | int control_master; | 115 | int control_master; |
116 | |||
117 | int hash_known_hosts; | ||
115 | } Options; | 118 | } Options; |
116 | 119 | ||
117 | 120 | ||
118 | void initialize_options(Options *); | 121 | void initialize_options(Options *); |
119 | void fill_default_options(Options *); | 122 | void fill_default_options(Options *); |
120 | int read_config_file(const char *, const char *, Options *, int); | 123 | int read_config_file(const char *, const char *, Options *, int); |
124 | int parse_forward(Forward *, const char *); | ||
121 | 125 | ||
122 | int | 126 | int |
123 | process_config_line(Options *, const char *, char *, const char *, int, int *); | 127 | process_config_line(Options *, const char *, char *, const char *, int, int *); |
124 | 128 | ||
125 | void add_local_forward(Options *, u_short, const char *, u_short); | 129 | void add_local_forward(Options *, const Forward *); |
126 | void add_remote_forward(Options *, u_short, const char *, u_short); | 130 | void add_remote_forward(Options *, const Forward *); |
127 | 131 | ||
128 | #endif /* READCONF_H */ | 132 | #endif /* READCONF_H */ |