summaryrefslogtreecommitdiff
path: root/misc.h
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2008-06-13 06:42:45 +1000
committerDarren Tucker <dtucker@zip.com.au>2008-06-13 06:42:45 +1000
commit3fc464efdc5111334f42213891521fcd42c0e7a1 (patch)
treee48491c53689ac119109005b3f5bbf84b57bbdcd /misc.h
parentf09e825329d13c5fc31a97fc7ea2312dd4fb5405 (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.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/misc.h b/misc.h
index be05e806..5da170d2 100644
--- a/misc.h
+++ b/misc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.h,v 1.37 2007/12/27 14:22:08 dtucker Exp $ */
+/* $OpenBSD: misc.h,v 1.38 2008/06/12 20:38:28 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -33,6 +33,8 @@ char *tilde_expand_filename(const char *, uid_t);
char *percent_expand(const char *, ...) __attribute__((__sentinel__));
char *tohex(const void *, size_t);
void sanitise_stdfd(void);
+void ms_subtract_diff(struct timeval *, int *);
+void ms_to_timeval(struct timeval *, int);
struct passwd *pwcopy(struct passwd *);
const char *ssh_gai_strerror(int);