summaryrefslogtreecommitdiff
path: root/misc.h
diff options
context:
space:
mode:
authordtucker <dtucker>2008-06-12 20:42:45 +0000
committerdtucker <dtucker>2008-06-12 20:42:45 +0000
commit793b070c0c1efd3fe5fe10fb919a5d03c72b6db2 (patch)
tree13272f576988b9c266213e7656df785c4abb6365 /misc.h
parentb644bc5929e45469435a2ab93b9bc230225b75be (diff)
downloadopenssh-793b070c0c1efd3fe5fe10fb919a5d03c72b6db2.tar.gz
- 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);