- (tim) [kex.c myproposal.h md-sha256.c openbsd-compat/sha2.c,h] Disable

[openssh.git] / misc.h

diff --git a/misc.h b/misc.h
index 829208d29afb44f17e133e760be264a1765fb6e8..0a1a09a68baab9d96f8f862c7366c28576f66a4d 100644 (file)
--- a/misc.h
+++ b/misc.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: misc.h,v 1.9 2001/06/26 06:32:56 itojun Exp $ */
+/*     $OpenBSD: misc.h,v 1.29 2006/01/31 10:19:02 djm Exp $   */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -11,63 +11,59 @@
  * 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 *);
 
-/* return next token in configuration line */
+/* misc.c */
+
+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);
 
-/* set/unset filedescriptor to non-blocking */
-void   set_nonblock(int);
-void   unset_nonblock(int);
+struct passwd *pwcopy(struct passwd *);
 
-struct passwd * pwcopy(struct passwd *);
+typedef struct arglist arglist;
+struct arglist {
+       char    **list;
+       u_int   num;
+       u_int   nalloc;
+};
+void    addargs(arglist *, char *, ...)
+            __attribute__((format(printf, 2, 3)));
+void    replacearg(arglist *, u_int, char *, ...)
+            __attribute__((format(printf, 3, 4)));
+void    freeargs(arglist *);
 
-/*
- * Convert ASCII string to TCP/IP port number.
- * Port must be >0 and <=65535.
- * Return 0 if invalid.
- */
-int a2port(const char *);
+/* readpass.c */
 
-/* code from scp.c/rcp.c */
-char *cleanhostname(char *);
-char *colon(char *);
+#define RP_ECHO                        0x0001
+#define RP_ALLOW_STDIN         0x0002
+#define RP_ALLOW_EOF           0x0004
+#define RP_USE_ASKPASS         0x0008
 
-/*
- * Convert a time string into seconds; format is
- * a sequence of:
- *     time[qualifier]
- *
- * Valid time qualifiers are:
- *     <none>  seconds
- *     s|S     seconds
- *     m|M     minutes
- *     h|H     hours
- *     d|D     days
- *     w|W     weeks
- *
- * Examples:
- *     90m     90 minutes
- *     1h30m   90 minutes
- *     2d      2 days
- *     1w      1 week
- *
- * Return -1 if time string is invalid.
- */
+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 *);
 
-long convtime(const char *);
-
-/* function to assist building execv() arguments */
-typedef struct arglist arglist;
-struct arglist {
-        char    **list;
-        int     num;
-        int     nalloc;
-};
+int     tun_open(int, int);
 
-void addargs(arglist *, char *, ...) __attribute__((format(printf, 2, 3)));
+/* 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)
 
-/* wrapper for signal interface */
-typedef void (*mysig_t)(int);
-mysig_t mysignal(int sig, mysig_t act);
+#define SSH_TUNID_ANY          0x7fffffff
+#define SSH_TUNID_ERR          (SSH_TUNID_ANY - 1)
+#define SSH_TUNID_MAX          (SSH_TUNID_ANY - 2)