- djm@cvs.openbsd.org 2010/01/04 02:03:57

[openssh.git] / misc.h

diff --git a/misc.h b/misc.h
index 1dded72152756e23907e4a2a9d531e1b3653d422..1e859e2559a75fec7281d0717e6cb07c7d4b6ca4 100644 (file)
--- a/misc.h
+++ b/misc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.h,v 1.34 2006/08/01 23:22:47 stevesk Exp $ */
+/* $OpenBSD: misc.h,v 1.40 2009/12/25 19:40:21 stevesk Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -15,11 +15,6 @@
 #ifndef _MISC_H
 #define _MISC_H
 
-#include <sys/types.h>
-
-#include <pwd.h>
-#include <stdio.h>
-
 /* misc.c */
 
 char   *chop(char *);
@@ -28,6 +23,7 @@ int    set_nonblock(int);
 int     unset_nonblock(int);
 void    set_nodelay(int);
 int     a2port(const char *);
+int     a2rdomain(const char *);
 int     a2tun(const char *, int *);
 char   *put_host_port(const char *, u_short);
 char   *hpdelim(char **);
@@ -38,8 +34,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 {
@@ -53,19 +53,10 @@ 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);
 
+int     socket_rdomain(int, int, int, int);
+
 /* Common definitions for ssh tunnel device forwarding */
 #define SSH_TUNMODE_NO         0x00
 #define SSH_TUNMODE_POINTOPOINT        0x01
@@ -91,5 +82,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 */