Import of OpenSSH 4.3p1

[gssapi-openssh.git] / openssh / misc.h

diff --git a/openssh/misc.h b/openssh/misc.h
index 2d630feb5f87f0fc805cec34f29da41f210c039c..0a1a09a68baab9d96f8f862c7366c28576f66a4d 100644 (file)
--- a/openssh/misc.h
+++ b/openssh/misc.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: misc.h,v 1.25 2005/07/14 04:00:43 dtucker Exp $       */
+/*     $OpenBSD: misc.h,v 1.29 2006/01/31 10:19:02 djm Exp $   */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -20,6 +20,7 @@ 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 *);
@@ -27,6 +28,7 @@ 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 *);
 
@@ -36,7 +38,11 @@ struct arglist {
        u_int   num;
        u_int   nalloc;
 };
-void    addargs(arglist *, char *, ...) __attribute__((format(printf, 2, 3)));
+void    addargs(arglist *, char *, ...)
+            __attribute__((format(printf, 2, 3)));
+void    replacearg(arglist *, u_int, char *, ...)
+            __attribute__((format(printf, 3, 4)));
+void    freeargs(arglist *);
 
 /* readpass.c */
 
@@ -48,3 +54,16 @@ void  addargs(arglist *, char *, ...) __attribute__((format(printf, 2, 3)));
 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)