diff options
author | Damien Miller <djm@mindrot.org> | 2005-12-13 19:33:19 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2005-12-13 19:33:19 +1100 |
commit | 7b58e800364870d05630514945687d2f26e3c065 (patch) | |
tree | f8b436c13a767fcb014125513fe53b6bc0bde9a2 /misc.h | |
parent | 957d4e430ed40265cffc483abdc5b0e6a58c69ed (diff) |
- reyk@cvs.openbsd.org 2005/12/08 18:34:11
[auth-options.c includes.h misc.c misc.h readconf.c servconf.c]
[serverloop.c ssh.c ssh_config.5 sshd_config.5 configure.ac]
two changes to the new ssh tunnel support. this breaks compatibility
with the initial commit but is required for a portable approach.
- make the tunnel id u_int and platform friendly, use predefined types.
- support configuration of layer 2 (ethernet) or layer 3
(point-to-point, default) modes. configuration is done using the
Tunnel (yes|point-to-point|ethernet|no) option is ssh_config(5) and
restricted by the PermitTunnel (yes|point-to-point|ethernet|no) option
in sshd_config(5).
ok djm@, man page bits by jmc@
Diffstat (limited to 'misc.h')
-rw-r--r-- | misc.h | 16 |
1 files changed, 14 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: misc.h,v 1.27 2005/12/06 22:38:27 reyk Exp $ */ | 1 | /* $OpenBSD: misc.h,v 1.28 2005/12/08 18:34:11 reyk Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -50,4 +50,16 @@ void addargs(arglist *, char *, ...) __attribute__((format(printf, 2, 3))); | |||
50 | char *read_passphrase(const char *, int); | 50 | char *read_passphrase(const char *, int); |
51 | int ask_permission(const char *, ...) __attribute__((format(printf, 1, 2))); | 51 | int ask_permission(const char *, ...) __attribute__((format(printf, 1, 2))); |
52 | int read_keyfile_line(FILE *, const char *, char *, size_t, u_long *); | 52 | int read_keyfile_line(FILE *, const char *, char *, size_t, u_long *); |
53 | int tun_open(int); | 53 | |
54 | int tun_open(int, int); | ||
55 | |||
56 | /* Common definitions for ssh tunnel device forwarding */ | ||
57 | #define SSH_TUNMODE_NO 0x00 | ||
58 | #define SSH_TUNMODE_POINTOPOINT 0x01 | ||
59 | #define SSH_TUNMODE_ETHERNET 0x02 | ||
60 | #define SSH_TUNMODE_DEFAULT SSH_TUNMODE_POINTOPOINT | ||
61 | #define SSH_TUNMODE_YES (SSH_TUNMODE_POINTOPOINT|SSH_TUNMODE_ETHERNET) | ||
62 | |||
63 | #define SSH_TUNID_ANY 0x7fffffff | ||
64 | #define SSH_TUNID_ERR (SSH_TUNID_ANY - 1) | ||
65 | #define SSH_TUNID_MAX (SSH_TUNID_ANY - 2) | ||