diff options
author | djm <djm> | 2005-12-13 08:33:19 +0000 |
---|---|---|
committer | djm <djm> | 2005-12-13 08:33:19 +0000 |
commit | 9718680e91f3efdd5daadb5d4017e4db593a5a6c (patch) | |
tree | 144b9ce63fa72fffc88644d4375307141817e765 /includes.h | |
parent | d7bf6832e3b1a17a62b46037185d5f4d2cbc3ef9 (diff) | |
download | openssh-9718680e91f3efdd5daadb5d4017e4db593a5a6c.tar.gz |
- 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 'includes.h')
-rw-r--r-- | includes.h | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: includes.h,v 1.20 2005/11/15 11:59:54 millert Exp $ */ +/* $OpenBSD: includes.h,v 1.21 2005/12/08 18:34:11 reyk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -148,6 +148,9 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg } #include <netinet/in.h> /* For IPv6 macros */ #include <netinet/ip.h> /* For IPTOS macros */ #include <netinet/tcp.h> +#ifdef HAVE_NET_IF_H +# include <net/if.h> +#endif #include <arpa/inet.h> #if defined(HAVE_NETDB_H) # include <netdb.h> |