diff options
author | Darren Tucker <dtucker@zip.com.au> | 2008-06-13 06:42:45 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2008-06-13 06:42:45 +1000 |
commit | 3fc464efdc5111334f42213891521fcd42c0e7a1 (patch) | |
tree | e48491c53689ac119109005b3f5bbf84b57bbdcd /misc.h | |
parent | f09e825329d13c5fc31a97fc7ea2312dd4fb5405 (diff) |
- dtucker@cvs.openbsd.org 2008/06/12 20:38:28
[sshd.c sshconnect.c packet.h misc.c misc.h packet.c]
Make keepalive timeouts apply while waiting for a packet, particularly
during key renegotiation (bz #1363). With djm and Matt Day, ok djm@
Diffstat (limited to 'misc.h')
-rw-r--r-- | misc.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: misc.h,v 1.37 2007/12/27 14:22:08 dtucker Exp $ */ | 1 | /* $OpenBSD: misc.h,v 1.38 2008/06/12 20:38:28 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -33,6 +33,8 @@ char *tilde_expand_filename(const char *, uid_t); | |||
33 | char *percent_expand(const char *, ...) __attribute__((__sentinel__)); | 33 | char *percent_expand(const char *, ...) __attribute__((__sentinel__)); |
34 | char *tohex(const void *, size_t); | 34 | char *tohex(const void *, size_t); |
35 | void sanitise_stdfd(void); | 35 | void sanitise_stdfd(void); |
36 | void ms_subtract_diff(struct timeval *, int *); | ||
37 | void ms_to_timeval(struct timeval *, int); | ||
36 | 38 | ||
37 | struct passwd *pwcopy(struct passwd *); | 39 | struct passwd *pwcopy(struct passwd *); |
38 | const char *ssh_gai_strerror(int); | 40 | const char *ssh_gai_strerror(int); |