diff options
author | Colin Watson <cjwatson@debian.org> | 2016-08-06 10:49:59 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2016-08-07 12:18:58 +0100 |
commit | 477bb7636238c106f8cd7c868a8c0c5eabcfb3db (patch) | |
tree | 601176af2ecf358c36b766776a86845ad7a3cd6f /misc.h | |
parent | 747fac2de0d889183f67f6900194c0462c558544 (diff) | |
parent | 4c914ccd85bbf391c4dc61b85e3c178fef465e3f (diff) |
New upstream release (7.3p1).
Diffstat (limited to 'misc.h')
-rw-r--r-- | misc.h | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: misc.h,v 1.54 2014/07/15 15:54:14 millert Exp $ */ | 1 | /* $OpenBSD: misc.h,v 1.57 2016/07/15 00:24:30 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -27,6 +27,8 @@ struct Forward { | |||
27 | int handle; /* Handle for dynamic listen ports */ | 27 | int handle; /* Handle for dynamic listen ports */ |
28 | }; | 28 | }; |
29 | 29 | ||
30 | int forward_equals(const struct Forward *, const struct Forward *); | ||
31 | |||
30 | /* Common server and client forwarding options. */ | 32 | /* Common server and client forwarding options. */ |
31 | struct ForwardOptions { | 33 | struct ForwardOptions { |
32 | int gateway_ports; /* Allow remote connects to forwarded ports. */ | 34 | int gateway_ports; /* Allow remote connects to forwarded ports. */ |
@@ -47,6 +49,7 @@ char *put_host_port(const char *, u_short); | |||
47 | char *hpdelim(char **); | 49 | char *hpdelim(char **); |
48 | char *cleanhostname(char *); | 50 | char *cleanhostname(char *); |
49 | char *colon(char *); | 51 | char *colon(char *); |
52 | int parse_user_host_port(const char *, char **, char **, int *); | ||
50 | long convtime(const char *); | 53 | long convtime(const char *); |
51 | char *tilde_expand_filename(const char *, uid_t); | 54 | char *tilde_expand_filename(const char *, uid_t); |
52 | char *percent_expand(const char *, ...) __attribute__((__sentinel__)); | 55 | char *percent_expand(const char *, ...) __attribute__((__sentinel__)); |
@@ -55,6 +58,7 @@ void sanitise_stdfd(void); | |||
55 | void ms_subtract_diff(struct timeval *, int *); | 58 | void ms_subtract_diff(struct timeval *, int *); |
56 | void ms_to_timeval(struct timeval *, int); | 59 | void ms_to_timeval(struct timeval *, int); |
57 | time_t monotime(void); | 60 | time_t monotime(void); |
61 | double monotime_double(void); | ||
58 | void lowercase(char *s); | 62 | void lowercase(char *s); |
59 | int unix_listener(const char *, int, int); | 63 | int unix_listener(const char *, int, int); |
60 | 64 | ||