- djm@cvs.openbsd.org 2010/01/30 02:54:53

[openssh.git] / misc.h

diff --git a/misc.h b/misc.h
index f96328662f6e803669f8af0b93f960d8abb92296..32073acd4175564a50b2aa8a84a6209680ad95e2 100644 (file)
--- a/misc.h
+++ b/misc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.h,v 1.32 2006/07/06 16:03:53 stevesk Exp $ */
+/* $OpenBSD: misc.h,v 1.41 2010/01/09 23:04:13 dtucker Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -15,10 +15,6 @@
 #ifndef _MISC_H
 #define _MISC_H
 
-#include <sys/types.h>
-
-#include <pwd.h>
-
 /* misc.c */
 
 char   *chop(char *);
@@ -28,6 +24,7 @@ int    unset_nonblock(int);
 void    set_nodelay(int);
 int     a2port(const char *);
 int     a2tun(const char *, int *);
+char   *put_host_port(const char *, u_short);
 char   *hpdelim(char **);
 char   *cleanhostname(char *);
 char   *colon(char *);
@@ -36,8 +33,12 @@ 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);
+void    sock_set_v6only(int);
 
 struct passwd *pwcopy(struct passwd *);
+const char *ssh_gai_strerror(int);
 
 typedef struct arglist arglist;
 struct arglist {
@@ -51,17 +52,6 @@ void  replacearg(arglist *, u_int, char *, ...)
             __attribute__((format(printf, 3, 4)));
 void    freeargs(arglist *);
 
-/* readpass.c */
-
-#define RP_ECHO                        0x0001
-#define RP_ALLOW_STDIN         0x0002
-#define RP_ALLOW_EOF           0x0004
-#define RP_USE_ASKPASS         0x0008
-
-char   *read_passphrase(const char *, int);
-int     ask_permission(const char *, ...) __attribute__((format(printf, 1, 2)));
-int     read_keyfile_line(FILE *, const char *, char *, size_t, u_long *);
-
 int     tun_open(int, int);
 
 /* Common definitions for ssh tunnel device forwarding */
@@ -89,5 +79,16 @@ void         put_u32(void *, u_int32_t)
 void           put_u16(void *, u_int16_t)
     __attribute__((__bounded__( __minbytes__, 1, 2)));
 
-#endif /* _MISC_H */
 
+/* readpass.c */
+
+#define RP_ECHO                        0x0001
+#define RP_ALLOW_STDIN         0x0002
+#define RP_ALLOW_EOF           0x0004
+#define RP_USE_ASKPASS         0x0008
+
+char   *read_passphrase(const char *, int);
+int     ask_permission(const char *, ...) __attribute__((format(printf, 1, 2)));
+int     read_keyfile_line(FILE *, const char *, char *, size_t, u_long *);
+
+#endif /* _MISC_H */