- jmc@cvs.openbsd.org 2005/12/20 22:02:50

[openssh.git] / misc.h

diff --git a/misc.h b/misc.h
index 3204b626a3e83cd8905a57f2fb49566f596e08e3..41591068695dfe74d902dbe8243057e3167d009f 100644 (file)
--- a/misc.h
+++ b/misc.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: misc.h,v 1.3 2001/02/22 21:59:44 markus Exp $ */
+/*     $OpenBSD: misc.h,v 1.28 2005/12/08 18:34:11 reyk Exp $  */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -11,17 +11,55 @@
  * incompatible with the protocol description in the RFC file, it must be
  * called by a name other than "ssh" or "Secure Shell".
  */
-/* remove newline at end of string */
-char   *chop(char *s);
 
-/* return next token in configuration line */
-char   *strdelim(char **s);
+/* misc.c */
 
-/* set filedescriptor to non-blocking */
-void   set_nonblock(int fd);
+char   *chop(char *);
+char   *strdelim(char **);
+int     set_nonblock(int);
+int     unset_nonblock(int);
+void    set_nodelay(int);
+int     a2port(const char *);
+int     a2tun(const char *, int *);
+char   *hpdelim(char **);
+char   *cleanhostname(char *);
+char   *colon(char *);
+long    convtime(const char *);
+char   *tilde_expand_filename(const char *, uid_t);
+char   *percent_expand(const char *, ...) __attribute__((__sentinel__));
+char   *tohex(const u_char *, u_int);
+void    sanitise_stdfd(void);
 
-struct passwd * pwcopy(struct passwd *pw);
+struct passwd *pwcopy(struct passwd *);
 
-/* wrapper for signal interface */
-typedef void (*mysig_t)(int);
-mysig_t mysignal(int sig, mysig_t act);
+typedef struct arglist arglist;
+struct arglist {
+       char    **list;
+       u_int   num;
+       u_int   nalloc;
+};
+void    addargs(arglist *, char *, ...) __attribute__((format(printf, 2, 3)));
+
+/* 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 */
+#define SSH_TUNMODE_NO         0x00
+#define SSH_TUNMODE_POINTOPOINT        0x01
+#define SSH_TUNMODE_ETHERNET   0x02
+#define SSH_TUNMODE_DEFAULT    SSH_TUNMODE_POINTOPOINT
+#define SSH_TUNMODE_YES                (SSH_TUNMODE_POINTOPOINT|SSH_TUNMODE_ETHERNET)
+
+#define SSH_TUNID_ANY          0x7fffffff
+#define SSH_TUNID_ERR          (SSH_TUNID_ANY - 1)
+#define SSH_TUNID_MAX          (SSH_TUNID_ANY - 2)